diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index bc18aa72f4b..6b48f164a35 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -37,7 +37,7 @@
                     <field name="name"/>
                     <field name="account_id" groups="account.group_account_user"/>
                     <field name="quantity"/>
-                    <field name="uos_id"/>
+                    <field name="uos_id" groups="product.group_uom"/>
                     <field name="price_unit"/>
                     <field name="discount"/>
                     <field name="price_subtotal"/>
@@ -50,7 +50,7 @@
             <field name="model">account.invoice.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice Line">
+                <form string="Invoice Line" version="7.0">
                     <group col="4">
                         <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                         <field name="name"/>
@@ -94,7 +94,7 @@
             <field name="model">account.invoice.tax</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manual Invoice Taxes">
+                <form string="Manual Invoice Taxes" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="sequence"/>
@@ -146,7 +146,7 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
@@ -156,23 +156,16 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <h1>
-                        <field name="state" class="oe_form_inline"/>
-                        <field name="number"/>
-                    </h1>
                     <group>
                         <group>
                             <field string="Supplier" name="partner_id"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
                               domain="[('supplier', '=', True)]"/>
-                            <label string="Address"/>
-                            <div>
-                                <p>Put multi-line address function field here</p>
-                            </div>
                             <field name="fiscal_position" widget="selection"/>
                         </group>
                         <group>
+                            <field name="number"/>
                             <field name="date_invoice"/>
                             <field name="period_id" domain="[('state', '=', 'draft')]"
                                 groups="account.group_account_user" widget="selection"/>
@@ -209,7 +202,7 @@
                                 </tree>
                             </field>
                             <group>
-                                <group>
+                                <div>
                                     <field name="tax_line">
                                         <tree editable="bottom" string="Taxes">
                                             <field name="name"/>
@@ -224,7 +217,7 @@
                                         </tree>
                                     </field>
                                     <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
-                                </group>
+                                </div>
                                 <group class="oe_form_subtotal_footer">
                                     <field name="amount_untaxed"/>
                                     <field name="amount_tax"/>
@@ -279,7 +272,7 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
                     <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
@@ -309,11 +302,6 @@
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                                 groups="base.group_user" context="{'search_default_customer': 1}"
                                 domain="[('customer', '=', True)]"/>
-
-                            <label string="Address"/>
-                            <div>
-                                <p>Put multi-line address function field here</p>
-                            </div>
                             <field name="fiscal_position" widget="selection" options='{"quick_create": false}'/>
                             <field name="payment_term" widget="selection"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1a30a7b5998..9138dee0e6c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -11,11 +11,11 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
-                    <field name="state" select="1" widget="statusbar" nolabel="1" />
+                    <field name="state" widget="statusbar" nolabel="1" />
                 </header>
                 <sheet string="Fiscalyear" layout="auto">
                     <group>
@@ -31,7 +31,7 @@
                         </group>
                     </group>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
-                        <form string="Period">
+                        <form string="Period" version="7.0">
                             <group col="4">
                                 <field name="name"/>
                                 <field name="code"/>
@@ -98,7 +98,7 @@
             <field name="model">account.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <field name="state" widget="statusbar" nolabel="1"/>
@@ -169,7 +169,7 @@
             <field name="model">account.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account">
+                <form string="Account" version="7.0">
                     <label for="name" class="oe_form_readonly_hidden" string="Account Name and Code:"/>
                     <h1>
                         <field name="name"/> - 
@@ -354,7 +354,7 @@
             <field name="model">account.journal.column</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Column">
+                <form string="Journal Column" version="7.0">
                     <field name="name"/>
                     <field name="field"/>
                     <field name="sequence"/>
@@ -398,7 +398,7 @@
             <field name="model">account.journal.view</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal View">
+                <form string="Journal View" version="7.0">
                     <field name="name"/>
                     <field name="columns_id"/>
                 </form>
@@ -464,7 +464,7 @@
             <field name="model">account.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Journal">
+                <form string="Account Journal" version="7.0">
                     <div class="oe_form_title">
                         <label for="name" class="oe_form_readonly_hidden"/>
                         <h1><field name="name"/></h1>
@@ -587,7 +587,7 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement">
+                <form string="Bank Statement" version="7.0">
                 <header>
                     <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
                     <button name="button_dummy" states="draft" string="Compute" type="object"/>
@@ -598,8 +598,8 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="date" select="1" on_change="onchange_date(date, company_id)"/>
-                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1" widget="selection"/>
+                            <field name="date" on_change="onchange_date(date, company_id)"/>
+                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                             <field name="period_id"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group><group>
@@ -623,7 +623,7 @@
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines">
+                                <form string="Statement lines" version="7.0">
                                     <group col="4">
                                         <field name="date"/>
                                         <field name="name"/>
@@ -716,7 +716,7 @@
             <field name="model">account.account.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Type">
+                <form string="Account Type" version="7.0">
                     <group>
                         <group>
                             <field name="name"/>
@@ -771,7 +771,7 @@
             <field name="model">account.move.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Reconcile">
+                <form string="Journal Entry Reconcile" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="create_date"/>
@@ -822,7 +822,7 @@
             <field name="model">account.tax.code</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code">
+                <form string="Account Tax Code" version="7.0">
                     <group>
                         <group col="4" colspan="2">
                             <field name="name"/>
@@ -893,7 +893,7 @@
             <field name="model">account.tax</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax">
+                <form string="Account Tax" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="description"/>
@@ -1010,11 +1010,11 @@
             <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item">
+                <form string="Journal Item" version="7.0">
                     <group col="6">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="ref"/>
-                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
 
                         <field name="journal_id"/>
                         <field name="period_id"/>
@@ -1084,16 +1084,16 @@
             <field name="type">form</field>
             <field eval="9" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item">
+                <form string="Journal Item" version="7.0">
                     <notebook colspan="4">
                         <page string="Information">
                             <group col="4">
                                 <separator colspan="4" string="General Information"/>
-                                <field name="name" select="1"/>
+                                <field name="name"/>
                                 <field name="date"/>
-                                <field name="journal_id" readonly="False" select="1"/>
+                                <field name="journal_id" readonly="False"/>
                                 <field name="period_id" readonly="False"/>
-                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
+                                <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
                                 <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                                 <newline/>
                                 <field name="debit"/>
@@ -1102,13 +1102,13 @@
                                 <separator colspan="4" string="Optional Information"/>
                                 <field name="currency_id"/>
                                 <field name="amount_currency"/>
-                                <field name="quantity" select="3"/>
+                                <field name="quantity"/>
                                 <field name="move_id" required="False"/>
                                 <newline/>
                                 <field name="date_maturity"/>
                                 <field name="date_created"/>
                                 <field name="date_created"/>
-                                <field name="blocked" select="3"/>
+                                <field name="blocked"/>
                                 <newline/>
                                 <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                 <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
@@ -1268,7 +1268,7 @@
             <field name="model">account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="button_validate" states="draft" string="Post" type="object"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
@@ -1292,7 +1292,7 @@
                             <field colspan="4" name="line_id" widget="one2many_list" 
                               on_change="onchange_line_id(line_id)"
                               context="{'balance': balance , 'journal': journal_id }">
-                                <form string="Journal Item">
+                                <form string="Journal Item" version="7.0">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
@@ -1567,7 +1567,7 @@
             <field name="model">account.model.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model Line">
+                <form string="Journal Entry Model Line" version="7.0">
                     <group col="4">
                         <field colspan="4" name="name"/>
                         <field name="sequence"/>
@@ -1588,7 +1588,7 @@
             <field name="model">account.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model">
+                <form string="Journal Entry Model" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="journal_id"/>
@@ -1675,8 +1675,8 @@
             <field name="model">account.payment.term.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Term">
-                    <field name="name" select="1"/>
+                <form string="Payment Term" version="7.0">
+                    <field name="name"/>
                     <field name="sequence"/>
                     <group>
                         <group string="Amount Computation">
@@ -1726,7 +1726,7 @@
             <field name="model">account.payment.term</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Term">
+                <form string="Payment Term" version="7.0">
                     <group>
                         <field name="name"/>
                         <field name="active"/>
@@ -1758,7 +1758,7 @@
             <field name="model">account.subscription.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription lines">
+                <form string="Subscription lines" version="7.0">
                     <group>
                         <field name="date"/>
                         <field name="move_id"/>
@@ -1822,7 +1822,7 @@
             <field name="model">account.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Recurring">
+                <form string="Recurring" version="7.0">
                     <header>
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
                         <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
@@ -1889,7 +1889,7 @@
             <field name="type">form</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Subscription lines">
+                <form string="Subscription lines" version="7.0">
                     <group col="4">
                         <field name="subscription_id"/>
                         <field name="date"/>
@@ -1981,7 +1981,7 @@
             <field name="model">account.addtmpl.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Account">
+                <form string="Create Account" version="7.0">
                     <header>
                         <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
@@ -2023,7 +2023,7 @@
             <field name="model">account.account.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Template">
+                <form string="Account Template" version="7.0">
                     <notebook>
                         <page string="General Information">
                             <group col="4">
@@ -2106,7 +2106,7 @@
             <field name="model">account.chart.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Chart of Accounts Template">
+                <form string="Chart of Accounts Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
@@ -2191,7 +2191,7 @@
             <field name="model">account.tax.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Template">
+                <form string="Account Tax Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="description"/>
@@ -2321,7 +2321,7 @@
             <field name="model">account.tax.code.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code Template">
+                <form string="Account Tax Code Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -2353,7 +2353,7 @@
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
               <data>
-                <form position="attributes">
+                <form position="attributes" version="7.0">
                   <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <group string="res_config_contents" position="replace">
@@ -2371,7 +2371,7 @@
                     <field name ="complete_tax_set" invisible="1"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="account.group_account_user">
-                        <form string="Bank Information">
+                        <form string="Bank Information" version="7.0">
                             <field name="acc_name"/>
                             <field name="account_type"/>
                             <field name="currency_id" widget="selection"/>
@@ -2453,7 +2453,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position Template">
+                <form string="Fiscal Position Template" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="chart_template_id"/>
@@ -2463,7 +2463,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Taxes Mapping">
+                        <form string="Taxes Mapping" version="7.0">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
@@ -2473,7 +2473,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Accounts Mapping">
+                        <form string="Accounts Mapping" version="7.0">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
@@ -2529,7 +2529,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object"/>
@@ -2560,7 +2560,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                     <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines">
+                                <form string="Statement lines" version="7.0">
                                     <group col="4">
                                         <field name="date"/>
                                         <field name="name"/>
@@ -2585,7 +2585,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal" sum="Total"/>
                                     </tree>
-                                    <form string = "Opening Balance">
+                                    <form string = "Opening Balance" version="7.0">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal"/>
@@ -2597,7 +2597,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal" sum="Total"/>
                                     </tree>
-                                    <form string = "Closing Balance">
+                                    <form string = "Closing Balance" version="7.0">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
                                         <field name="subtotal"/>
@@ -2689,7 +2689,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="model">account.financial.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Report">
+                <form string="Account Report" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 3037c9d3b0d..0f01be87a26 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -38,7 +38,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Board" layout="manual">
+                <form string="Account Board" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 134b43bf614..af2092cacba 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-06-06 10:35+0000\n"
+"Last-Translator: Budi Iskandar <Unknown>\n"
 "Language-Team: Indonesian <id@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-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-07 04:41+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1301,6 +1301,8 @@ msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"Anda tidak bisa menggunakan akun umum pada jurnal ini, cek tab \"Entry "
+"Controls\" pada jurnal sesuai !"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1337,7 +1339,7 @@ msgstr "Lainnya"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Draft Berlangganan"
 
 #. module: account
 #: view:account.account:0
@@ -1411,7 +1413,7 @@ msgstr "Pilih periode awal dan akhir"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Laba/Rugi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1558,7 +1560,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "# entris "
 
 #. module: account
 #: help:account.fiscal.position,active:0
@@ -1566,6 +1568,8 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Dengan me-unchek field Active, And a dapat menyembunyikan fiscal position "
+"tampa menghapusnya."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1643,7 +1647,7 @@ msgstr "Pencarian statement Bank"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Jurnal item belum di Post"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1751,7 +1755,7 @@ msgstr "Penagihan"
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Partner Lain-lain"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1763,7 +1767,7 @@ msgstr "Jumlah Setahun"
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "Anda Memilih satuan yang tidak kompatibel dengan productnya"
 
 #. module: account
 #: view:account.change.currency:0
@@ -1784,7 +1788,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Akun Tunda"
 
 #. module: account
 #: view:account.tax.template:0
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 754305865a8..3faa734f6cc 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-01 01:29+0000\n"
+"PO-Revision-Date: 2012-06-08 01:32+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-06-02 05:35+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -38,7 +38,7 @@ msgstr "その他の設定"
 msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
-msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金レポート にあるレポートの表示順を決定して下さい。"
+msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金レポート にあるレポートの表示順を決定します。"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -201,8 +201,8 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"分析仕訳帳のタイプを与えて下さい。分析エントリーを作成するためのドキュメント（例えば請求書）のために必要な場合、OpenERPは同じタイプの一致する仕訳帳"
-"を探します。"
+"分析仕訳帳のタイプを与えます。分析エントリーを作成するためのドキュメント（例えば請求書）のために必要な場合、OpenERPは同じタイプの一致する仕訳帳を探"
+"します。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -1086,7 +1086,7 @@ msgstr "並べ替え順"
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr "閉じる会計年度を選択して下さい。"
+msgstr "閉じるには会計年度を選択します。"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -1476,7 +1476,7 @@ msgstr "桁数"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr "手動入力のため、ドラフト状態をスキップして下さい。"
+msgstr "手動入力のため、ドラフト状態をスキップします。"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1674,7 +1674,7 @@ msgstr "アカウントタイプ別売上"
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
-msgstr "請求書のキャンセル：現在の請求書をキャンセルするために返金請求書を作成、検証、消し込みして下さい。"
+msgstr "請求書のキャンセル：現在の請求書をキャンセルするために返金請求書を作成、検証、消し込みします。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -2425,7 +2425,7 @@ msgstr "基本コード"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr "請求書の税金のリストを表示する時に、並べ順を指定して下さい。"
+msgstr "請求書の税金のリストを表示する時に、並べ順を与えます。"
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2445,9 +2445,9 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
-"このメニューは請求書または支払いに基づく消費税申告を印刷します。ひとつあるいは複数の会計年度を選択して下さい。税金申請のために要求される情報は請求書（また"
-"は支払い、幾つかの国の）からOpenERPによって自動的に生成されます。このデータはリアルタイムで更新されます。月あるいは四半期の開始と終了において、支払"
-"うべき税金をいつでもレビューできるため非常に便利です。"
+"このメニューは請求書または支払いに基づく消費税申告を印刷します。ひとつあるいは複数の会計年度を選択します。税金申請のために要求される情報は請求書（または支"
+"払い、幾つかの国の）からOpenERPによって自動的に生成されます。このデータはリアルタイムで更新されます。月あるいは四半期の開始と終了において、支払うべ"
+"き税金をいつでもレビューできるため非常に便利です。"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2722,8 +2722,7 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
-"新しい仕訳帳エントリーがドラフト状態を通り抜けて、代わりに手動での検証を行わず直接記帳状態に行くことを望まない場合は、このボックスをチェックして下さい。"
-"\n"
+"新しい仕訳帳エントリーがドラフト状態を通り抜けて、代わりに手動での検証を行わず直接記帳状態に行くことを望まない場合は、このボックスをチェックします。\n"
 "システムにより自動的に作成された仕訳帳エントリーはいつもこの状態をスキップすることに注意して下さい。"
 
 #. module: account
@@ -2847,7 +2846,7 @@ msgstr "費用勘定"
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr "検証（請求書）日の期間を使うために空のままにして下さい。"
+msgstr "検証（請求書）日の期間を使うために空のままにします。"
 
 #. module: account
 #: help:account.bank.statement,account_id:0
@@ -3162,7 +3161,7 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
-"このタイプの全てのアカウントの年間の仕訳帳エントリーの終わりを生成するのに使用する方法を、ここで設定して下さい。\n"
+"このタイプの全てのアカウントの年間の仕訳帳エントリーの終わりを生成するのに使用する方法を、ここで設定します。\n"
 "\n"
 "　\"なし\" は何も行われないことを意味します。\n"
 "　\"残高\"は一般的には現金のアカウントのために使用されます。\n"
@@ -3179,7 +3178,7 @@ msgstr "その会計年度の終わりの仕訳帳が定義されていません
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "費用勘定を使うためには空のままとして下さい。"
+msgstr "費用勘定を使うためには空のままとします。"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -4118,7 +4117,7 @@ msgstr "貸借対照表（負債勘定）"
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr "現在日付を利用するには空のままとして下さい。"
+msgstr "現在日付を利用するには空のままとします。"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -4327,8 +4326,8 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
-"テンプレートから勘定科目表を生成するウィザードの中でこのテンプレートを積極的に使わないのであれば、Falseを設定して下さい。これは子のテンプレートをロー"
-"ドするときだけ、このテンプレートのアカウントを生成するときに役立ちます。"
+"テンプレートから勘定科目表を生成するウィザードの中でこのテンプレートを積極的に使わないのであれば、Falseを設定します。これは子のテンプレートをロードし"
+"た時のみでこのテンプレートのアカウントを生成したい時に役立ちます。"
 
 #. module: account
 #: view:account.use.model:0
@@ -4445,7 +4444,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr "収益勘定を使うためは空のままとして下さい。"
+msgstr "収益勘定を使うためは空のままとします。"
 
 #. module: account
 #: code:addons/account/account.py:3299
@@ -4792,7 +4791,7 @@ msgstr "会計士"
 msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
-msgstr "このビューから財務分析を行って下さい。これは期間毎に流動資産アカウント上に作られた全ての会計エントリーの残高を合計します。"
+msgstr "このビューから財務分析を行います。これは期間毎に流動資産アカウント上に作られた全ての会計エントリーの残高を合計します。"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5172,7 +5171,7 @@ msgstr "取引"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr "消費税申請にこのコードを使って下さい。"
+msgstr "消費税申請にこのコードを使います。"
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -5220,7 +5219,7 @@ msgstr "エントリー制御"
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr "（現在の状態を開くために空のままとして下さい）"
+msgstr "（現在の状態を開くために空のままとします）"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
@@ -5954,7 +5953,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr "（今期を使う場合は空のままとして下さい）"
+msgstr "（現在の期間を使う場合は空のままとします）"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -6465,7 +6464,7 @@ msgstr "エントリー： "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr "選択された仕訳帳の中に手動で定期エントリーを作成して下さい。"
+msgstr "選択された仕訳帳の中に手動の定期エントリーを作成します。"
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
@@ -6941,8 +6940,8 @@ msgid ""
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
-"会社の銀行口座を設定して、そしてレポートフッターに現れるべきそれを選択して下さい。リストビューの中の銀行を並べ替えることが出来ます。OpenERPの会計ア"
-"プリケーションを使用する場合は、仕訳帳とアカウントはそれらのデータを基に自動的に作成されます。"
+"会社の銀行口座を設定して、そしてレポートフッターに現れるべきそれを選択します。リストビューの中の銀行を並べ替えることが出来ます。OpenERPの会計アプリ"
+"ケーションを使用する場合は、仕訳帳とアカウントはそれらのデータを基に自動的に作成されます。"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -7001,7 +7000,7 @@ msgstr "税金："
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力して下さい。"
+msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力します。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -7125,7 +7124,7 @@ msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
 msgstr ""
-"有益な情報を介して個別のアカウントエントリーのための検索ができます。アカウントエントリーの検索のためには仕訳帳を開き、そしてレコード行を選択して下さい。"
+"有益な情報を介して個別のアカウントエントリーのための検索ができます。アカウントエントリーの検索のためには仕訳帳を開き、そしてレコード行を選択します。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -7135,7 +7134,7 @@ msgstr "記帳済エントリー"
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr "パーセントは0から1までの比率を入力して下さい。"
+msgstr "パーセントは0から1までの比率を入力します。"
 
 #. module: account
 #: report:account.invoice:0
@@ -7183,8 +7182,7 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
-"この仕訳帳の各エントリーは新しい相手方を作成しないが、同じ相手方を共有することを決定するために、このボックスをチェックして下さい。これは会計年度決算時に使"
-"われます。"
+"この仕訳帳の各エントリーが新しい相手方を作成せずに同じ相手方を共有すると決めるには、このボックスをチェックします。これは会計年度決算時に使われます。"
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
@@ -7328,7 +7326,7 @@ msgid ""
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
 "このビューはOpenERPで大量のエントリーを記録するために会計士によって使用されます。仕入先請求書を記録することを望む場合、費用勘定の行を記録することに"
-"より開始して下さい。OpenERPは自動的にこのアカウントと相手方の買掛金に関連した税金を提案します"
+"より開始します。OpenERPは自動的にこのアカウントと相手方の買掛金に関連した税金を提案します。"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7727,7 +7725,7 @@ msgid ""
 "it's based on the beginning of the month)."
 msgstr ""
 "月の日は、今月の最後の日とするには-"
-"1を設定して下さい。もし正の値なら翌月のその日になります。正味日数の場合には0を設定して下さい（それ以外は月初日を基準とします）。"
+"1を設定します。もし正の値なら翌月のその日になります。正味日数の場合には0を設定します（それ以外は月初日を基準とします）。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -8067,7 +8065,7 @@ msgstr "仕入返金仕訳帳"
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力して下さい。"
+msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力します。"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8673,7 +8671,7 @@ msgstr "通貨"
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr "銀行取引明細書のリストを表示する時には、並び順を与えて下さい。"
+msgstr "銀行取引明細書のリストを表示する時には並び順を与えます。"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
@@ -8691,9 +8689,9 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
-"ニーズに応じて会社の会計年度を定義して下さい。会計年度は会社のアカウントを構成する（通常12ヶ月）終わりまでの期間です。会計年度は通常その終わりの日付まで"
-"が当てはまります。例えば、会社の会計年度の終わりが2011年11月30日である場合、2010年12月1日から2011年11月30日の全てが2011年の会計"
-"年度に当てはまります。実際の暦年に従う必要はありません。"
+"ニーズに応じて会社の会計年度を定義します。会計年度は会社のアカウントを構成する（通常12ヶ月）終わりまでの期間です。会計年度は通常その終わりの日付までが当"
+"てはまります。例えば、会社の会計年度の終わりが2011年11月30日である場合、2010年12月1日から2011年11月30日の全てが2011年の会計年度"
+"に当てはまります。実際の暦年に従う必要はありません。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8798,7 +8796,7 @@ msgstr "期間原価元帳"
 msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
-msgstr "税金計算が合計金額よりむしろ子の税金の計算に基づく場合は設定して下さい。"
+msgstr "税金計算が合計金額より、むしろ、子の税金の計算に基づく場合は設定して下さい。"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9149,7 +9147,7 @@ msgid ""
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
 "このビューはOpenERPに大量のエントリーを記録するために会計士によって使われます。顧客請求書を記録することを望む場合、検索ツールバーの仕訳帳と期間を選"
-"択して下さい。それから、損益勘定のエントリー行を開始します。OpenERPはこのアカウントに関係する税金と相手方の売掛金を自動的に提案します。"
+"択します。それから、損益勘定のエントリー行を開始します。OpenERPはこのアカウントに関係する税金と相手方の売掛金を自動的に提案します。"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -9173,7 +9171,7 @@ msgid ""
 "period."
 msgstr ""
 "会社の会計年度の時間間隔である会計期間をここで定義して下さい。会計期間は通常は１ヶ月あるいは３ヶ月です。これは、通常は税金申告の期間た対応します。ここから"
-"期間を作成して管理して下さい。そして、期間は閉じられるべきなのか、特定の期間にわたる会社の活動に応じて開いたままにしておくのかを決めます。"
+"期間を作成して管理します。そして、期間は閉じられるべきなのか、特定の期間にわたる会社の活動に応じて開いたままにしておくのかを決めます。"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -9449,7 +9447,7 @@ msgid ""
 msgstr ""
 "期間は会計に関連する活動を記録すべき会計エントリーが含まれる会計期間のことです。月次期間が標準ですが、あなたの国あるいは会社のニーズに依存します。また、四"
 "半期期間を持つこともできます。期間の閉鎖は新しい会計エントリーの記録を不可能にし、全ての新しいエントリーは次の開設期間でなされる必要があります。新しいエン"
-"トリーを記録したくない場合、あるいは税金に関連する計算のためにこの期間をロックしたい場合は期間を閉じてください。"
+"トリーを記録したくない場合、あるいは税金に関連する計算のためにこの期間をロックしたい場合は期間を閉じて下さい。"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -10259,8 +10257,8 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
-"このメニューから会社の仕訳帳を作成し管理して下さい。仕訳帳は複式簿記システムを使って、会社の日々のビジネスに関連した全ての会計データの取引を記録するために"
-"使用されます。その活動の性質と日常の取引の数に応じて、会社は現金仕訳帳、仕入仕訳帳、売上仕訳帳といった専門的な仕訳帳の幾つかのタイプを持ちます。"
+"このメニューから会社の仕訳帳を作成し管理します。仕訳帳は複式簿記システムを使って、会社の日々のビジネスに関連した全ての会計データの取引を記録するために使用"
+"されます。その活動の性質と日常の取引の数に応じて、会社は現金仕訳帳、仕入仕訳帳、売上仕訳帳といった専門的な仕訳帳の幾つかのタイプを持ちます。"
 
 #. module: account
 #: view:account.payment.term:0
@@ -10439,7 +10437,7 @@ msgstr ""
 "${object.address_invoice_id.name and ' ' or "
 "''}${object.address_invoice_id.name or ''}様,\n"
 "\n"
-"新しい請求書をお届けします。どうぞご確認ください。発行者： ${object.partner_id.name}:\n"
+"新しい請求書をお届けします。どうぞご確認下さい。発行者： ${object.partner_id.name}:\n"
 "       | 請求書番号： *${object.number}*\n"
 "       | 請求金額合計： *${object.amount_total} ${object.currency_id.name}*\n"
 "       | 請求日： ${object.date_invoice}\n"
@@ -10473,10 +10471,10 @@ msgstr ""
 "    ${paypal_url}\n"
 "% endif\n"
 "\n"
-"何かご質問等ございましたら、ご遠慮なく弊社までお問い合わせください。\n"
+"何かご質問等ございましたら、ご遠慮なく弊社までお問い合わせ下さい。\n"
 "\n"
 "\n"
-"弊社をご利用いただきありがとうございました。 ${object.company_id.name}\n"
+"弊社をご利用いただき、ありがとうございました。 ${object.company_id.name}\n"
 "\n"
 "\n"
 "--\n"
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index ce81967607a..69e36d5fc48 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-31 15:04+0000\n"
-"Last-Translator: ThinkOpen Solutions <Unknown>\n"
+"PO-Revision-Date: 2012-06-05 09:38+0000\n"
+"Last-Translator: Tiago Rodrigues <tig.rodrigues@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr "mês anterior"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Pagamento do sistema"
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Outras configurações"
+msgstr "Outras Configurações"
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -57,7 +57,7 @@ msgstr "Estatisticas da Conta"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr "Proforma/ Abrir / Faturas Pagas"
+msgstr "Proforma / Abrir / Faturas Pagas"
 
 #. module: account
 #: field:report.invoice.created,residual:0
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index f5aa3781e50..9a935b5ab11 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-23 07:32+0000\n"
-"Last-Translator: VTTW <victso@gmail.com>\n"
+"PO-Revision-Date: 2012-06-05 02:38+0000\n"
+"Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -419,7 +419,7 @@ msgstr "貸方合計"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "開啟反核銷"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -2737,7 +2737,7 @@ msgstr "要設置期初餘額需在憑證簿設置中勾選合併選項"
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax Codes"
-msgstr ""
+msgstr "稅碼"
 
 #. module: account
 #: view:account.account:0
@@ -4593,7 +4593,7 @@ msgstr "已付"
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr ""
+msgstr "您確定嗎？"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5930,7 +5930,7 @@ msgstr "銷售稅(%)"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "根據這個範本建立使用者"
 
 #. module: account
 #: view:account.account.type:0
@@ -7868,7 +7868,7 @@ msgstr "反向輔助核算餘額 -"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr ""
+msgstr "開啟銀行核銷"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9126,7 +9126,7 @@ msgstr "為了對賬，您必須在賬簿中定義一個銀行帳號。"
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr ""
+msgstr "核銷交易"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 998140287ab..811cac1624d 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -19,7 +19,7 @@
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Tax Mapping">
+                        <form string="Tax Mapping" version="7.0">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
@@ -29,7 +29,7 @@
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Account Mapping">
+                        <form string="Account Mapping" version="7.0">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
@@ -93,7 +93,7 @@
                             <field name="debit"/>
                         </group>
                         <field name="bank_ids">
-                            <form string="Bank account">
+                            <form string="Bank account" version="7.0">
                                 <field name="state"/>
                                 <field name="acc_number"/>
                                 <group>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 931b01ce7e1..3d6cace4ac5 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -80,7 +80,7 @@
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Account">
+                <form string="Analytic Account" version="7.0">
                 <sheet>
                     <group>
                         <group>
@@ -157,7 +157,7 @@
             <field name="model">account.analytic.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Entry">
+                <form string="Analytic Entry" version="7.0">
                     <group>
                         <group>
                             <field name="name"/>
@@ -276,7 +276,7 @@
             <field name="model">account.analytic.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project line">
+                <form string="Project line" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_id"/>
@@ -343,7 +343,7 @@
             <field name="model">account.analytic.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Journal">
+                <form string="Analytic Journal" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -401,7 +401,7 @@
         <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
         <!--    <field name="type">form</field>-->
         <!--    <field name="arch" type="xml">-->
-        <!--        <form string="Analytic Entries Stats">-->
+        <!--        <form string="Analytic Entries Stats" version="7.0">-->
         <!--            <group col="4">-->
         <!--                <field name="name"/>-->
         <!--                <field name="account_id"/>-->
diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml
index ba26c23522e..59c4095bb22 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.balance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Select Period">
+            <form string="Select Period" version="7.0">
                 <header>
                     <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index af3f197902b..8e2351b63e9 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Account Charts">
+                <form string="Analytic Account Charts" version="7.0">
                     <header>
                         <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index bd18e2721f0..a9c868a6ac8 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.cost.ledger.journal.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select period">
+                <form string="Select period" version="7.0">
                     <header>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
index fd3d2193637..29948e7b5c0 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.cost.ledger</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Select Period">
+            <form string="Select Period" version="7.0">
                 <header>
                      <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index 3fea5004f33..5020a1859a6 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.inverted.balance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select Period">
+                <form string="Select Period" version="7.0">
                     <header>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index 9062919f575..d6c36aae990 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.analytic.journal.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select Period">
+                <form string="Select Period" version="7.0">
                     <header>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 2046fac99f9..08ef0e8e9b6 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -7,14 +7,14 @@
             <field name="model">project.account.analytic.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="View Account Analytic Lines">
+                <form string="View Account Analytic Lines" version="7.0">
                     <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group col="4">
                         <field name="from_date"/>
-                        <field name="to_date" />
+                        <field name="to_date"/>
                     </group>
                     <label string ="(Keep empty to open the current situation)" />
                 </form>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index fe2b8a3940a..587d068ca1b 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -34,9 +34,11 @@
             <field name="model">report.account.receivable</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Accounts by Type">
-                    <field name="name" select="1"/>
-                    <field name="type" select="1"/>
+                <form string="Accounts by Type" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="type"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -68,8 +70,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Aged Receivable">
-                    <field name="name" select="1"/>
-                    <field name="balance" select="2"/>
+                    <field name="name"/>
+                    <field name="balance"/>
                 </tree>
             </field>
         </record>
@@ -89,8 +91,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
-                   	<field name="create_date" select="1"/>
-                    <field name="name" select="1"/>
+                       <field name="create_date"/>
+                    <field name="name"/>
                     <field name="type"/>
                     <field name="number"/>
                     <field name="partner_id"/>
@@ -98,30 +100,30 @@
                     <field name="amount_total" sum="Total Amount"/>
                     <field name="currency_id"/>
                     <field name="date_invoice"/>
-                    <field name="date_due" select="1"/>
+                    <field name="date_due"/>
                     <field name="residual"/>
-                    <field name="state" select="2"/>
+                    <field name="state"/>
                     <field name="origin"/>
                 </tree>
             </field>
         </record>
 
-	    <record id="action_view_created_invoice_dashboard" model="ir.actions.act_window">
-		    <field name="name">Invoices Created Within Past 15 Days</field>
-		    <field name="res_model">report.invoice.created</field>
-		    <field name="view_type">form</field>
-		    <field name="view_mode">tree,form</field>
-		    <field name="view_id" ref="board_view_created_invoice"/>
-	    </record>
+        <record id="action_view_created_invoice_dashboard" model="ir.actions.act_window">
+            <field name="name">Invoices Created Within Past 15 Days</field>
+            <field name="res_model">report.invoice.created</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="board_view_created_invoice"/>
+        </record>
 
-	    <record id="view_report_account_sales_tree" model="ir.ui.view">
+        <record id="view_report_account_sales_tree" model="ir.ui.view">
             <field name="name">report.account.sales.tree</field>
             <field name="model">report.account.sales</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
+                    <field name="name"/>
+                    <field name="month"/>
                     <field name="product_id"/>
                     <field name="account_id"/>
                     <field name="quantity"/>
@@ -149,11 +151,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
-					<separator orientation="vertical"/>
-					<field name="name"/>
-					<field name="month"/>
+                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
+                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>
@@ -166,7 +168,7 @@
             <field name="search_view_id" ref="view_report_account_sales_search"/>
         </record>
 
-	    <record id="view_report_account_type_sales_tree" model="ir.ui.view">
+        <record id="view_report_account_type_sales_tree" model="ir.ui.view">
             <field name="name">report.account_type.sales.tree</field>
             <field name="model">report.account_type.sales</field>
             <field name="type">tree</field>
@@ -190,9 +192,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account Type">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="product_id" select="1"/>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="product_id"/>
                 </tree>
             </field>
         </record>
@@ -209,17 +211,17 @@
              </field>
         </record>
 
-		<record id="view_report_account_type_sales_search" model="ir.ui.view">
+        <record id="view_report_account_type_sales_search" model="ir.ui.view">
             <field name="name">report.account_type.sales.search</field>
             <field name="model">report.account_type.sales</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
-					<separator orientation="vertical"/>
-					<field name="name"/>
-					<field name="month"/>
+                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
+                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index e75bebb88bd..24c7887bdfe 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -15,7 +15,7 @@
             <field name="model">account.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Accounting">
+                <form string="Configure Accounting" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9835ab47696..b8e719acc35 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -7,28 +7,24 @@
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Reconciliation">
-                    <separator string="Reconciliation" colspan="4"/>
-                    <label colspan="4" nolabel="1" string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
-                    <newline/>
-                    <group>
-                        <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
+                <form string="Reconciliation" version="7.0">
+                    <header>
+                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <separator string="Reconciliation"/>
+                    <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
+                    <field name="account_ids" domain="[('reconcile','=',1)]"/>
+                    <group col="4">
                         <field name="power"/>
                         <field name="allow_write_off"/>
                     </group>
-                    <newline/>
-                    <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
-                        <separator string="Write-Off Move" colspan="4"/>
+                    <group col="4" attrs="{'readonly':[('allow_write_off', '!=', True)]}" string="Write-Off Move">
                         <field name="max_amount"/>
                         <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                     </group>
-                    <separator string ="" colspan="4"/>
-                    <group colspan="2" col="4">
-                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
-                     </group>
                 </form>
              </field>
          </record>
@@ -56,14 +52,14 @@
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Reconciliation Result">
-                    <field name="reconciled"/>
-                    <newline/>
-                    <field name="unreconciled"/>
-                    <group colspan="4" col="6">
-                        <separator colspan="6"/>
+                <form string="Reconciliation Result" version="7.0">
+                    <header>
                         <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
-                     </group>
+                    </header>
+                    <group>
+                        <field name="reconciled"/>
+                        <field name="unreconciled"/>
+                    </group>
                 </form>
              </field>
          </record>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 4504f064a1d..3d942ef0097 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -6,13 +6,13 @@
             <field name="model">account.change.currency</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice Currency">
-                    <separator colspan="4" string="This wizard will change the currency of the invoice"/>
-                    <field name="currency_id"/>
-                    <separator colspan="4"/>
-                    <group colspan="2" col="4">
-                        <button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+                <form string="Invoice Currency" version="7.0">
+                    <header>
                         <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
+                        <button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+                    </header>
+                    <group string="This wizard will change the currency of the invoice">
+                        <field name="currency_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index f2e278b06ce..1ae294c3c0a 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -6,7 +6,11 @@
             <field name="model">account.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account charts">
+                <form string="Account charts" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
                         <field name="target_move"/>
@@ -15,11 +19,6 @@
                         <field name="period_from"/>
                         <field name="period_to"/>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 5bd537fea1b..e141b4fc911 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -6,16 +6,16 @@
             <field name="model">account.fiscalyear.close.state</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Close states of Fiscal year and periods">
-                        <separator string="Close states of Fiscal year and periods" colspan="4" />
-						<label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive " colspan="4"/>
-						<newline/>
-						<field name="fy_id"  domain = "[('state','=','draft')]" colspan="4"/>
-						<separator colspan="4" />
-						<group colspan="4" col="6">
-						    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-						    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
-						</group>
+                <form string="Close states of Fiscal year and periods" version="7.0">
+                <header>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+                </header>
+                <separator string="Close states of Fiscal year and periods"/>
+                <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
+                <group>
+                    <field name="fy_id"  domain="[('state','=','draft')]"/>
+                </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index d4dfab7876c..aa34fefd128 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -6,23 +6,23 @@
             <field name="model">account.fiscalyear.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Generate Fiscal Year Opening Entries">
-	                <separator string="Generate Fiscal Year Opening Entries" colspan="4"/>
-	                <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
-	                <newline/>
-	                <field name="fy_id" domain = "[('state','=','draft')]"/>
-	                <field name="fy2_id" domain = "[('state','=','draft')]"/>
-	                <field name="journal_id"/>
-	                <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
-	                <field name="report_name" colspan="4"/>
-	                <separator colspan="4"/>
-	                <group colspan="4" col="6">
-	                   <label string="" colspan="2"/>
-	                   <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-	                   <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
-	                </group>
-				</form>
-			</field>
+                <form string="Generate Fiscal Year Opening Entries" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <separator string="Generate Fiscal Year Opening Entries"/>
+                    <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
+                    <newline/>
+                    <group col="4">
+                        <field name="fy_id" domain = "[('state','=','draft')]"/>
+                        <field name="fy2_id" domain = "[('state','=','draft')]"/>
+                        <field name="journal_id"/>
+                        <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
+                        <field name="report_name"/>
+                    </group>
+                </form>
+            </field>
         </record>
 
         <record id="action_account_fiscalyear_close" model="ir.actions.act_window">
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 57edd62f575..aec13d4ca72 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -7,26 +7,22 @@
             <field name="model">account.invoice.refund</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Credit Note">
-                    <separator string="Credit Note Options" colspan="4"/>
-                    <group colspan="4" >
+                <form string="Credit Note" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
+                    </header>
+                    <separator string="Credit Note Options"/>
+                    <group col="4">
                          <field name="description"/>
                          <field name="journal_id" widget='selection'/>
                          <field name="date"/>
                          <field name="period"/>
                          <field name="filter_refund"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4" fill="1">
-                    	<label align="0.0" width="550" colspan="4" string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
-                        <label align="0.0" width="300" string="Credit Note: Creates the credit note, ready for editing."/>
-                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
-                   </group>
+                    <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
+                    <label string="Credit Note: Creates the credit note, ready for editing."/>
+                    <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index a1fd5dc3673..d95889a6558 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Confirm Draft Invoices">
+            <form string="Confirm Draft Invoices" version="7.0">
                 <separator string="Confirm Draft Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
@@ -27,7 +27,7 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Cancel Selected Invoices">
+            <form string="Cancel Selected Invoices" version="7.0">
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index abd596c2f24..036cd3b2f8a 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,14 +7,13 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Journal Select">
-                    <label string="Are you sure you want to open Journal Entries?" colspan="4"/>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
-                   </group>
-               </form>
+            <form string="Journal Select" version="7.0">
+                <header>
+                    <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                </header>
+                <label string="Are you sure you want to open Journal Entries?"/>
+            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 72680a59725..d5d83699666 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -6,16 +6,14 @@
             <field name="model">account.move.bank.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bank reconciliation">
-                    <group colspan="4" >
+                <form string="Bank reconciliation" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <group>
                         <field name="journal_id"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
-                   </group>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index a7d4f36916b..8c7a62a2281 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -107,20 +107,19 @@ class account_move_journal(osv.osv_memory):
             open_string = _("Open")
             view = """<?xml version="1.0" encoding="utf-8"?>
             <form string="Standard entries">
-                <separator string="%s" colspan="4"/>
-                <field name="target_move" />
-                <newline/>
+                <header>
+                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="%s"/>
+                </header>
+                <group string="%s" colspan="4">
+                    <field name="target_move" />
+                </group>
                 <group colspan="4" >
                     <label width="300" string="%s"/>
                     <newline/>
                     <label width="300" string="%s"/>
                 </group>
-                <group colspan="4" col="4">
-                    <label string ="" colspan="2"/>
-                    <button icon="gtk-cancel" special="cancel" string="%s"/>
-                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
-                </group>
-            </form>""" % (separator_string, journal_string, period_string, cancel_string, open_string)
+            </form>""" % (open_string, cancel_string, separator_string, journal_string, period_string)
     
             view = etree.fromstring(view.encode('utf8'))
             xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 93e8c9a04b1..559c021a0ff 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -6,16 +6,14 @@
             <field name="model">account.move.line.reconcile.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reconciliation">
-                    <group colspan="4" >
+                <form string="Reconciliation" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    </header>
+                    <group>
                          <field name="account_id"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index ae6c9e572d1..6ce685431fe 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -7,13 +7,12 @@
             <field name="model">account.move.line.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Select">
-                    <label string="Are you sure you want to open Account move line entries!" colspan="4"/>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
+                <form string="Account Select" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
-                   </group>
+                    </header>
+                    <label string="Are you sure you want to open Account move line entries!"/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 31183f84c82..9123e7b826e 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -6,16 +6,14 @@
             <field name="model">account.move.line.unreconcile.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Unreconciliation">
-                    <group colspan="4" >
+                <form string="Unreconciliation" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    </header>
+                    <group>
                         <field name="account_id"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
-                        <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index a7e35390c46..a4e338f3b9e 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -6,15 +6,13 @@
             <field name="model">account.open.closed.fiscalyear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Choose Fiscal Year ">
-                    <group colspan="4" >
-                        <field name="fyear_id"  domain = "[('state','=','draft')]"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
+                <form string="Choose Fiscal Year " version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
+                    </header>
+                    <group>
+                        <field name="fyear_id" domain="[('state','=','draft')]"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 49f6c9cdbb1..6bf54e07945 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -7,17 +7,15 @@
             <field name="model">account.period.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Close Period">
-                    <group colspan="4" >
-                        <separator string="Are you sure?" colspan="4"/>
-                        <field name="sure"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
+                <form string="Close Period" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button  icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
-                   </group>
+                    </header>
+                    <separator string="Are you sure?" colspan="4"/>
+                    <group>
+                        <field name="sure"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index cc6cf96ac7c..2648c3439bf 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -6,16 +6,16 @@
             <field name="model">account.partner.reconcile.process</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Reconciliation">
-                    <field name="progress" widget="progressbar" colspan="4"/>
-                    <field name="today_reconciled"/>
-                    <field name="to_reconcile"/>
-                    <newline/>
-                    <field name="next_partner_id" colspan="4"/>
-                    <newline/>
-                    <group colspan="4" col="4">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Partner Reconciliation" version="7.0">
+                    <header>
                         <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" />
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <group col="4">
+                        <field name="next_partner_id"/>
+                        <field name="progress" widget="progressbar" colspan="4"/>
+                        <field name="today_reconciled"/>
+                        <field name="to_reconcile"/>
                     </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index c2e0fec7bae..959c4ceddcf 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -7,21 +7,21 @@
             <field name="model">account.move.line.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reconciliation">
-                    <separator string="Reconciliation Transactions" colspan="4"/>
-                    <field name="trans_nbr"/>
-                    <newline/>
-                    <field name="credit"/>
-                    <field name="debit"/>
-                    <separator string="Write-Off" colspan="4"/>
-                    <field name="writeoff"/>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
+                <form string="Reconciliation" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
                         <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
                         <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
-                   </group>
+                    </header>
+                    <group col="4" string="Reconciliation Transactions">
+                        <field name="trans_nbr"/>
+                        <newline/>
+                        <field name="credit"/>
+                        <field name="debit"/>
+                    </group><group string="Write-Off">
+                        <field name="writeoff"/>
+                    </group>
                </form>
             </field>
         </record>
@@ -49,18 +49,18 @@
             <field name="model">account.move.line.reconcile.writeoff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Information addendum">
-                    <separator string="Write-Off Move" colspan="4"/>
-                    <field name="journal_id"/>
-                    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
-                    <field name="date_p"/>
-                    <field name="comment"/>
-                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <form string="Information addendum" version="7.0">
+                    <header>
                         <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
-                   </group>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <group string="Write-Off Move" col="4">
+                        <field name="journal_id"/>
+                        <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+                        <field name="date_p"/>
+                        <field name="comment"/>
+                        <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index bd54b925eea..d6cde8599e0 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -8,24 +8,23 @@
             <field name="type">form</field>
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
-                <form string="Report Options">
-                    <separator colspan="4" string="Aged Partner Balance"/>
-                    <label colspan="4" nolabel="1" string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
-                    <newline/>
-                    <field name="chart_account_id" widget='selection'/>
-                    <newline/>
-                    <field name="date_from"/>
-                    <field name="period_length"/>
-                    <newline/>
-                    <field name="result_selection"/>
-                    <field name="direction_selection"/>
-                    <field name="journal_ids" required="0" invisible="1"/>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                <form string="Report Options" version="7.0">
+                    <header>
                         <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/>
-                     </group>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                    </header>
+                    <separator string="Aged Partner Balance"/>
+                    <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
+                    <group col="4">
+                        <field name="chart_account_id" widget='selection'/>
+                        <newline/>
+                        <field name="date_from"/>
+                        <field name="period_length"/>
+                        <newline/>
+                        <field name="result_selection"/>
+                        <field name="direction_selection"/>
+                    </group>
+                    <field name="journal_ids" required="0" invisible="1"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index db1da8223d5..425f5d3bbbc 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -7,32 +7,36 @@
             <field name="model">account.common.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Report Options">
-                  <label nolabel="1" string=""/>
-                  <newline/>
+            <form string="Report Options" version="7.0">
+                <header>
+                    <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
+                    <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
+                </header>
+                <label string=""/>  <!-- binding for inherited views -->
+                <group col="4">
                    <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
                    <field name="company_id" invisible="1"/>
                    <field name="fiscalyear_id" domain="[('company_id','=',company_id)]"/>
                    <field name="target_move"/>
-                       <notebook tabpos="up" colspan="4">
-                            <page string="Filters" name="filters">
-                                <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/>
-                                    <separator string="Dates" colspan="4"/>
-                                    <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
-                                    <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
-                                    <separator string="Periods"  colspan="4"/>
-                                    <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                                    <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                            </page>
-                            <page string="Journals" name="journal_ids">
-                                <field name="journal_ids" colspan="4" nolabel="1"/>
-                            </page>
-                        </notebook>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
-                        <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
-                    </group>
+                </group>
+                <notebook tabpos="up" colspan="4">
+                    <page string="Filters" name="filters">
+                        <group col="4">
+                            <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
+                        </group>
+                        <group string="Dates" col="4">
+                            <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
+                            <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
+                        </group>
+                        <group string="Periods" col="4">
+                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                        </group>
+                    </page>
+                    <page string="Journals" name="journal_ids">
+                        <field name="journal_ids"/>
+                    </page>
+                </notebook>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index d3b68cb5186..5ea33021926 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -7,15 +7,13 @@
             <field name="model">account.state.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                    <form string="Open Invoice">
-                    <label string="Are you sure you want to open this invoice ?"/>
-                    <newline/>
-                    <label string="(Invoice should be unreconciled if you want to open it)"/>
-                    <separator colspan="4"/>
-                    <group colspan="2" col="4">
-                        <button special="cancel" string="No"  icon="terp-gtk-stop"/>
+                <form string="Open Invoice" version="7.0">
+                    <header>
                         <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test"/>
-                    </group>
+                        <button special="cancel" string="No"  icon="terp-gtk-stop"/>
+                    </header>
+                    <label string="Are you sure you want to open this invoice ?"/>
+                    <label string="(Invoice should be unreconciled if you want to open it)"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 7d61af62fb9..bf848bb3776 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -7,18 +7,17 @@
             <field name="model">account.subscription.generate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription Compute">
-                    <separator string="Generate Entries before:" colspan="4"/>
-                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date." colspan="4" nolabel="1"/>
-                    <newline/>
-                    <field name="date"/>
-                	<separator colspan="4" />
-                	<group colspan="4" col="6">
-                		<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="gtk-execute" string="Generate Entries"
-                    	name="action_generate" type="object" />
-                	</group>
+                <form string="Subscription Compute" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-execute" string="Generate Entries"
+                            name="action_generate" type="object" />
+                    </header>
+                    <separator string="Generate Entries before:"/>
+                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
+                    <group>
+                        <field name="date"/>
+                    </group>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index a4f5860d41f..309af53ca17 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -7,17 +7,15 @@
             <field name="model">account.tax.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account tax charts">
-                    <group colspan="4" >
-                        <field name="period_id"/>
-                        <label align="0.7" colspan="6" string="(If you do not select period it will take all open periods)"/>
-                        <field name="target_move"/>
-                    </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <label string ="" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                <form string="Account tax charts" version="7.0">
+                    <header>
                         <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    </header>
+                    <group>
+                        <field name="period_id"/>
+                        <label colspan="4" string="(If you do not select period it will take all open periods)"/>
+                        <field name="target_move"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 543fb9fcde6..0d9bb1a466f 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -7,16 +7,14 @@
             <field name="model">account.unreconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Unreconciliation">
-                <separator string="Unreconciliate Transactions" colspan="4"/>
-                <image name="terp-referer"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled" colspan="2"/>
-                <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
-                   </group>
-               </form>
+            <form string="Unreconciliation" version="7.0">
+                <header>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                </header>
+                <separator string="Unreconciliate Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+            </form>
             </field>
         </record>
 
@@ -43,16 +41,14 @@
             <field name="model">account.unreconcile.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Unreconciliation">
-                <separator string="Unreconciliation Transactions" colspan="4"/>
-                <image name="gtk-dialog-info"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-                <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
-                   </group>
-               </form>
+            <form string="Unreconciliation" version="7.0">
+                <header>
+                    <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                </header>
+                <separator string="Unreconciliation Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+            </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index c26a81277aa..682236a0610 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -7,15 +7,16 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Create Entries From Models">
-                    <separator string="This wizard will create recurring accounting entries" colspan="4"/>
-                    <label string="Create manual recurring entries in a chosen journal." width="400"/>
-                    <field name="model" colspan="4" nolabel="1"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-                    </group>
+            <form string="Create Entries From Models" version="7.0">
+                <header>
+                    <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                </header>
+                <separator string="This wizard will create recurring accounting entries"/>
+                <label string="Create manual recurring entries in a chosen journal."/>
+                <group>
+                    <field name="model"/>
+                </group>
             </form>
             </field>
         </record>
@@ -37,11 +38,12 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Use Model">
-                    <label string = "Are you sure you want to create entries?" colspan="2"/>
-                    <newline/>
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
+                <form string="Use Model" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <label string = "Are you sure you want to create entries?"/>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 31984596000..2ee826fe1f7 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,17 +8,17 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Post Journal Entries">
-                <separator string="Post Journal Entries of a Journal" colspan="4"/>
-                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore." colspan="4"/>
-                <field name="journal_id"/>
-                <newline/>
-                <field name="period_id"/>
-                <separator colspan="4"/>
-                <group colspan="4" col="6">
-                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+            <form string="Post Journal Entries" version="7.0">
+                <header>
                     <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
-               </group>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                </header>
+                <separator string="Post Journal Entries of a Journal"/>
+                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
+                <group>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                </group>
                </form>
             </field>
         </record>
@@ -46,15 +46,13 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Post Journal Entries">
-                <separator string="Post Journal Entries" colspan="4"/>
-                <image name="terp-referer"/>
-                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
-                <separator colspan="4"/>
-                <group colspan="4" col="6">
+            <form string="Post Journal Entries" version="7.0">
+                <header>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/>
-               </group>
+                </header>
+                <separator string="Post Journal Entries"/>
+                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index d8e7560e029..a54da1aaad6 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -7,20 +7,22 @@
             <field name="model">account.vat.declaration</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Taxes Report">
-                <separator string="Taxes Report" colspan="4"/>
-                <label colspan="4" nolabel="1" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
-                <newline/>
-                <field name="chart_tax_id" widget='selection'/>
-                <field name="fiscalyear_id"/>
-                <field name="display_detail"/>
-                <!--- <field name="based_on"/>--> <!-- the option based_on 'payment' is probably not fully compliant with what the users understand with that term. So, currently, it's seems better to remove it from the view to avoid further problems -->
-                <separator string="Periods"  colspan="4"/>
-                <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
-                <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
-                <group col="2" colspan="4">
+            <form string="Taxes Report" version="7.0">
+                <header>
+                    <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok"/>
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
-                    <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>
+                </header>
+                <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <group string="Taxes Report" col="4">
+                    <field name="chart_tax_id" widget='selection'/>
+                    <field name="fiscalyear_id"/>
+                    <field name="display_detail"/>
+                    <!--- <field name="based_on"/>--> <!-- the option based_on 'payment' is probably not fully compliant with what the users understand with that term. So, currently, it's seems better to remove it from the view to avoid further problems -->
+                </group>
+
+                <group string="Periods"  col="4">
+                    <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
+                    <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                 </group>
             </form>
             </field>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 88772aede84..c4e8c16f70a 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Defaults" colors="grey:date_stop and (date_stop &lt; datetime.date.today().strftime('%%Y-%%m-%%d'))" >
+                <tree string="Analytic Defaults">
                     <field name="sequence"/>
                     <field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
@@ -24,7 +24,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Analytic Defaults">
+                <form string="Analytic Defaults" version="7.0">
                     <group col="4">
                         <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                         <field name="sequence"/>
diff --git a/addons/account_analytic_default/i18n/ja.po b/addons/account_analytic_default/i18n/ja.po
index 7e109b403a7..582c5eff791 100644
--- a/addons/account_analytic_default/i18n/ja.po
+++ b/addons/account_analytic_default/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-16 17:39+0000\n"
+"PO-Revision-Date: 2012-06-08 01:35+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-04-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -57,7 +57,7 @@ msgstr "この分析アカウントのデフォルト終了日"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr "集荷リスト"
+msgstr "出庫票"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -128,7 +128,7 @@ msgstr "分析デフォルト"
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "参照は会社ごとにユニークでなければいけません。"
+msgstr "参照は会社内で固有でなければいけません"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -181,7 +181,7 @@ msgstr "開始日"
 #: help:account.analytic.default,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
-msgstr "分析ディストリビューションのリストを表示する時に、順序の並べ順を与えて下さい。"
+msgstr "分析ディストリビューションのリストを表示する時に、順序の並びを与えます。"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index f2ba4c40d67..265f71d690f 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -111,7 +111,7 @@
         <field name="model">account.analytic.plan.instance</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Distribution">
+            <form string="Analytic Distribution" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="code"/>
@@ -123,7 +123,7 @@
                         <field name="rate"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </tree>
-                    <form string="Analytic Distribution">
+                    <form string="Analytic Distribution" version="7.0">
                         <field name="rate"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </form>
@@ -138,8 +138,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Distribution">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
+                <field name="name"/>
+                <field name="code"/>
                 <field name="plan_id"/>
                 <field name="journal_id"/>
             </tree>
@@ -167,7 +167,7 @@
         <field name="model">account.analytic.plan.instance.line</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Distribution Line">
+            <form string="Analytic Distribution Line" version="7.0">
                 <group col="4">
                     <field name="plan_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
@@ -183,8 +183,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Distribution Lines">
-                <field name="plan_id" select="1"/>
-                <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                <field name="plan_id"/>
+                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="rate"/>
             </tree>
         </field>
@@ -206,7 +206,7 @@
         <field name="model">account.analytic.plan</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Plan">
+            <form string="Analytic Plan" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="default_instance_id"/>
@@ -252,7 +252,7 @@
         <field name="model">account.analytic.plan.line</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Analytic Plan Line">
+            <form string="Analytic Plan Line" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="sequence"/>
@@ -271,7 +271,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Plan Lines">
-                <field name="name" select="1"/>
+                <field name="name"/>
                 <field name="sequence"/>
                 <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
                 <field name="min_required"/>
@@ -289,7 +289,7 @@
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
             <field name="arch" type="xml">
                 <field name="analytic_id" required="1" position="replace">
-                    <field name="analytics_id" select="1" required="1"/>
+                    <field name="analytics_id" required="1"/>
                 </field>
             </field>
         </record>
@@ -300,7 +300,7 @@
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
             <field name="arch" type="xml">
                 <field name="analytic_id" required="1" position="replace">
-                    <field name="analytics_id" select="1" required="1"/>
+                    <field name="analytics_id" required="1"/>
                 </field>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 60c1bf67463..4138fe79582 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -2,26 +2,25 @@
 <openerp>
     <data>
 
-		<record id="view_account_crossovered_analytic" model="ir.ui.view">
+        <record id="view_account_crossovered_analytic" model="ir.ui.view">
             <field name="name">account.crossovered.analytic.form</field>
             <field name="model">account.crossovered.analytic</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Crossovered Analytic">
-			    <group col="4" colspan="6">
-				    <field name="date1"/>
-				    <field name="date2"/>
-				    <field name="ref" groups="analytic.group_analytic_accounting"/>
-				    <field name="empty_line"/>
-				    <separator colspan="4" string="Analytic Journal"/>
-				    <field name="journal_ids" colspan="4" nolabel="1"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-				</group>
-			</form>
+            <form string="Crossovered Analytic" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                </header>
+                <group col="4">
+                    <field name="date1"/>
+                    <field name="date2"/>
+                    <field name="ref" groups="analytic.group_analytic_accounting"/>
+                    <field name="empty_line"/>
+                </group><group string="Analytic Journal">
+                    <field name="journal_ids" colspan="2" nolabel="1"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -34,7 +33,7 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="account_crossovered_analytic_values">
+        <record model="ir.values" id="account_crossovered_analytic_values">
             <field name="model_id" ref="analytic.model_account_analytic_account" />
             <field name="name">Crossovered Analytic</field>
             <field name="key2">client_print_multi</field>
@@ -43,5 +42,5 @@
             <field name="model">account.analytic.account</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index 75ef07e0098..fd7c03e058e 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -1,40 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		<record id="view_analytic_plan_create_model_msg" model="ir.ui.view">
+        <record id="view_analytic_plan_create_model_msg" model="ir.ui.view">
             <field name="name">analytic.plan.create.model.msg.form</field>
             <field name="model">analytic.plan.create.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Distribution Model Saved">
-			    <group col="4" colspan="6">
-			    	<label string="Save This Distribution as a Model"/>
-				    <newline/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-			    	<button special="cancel" string="Cancel" icon='gtk-ok' />
-            		<button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
-				</group>
-			</form>
+            <form string="Distribution Model Saved" version="7.0">
+                <header>
+                    <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
+                    <button special="cancel" string="Cancel" icon='gtk-ok' />
+                </header>
+                <label string="Save This Distribution as a Model"/>
+            </form>
             </field>
         </record>
 
-		<record id="view_analytic_plan_create_model" model="ir.ui.view">
+        <record id="view_analytic_plan_create_model" model="ir.ui.view">
             <field name="name">analytic.plan.create.model.form</field>
             <field name="model">analytic.plan.create.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Distribution Model Saved">
-			    <group col="4" colspan="6">
-			    	<label string="This distribution model has been saved.You will be able to reuse it later."/>
-				    <newline/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel" string="Ok" icon='gtk-ok'/>
-				</group>
-			</form>
+            <form string="Distribution Model Saved" version="7.0">
+                <header>
+                    <button special="cancel" string="Ok" icon='gtk-ok'/>
+                </header>
+                <label string="This distribution model has been saved.You will be able to reuse it later."/>
+            </form>
             </field>
         </record>
 
@@ -49,5 +41,5 @@
             <field name="view_id" ref="view_analytic_plan_create_model_msg"/>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account_anglo_saxon/i18n/ja.po b/addons/account_anglo_saxon/i18n/ja.po
index a2d2eb88dc6..d362fcbcfc1 100644
--- a/addons/account_anglo_saxon/i18n/ja.po
+++ b/addons/account_anglo_saxon/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-31 06:16+0000\n"
+"PO-Revision-Date: 2012-06-10 03:21+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-06-01 05:33+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "注文参照は、会社内で固有でなければなりません。"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 90dc9d61d3a..01144c153e5 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -10,7 +10,7 @@
         <field name="model">account.asset.category</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset category">
+            <form string="Asset category" version="7.0">
                 <group>
                     <group>
                         <field name="name"/>
@@ -79,7 +79,7 @@
         <field name="model">account.asset.asset</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset">
+            <form string="Asset" version="7.0">
                 <header>
                     <button name="validate" states="draft" string="Confirm Asset" type="object"/>
                     <button name="set_to_close" states="open" string="Set to Close" type="object"/>
@@ -225,7 +225,7 @@
         <field name="model">account.asset.history</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Asset History">
+            <form string="Asset History" version="7.0">
                 <group>
                     <group>
                         <field name="name"/>
diff --git a/addons/account_asset/i18n/et.po b/addons/account_asset/i18n/et.po
new file mode 100644
index 00000000000..fff0ba81511
--- /dev/null
+++ b/addons/account_asset/i18n/et.po
@@ -0,0 +1,793 @@
+# Estonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-08 18:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian <et@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-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Lõppkuupäev"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Jääkväärtus"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Arvestus"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Grupeeri..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Ettevõte"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Muuda"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Käivitatud"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Põhivarade analüüs"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Põhjus"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Kirjed"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Varad"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "Märkused"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Lõppkuupäev"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Viide"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Mustand"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Soetuskuupäev"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analüütiline konto"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Arvestusmeetod"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Aasta"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Muuda"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Muu info"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Kategooria"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Sulge"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "Arvesta"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Muuda"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Suletud põhivarad"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Põhivara ajalugu"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "Olek"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Arve rida"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Kuu"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Märkus"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Suletud"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Kuupäev"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Arvuta"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiivne"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Sulge"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "Olek"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Ajalugu"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Periood"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Üldine"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Arve"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "Loobu"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Sulge"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Amortisatsioonimeetod"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Ostetud"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Praegune"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Valuuta"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Päevik"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Postitatud"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sea mustandiks"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Lineaarne"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_asset/i18n/sl.po b/addons/account_asset/i18n/sl.po
new file mode 100644
index 00000000000..ff62d2f6025
--- /dev/null
+++ b/addons/account_asset/i18n/sl.po
@@ -0,0 +1,793 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-09 10:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Datum zaključka"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Združeno po..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Premoženje"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Naziv"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Podjetje"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Spremeni"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Se izvaja"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Vzrok"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Vnosi"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Premoženje"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "Konto amortizacije"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "Opombe"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Končni datum"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referenca"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analitični konto"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "Bruto "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Leto"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Postavka računa"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Postavke"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Opomba"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Zaprto"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Poslovni partner"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Razširjeni filtri..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Izračunaj"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktivno"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Zgodovina"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Številka računa se ne sme ponoviti!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Obdobje"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Splošno"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "Preklic"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Zapri"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Datum nakupa"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Trenutno"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Knjiženo"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Nastavi kot osnutek"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Linearno"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "Mesec-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Konto je zaprt."
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index bebd4af0225..a68d28ac653 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -7,26 +7,21 @@
             <field name="model">asset.modify</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Modify Asset">
-                    <group colspan="4" col="4">
-                        <separator string="Asset Durations to Modify" colspan="4"/>
+                <form string="Modify Asset" version="7.0">
+                    <header>
+                        <button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
                         <group colspan="2" col="2">
                             <field name="method_number"/>
                             <field name="method_end"/>
                         </group>
                         <field name="method_period"/>
-                        <separator string="Notes" colspan="4"/>
-                        <field name="note" nolabel="1" colspan="4"/>
-                    </group>
-                    <newline/>
-                    <group colspan="4" col="4">
-                        <separator string ="" colspan="4"/>
-                        <newline/>
-                        <group colspan="2" col="2"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                        <button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
                     </group>
+                    <separator string="Notes"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index 00636491ac4..5d2bc39a751 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -6,19 +6,18 @@
             <field name="model">asset.depreciation.confirmation.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                    <form string="Compute Asset">
-                        <separator string="Post Depreciation Lines" colspan="4"/>
-                        <label string="This wizard will post the depreciation lines of running assets that belong to the selected period." colspan="4"/>
-                        <newline/>
+                <form string="Compute Asset" version="7.0">
+                    <header>
+                        <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <separator string="Post Depreciation Lines"/>
+                    <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
+                    <group>
                         <field name="period_id"/>
-                        <separator colspan="4"/>
-                        <group colspan="4" col="6">
-                           <label string="" colspan="2"/>
-                           <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                           <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
-                        </group>
-                     </form>
-                   </field>
+                    </group>
+                </form>
+             </field>
         </record>
 
         <record id="action_asset_depreciation_confirmation_wizard" model="ir.actions.act_window">
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index bbd8cabeda4..d806760a85b 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -9,7 +9,7 @@
       <field name="model">account.bank.statement.line.global</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Batch Payment Info">
+        <form string="Batch Payment Info" version="7.0">
             <group col="4">
                 <field name="name"/>
                 <field name="amount"/>
@@ -94,7 +94,7 @@
       <field name="model">account.bank.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Statement Line">
+        <form string="Statement Line" version="7.0">
           <group col="4">
               <field name="statement_id"/>
               <field name="journal_id"/>
diff --git a/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
index 23a28440d54..c423527a0c2 100644
--- a/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
@@ -9,16 +9,11 @@
       <field name="model">cancel.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Cancel selected statement lines">
-          <label string="" colspan="4"/>
-          <label colspan="4" string="Are you sure you want to cancel the selected Bank Statement lines ?"/>
-          <label string="" colspan="4"/>
-          <separator colspan="4"/>
-          <group>
-            <label string="" colspan="2"/>
-            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-            <button icon="gtk-execute" string="Cancel Lines" name="cancel_lines" type="object"/>
-          </group>
+        <form string="Cancel selected statement lines" version="7.0">
+            <header>
+                <button icon="gtk-execute" string="Cancel Lines" name="cancel_lines" type="object"/>
+            </header>
+            <label string="Are you sure you want to cancel the selected Bank Statement lines ?"/>
         </form>
       </field>
     </record>
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
index c44e58e340d..0171c265395 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
@@ -9,17 +9,13 @@
       <field name="model">confirm.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Confirm selected statement lines">
-          <label string="" colspan="4"/>
-          <label colspan="4" string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
-          <label colspan="4" string="Confirmed lines cannot be changed anymore."/>
-          <label string="" colspan="4"/>
-          <separator colspan="4"/>
-          <group>
-            <label string="" colspan="2"/>
-            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-            <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
-          </group>
+        <form string="Confirm selected statement lines" version="7.0">
+            <header>
+                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
+            </header>
+            <label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
+            <label string="Confirmed lines cannot be changed anymore."/>
         </form>
       </field>
     </record>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 1c975cef727..1dd4e3a7dc0 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -55,7 +55,7 @@
             <field name="model">account.budget.post</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Budgetary Position">
+                <form string="Budgetary Position" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -79,11 +79,11 @@
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
                                     <field name="planned_amount" sum="Planned Amount"/>
-                                    <field name="practical_amount" select="1" sum="Practical Amount" />
+                                    <field name="practical_amount" sum="Practical Amount" />
                                     <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
-                                <form string="Budget Lines">
+                                <form string="Budget Lines" version="7.0">
                                     <group col="4">
                                         <field name="crossovered_budget_id"/>
                                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
@@ -91,7 +91,7 @@
                                         <field name="date_to"/>
                                         <field name="paid_date"/>
                                         <field name="planned_amount"/>
-                                        <field name="practical_amount" select="1"/>
+                                        <field name="practical_amount"/>
                                         <field name="theoritical_amount"/>
                                         <field name="percentage"/>
                                     </group>
@@ -108,19 +108,19 @@
             <field name="model">crossovered.budget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" />
                     <button string="Approve" name="validate" states="confirm" type="workflow"/>
                     <button string="Done" name="done" states="validate" type="workflow"   />
                     <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
                     <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
-                    <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Budget">
                     <group col="4">
-                            <field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
-                            <field name="code" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
                             <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -138,14 +138,14 @@
                                     <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
-                                <form string="Budget Lines">
+                                <form string="Budget Lines" version="7.0">
                                     <group col="4">
-                                        <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                                        <field name="general_budget_id" select="1"/>
+                                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                        <field name="general_budget_id"/>
                                         <field name="date_from"/>
                                         <field name="date_to"/>
-                                        <field name="paid_date" select="1"/>
-                                        <field name="planned_amount" select="1"/>
+                                        <field name="paid_date"/>
+                                        <field name="planned_amount"/>
                                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                     </group>
                                 </form>
@@ -230,7 +230,7 @@
             <field name="model">crossovered.budget.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Budget Lines">
+                <form string="Budget Lines" version="7.0">
                     <group col="4">
                         <field name="crossovered_budget_id"/>
                         <field name="analytic_account_id"/>
@@ -288,7 +288,7 @@
                                     <field name="theoritical_amount" sum="Theoritical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
-                                <form string="Budget Lines">
+                                <form string="Budget Lines" version="7.0">
                                     <group col="4">
                                         <field name="crossovered_budget_id"/>
                                         <field name="general_budget_id"/>
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index 8be3f6115c5..758466160c1 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-13 19:58+0000\n"
+"PO-Revision-Date: 2012-06-08 01:54+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-04-14 04:57+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -128,8 +128,8 @@ msgid ""
 msgstr ""
 "予算は将来の期間における、予想される会社の収入と支出です。予算に基づき、会社はその期間の間にどのくらいのお金を得るのかを注意深く見ることができます。そして"
 "、さまざまな分類に分配する最適な方法を理解することができます。お金がどこに行くのかを追跡し続けることで、お金の使い過ぎの可能性を減らし、財務目標を達成しや"
-"すくします。分析的なアカウントごとに期待される収入を詳細化することで予算を予測して下さい。そして、その期間中に実際にそれを実現することを基本にその展開を監"
-"視して下さい。"
+"すくします。分析的なアカウントごとに期待される収入を詳細化することで予算を予測します。そして、その期間中に実際にそれを実現することを基本にその展開を監視し"
+"ます。"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 4081026b911..a3ca1d8c1b6 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -7,37 +7,37 @@
              <field name="model">account.budget.analytic</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-                    <separator string="This wizard is used to print budget" colspan="4"/>
-				    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <separator colspan="4"/>
-				    <group colspan="4" col="6">
-	 					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	           			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-					</group>
-				</form>
-			</field>
-		</record>
+                 <form string="Select Dates Period" version="7.0">
+                     <header>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                     </header>
+                     <group string="This wizard is used to print budget" col="4">
+                         <field name="date_from"/>
+                         <field name="date_to"/>
+                     </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_budget_analytic" model="ir.actions.act_window">
-			<field name="name">Print Budgets</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.budget.analytic</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_budget_analytic_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_budget_analytic" model="ir.actions.act_window">
+            <field name="name">Print Budgets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.budget.analytic</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_budget_analytic_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_budget_analytic_values">
-			<field name="model_id" ref="analytic.model_account_analytic_account" />
-			<field name="name">Print Budgets</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_analytic'))" />
-			<field name="key">action</field>
-			<field name="model">account.analytic.account</field>
-		</record>
+        <record model="ir.values" id="account_budget_analytic_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="name">Print Budgets</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_analytic'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index 35cf353ccde..f572109b1fd 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -7,35 +7,35 @@
              <field name="model">account.budget.crossvered.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-                	<separator string="This wizard is used to print budget" colspan="4"/>
-				    <field name="date_from"/>
-				    <field name="date_to"/>
-				    <separator colspan="4"/>
-				    <group colspan="4" col="6">
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-					</group>
-				</form>
-			</field>
-		</record>
+                 <form string="Select Dates Period" version="7.0">
+                     <header>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                     </header>
+                    <group string="This wizard is used to print budget" col="4">
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_budget_crossvered_report" model="ir.actions.act_window">
-			<field name="name">Print Budgets</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.budget.crossvered.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_budget_crossvered_report_view"/>
-			<field name="target">new</field>
-		</record>
-		<record model="ir.values" id="account_budget_crossvered_report_values">
-			<field name="model_id" ref="account_budget.model_crossovered_budget" />
-			<field name="name">Print Budgets</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_report'))" />
-			<field name="key">action</field>
-			<field name="model">crossovered.budget</field>
-		</record>
-	</data>
+        <record id="action_account_budget_crossvered_report" model="ir.actions.act_window">
+            <field name="name">Print Budgets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.budget.crossvered.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_budget_crossvered_report_view"/>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.values" id="account_budget_crossvered_report_values">
+            <field name="model_id" ref="account_budget.model_crossovered_budget" />
+            <field name="name">Print Budgets</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_report'))" />
+            <field name="key">action</field>
+            <field name="model">crossovered.budget</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index 70f5eef38f7..ab4f75c2729 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -7,36 +7,36 @@
              <field name="model">account.budget.crossvered.summary.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-	             <form string="Select Dates Period">
-					<separator string="This wizard is used to print summary of budgets" colspan="4"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-					</group>
-				</form>
-			</field>
-		</record>
+                 <form string="Select Dates Period" version="7.0">
+                     <header>
+                         <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                     </header>
+                    <group string="This wizard is used to print summary of budgets">
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_budget_crossvered_summary_report" model="ir.actions.act_window">
-			<field name="name">Print Summary</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.budget.crossvered.summary.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_budget_crossvered_summary_report_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_budget_crossvered_summary_report" model="ir.actions.act_window">
+            <field name="name">Print Summary</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.budget.crossvered.summary.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_budget_crossvered_summary_report_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_budget_crossvered_summary_report_values">
-			<field name="model_id" ref="account_budget.model_crossovered_budget" />
-			<field name="name">Print Summary</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" />
-			<field name="key">action</field>
-			<field name="model">crossovered.budget</field>
-		</record>
-	</data>
+        <record model="ir.values" id="account_budget_crossvered_summary_report_values">
+            <field name="model_id" ref="account_budget.model_crossovered_budget" />
+            <field name="name">Print Summary</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" />
+            <field name="key">action</field>
+            <field name="model">crossovered.budget</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index bfa61240b3b..aba258663b7 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -7,15 +7,15 @@
         <field name="model">account.budget.report</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-          <form string="Select Dates Period">
-			<separator string="Print Budgets" colspan="4"/>
-			<field name="date_from"/>
-			<field name="date_to"/>
-			<separator colspan="4"/>
-            <group colspan="4" col="6">
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+          <form string="Select Dates Period" version="7.0">
+              <header>
                   <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
-            </group>
+                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+              </header>
+              <group string="Print Budgets" col="4">
+                  <field name="date_from"/>
+                  <field name="date_to"/>
+              </group>
           </form>
         </field>
       </record>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index df05bb8708e..7be5c4b8024 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -35,11 +35,11 @@
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Bank Account Configuration">
-          <field name="name" select="1"/>
+          <field name="name"/>
           <field name="bank_id"/>
           <field name="currency"/>
           <field name="description1"/>
-          <field name="journal" select="1"/>
+          <field name="journal"/>
           <field name="state"/>
         </tree>
       </field>
@@ -49,9 +49,9 @@
       <field name="model">coda.bank.account</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Bank Account Configuration">
+        <form string="CODA Bank Account Configuration" version="7.0">
             <group col="4">
-                <field name="name" select="1" colspan="4"/>
+                <field name="name" colspan="4"/>
                 <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 <field name="description1"/>
                 <field name="currency"/>
@@ -99,7 +99,7 @@
       <field name="model">account.coda.trans.type</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Transaction Type">
+          <form string="CODA Transaction Type" version="7.0">
               <group col="4">
                   <field name="type"/>
                   <field name="parent_id"/>
@@ -136,7 +136,7 @@
       <field name="model">account.coda.trans.code</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Transaction Code">
+          <form string="CODA Transaction Code" version="7.0">
               <group col="4">
                   <field name="code"/>
                   <field name="type"/>
@@ -173,7 +173,7 @@
       <field name="model">account.coda.trans.category</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Transaction Category">
+          <form string="CODA Transaction Category" version="7.0">
               <field name="category"/>
               <field name="description"/>
           </form>
@@ -205,7 +205,7 @@
       <field name="model">account.coda.comm.type</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Structured Communication Type">
+          <form string="CODA Structured Communication Type" version="7.0">
               <field name="code"/>
               <field name="description"/>
           </form>
@@ -245,7 +245,7 @@
       <field name="model">account.coda</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA File">
+          <form string="CODA File" version="7.0">
               <group col="4">
                   <field name="coda_creation_date"/>
                   <field name="name"/>
@@ -321,7 +321,7 @@
       <field name="model">coda.bank.statement</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-          <form string="CODA Bank Statement">
+          <form string="CODA Bank Statement" version="7.0">
               <group col="4">
                   <field name="name"/>
                   <field name="date"/>
@@ -349,7 +349,7 @@
                       <field name="globalisation_amount" string="Glob. Amount"/>
                       <field name="globalisation_id" string="Glob. Id"/>
                     </tree>
-                    <form string="CODA Statement Lines">
+                    <form string="CODA Statement Lines" version="7.0">
                       <group col="4">
                           <field name="sequence" string="Seq"/>
                           <field name="date"/>
@@ -445,7 +445,7 @@
       <field name="model">coda.bank.statement.line</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="CODA Statement Line">
+        <form string="CODA Statement Line" version="7.0">
             <group col="4">
                 <field name="statement_id"/>
                 <field name="coda_bank_account_id"/>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index ed30a033040..91ba355ba65 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -8,17 +8,15 @@
       <field name="type">form</field>
       <field name="priority">1</field>
       <field name="arch" type="xml">
-        <form string="Import CODA File">
-          <group col="2">
-            <separator string="Select Your File :" colspan="4"/>
-            <field name="coda_data" filename="coda_fname"/>
-            <field name="coda_fname"/>
-          </group>
-          <separator colspan="4"/>
-          <group colspan="4">
-            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-            <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
-          </group>
+        <form string="Import CODA File" version="7.0">
+            <header>
+                <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
+                <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+            </header>
+            <group col="2" string="Select Your File :">
+                <field name="coda_data" filename="coda_fname"/>
+                <field name="coda_fname"/>
+            </group>
         </form>
       </field>
     </record>
@@ -29,14 +27,15 @@
       <field name="type">form</field>
       <field name="priority">2</field>
       <field name="arch" type="xml">
-        <form string="Import CODA File">
-          <separator colspan="4" string="Results :" />
-          <field name="note" colspan="4" nolabel="1" width="850" height="400"/>
-          <newline/>
-          <separator colspan="6"/>
-          <button special="cancel" string="Close" icon="gtk-cancel"/>
-          <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/>
-          <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
+        <form string="Import CODA File" version="7.0">
+          <header>
+              <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/>
+              <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
+              <button special="cancel" string="Close" icon="gtk-cancel"/>
+          </header>
+          <group string="Results :">
+              <field name="note" nolabel="1" colspan="2"/>
+          </group>
         </form>
       </field>
     </record>
diff --git a/addons/account_coda/i18n/ja.po b/addons/account_coda/i18n/ja.po
index b7d3e1e8cce..5994320ce8e 100644
--- a/addons/account_coda/i18n/ja.po
+++ b/addons/account_coda/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-11 23:57+0000\n"
+"PO-Revision-Date: 2012-06-08 02:01+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-05-13 04:43+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -1150,7 +1150,7 @@ msgid ""
 "CODA sequence number: %(coda)s\n"
 "Paper Statement sequence number: %(paper)s"
 msgstr ""
-"CODA処理により生成される銀行取引明細書の名前を作成するためのルールを定義して下さい。\n"
+"CODA処理により生成される銀行取引明細書の名前を作成するためのルールを定義します。\n"
 "例えば、%(code)s%(y)s/%(paper)s\n"
 "\n"
 "変数：\n"
@@ -1408,7 +1408,7 @@ msgstr "パートナ"
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_37
 msgid ""
 "Fixed right, either one-off or periodical; for details, see \"categories\""
-msgstr "右固定、１回限りまたは定期的の何れか；詳細については分類参照して下さい。"
+msgstr "右固定、１回限りまたは定期的の何れか；詳細については分類を参照して下さい。"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_05
@@ -2482,7 +2482,7 @@ msgstr "保険や株式仲介といった専門家のため"
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_19
 msgid ""
 "Collected for securities, gold, pass-books, etc. placed in safe custody"
-msgstr "証券、金、銀行通帳などの収集物を保護預りして下さい。"
+msgstr "証券、金、銀行通帳などの収集物は保護預りされました。"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_09_19
@@ -3009,7 +3009,7 @@ msgid ""
 msgstr ""
 "\n"
 "    銀行取引明細書t %s 行 %s：\n"
-"        銀行口座 %s は、このパートナに定義されていません %s\n"
+"        銀行口座 %s は、このパートナに定義されていません。 %s\n"
 "        設定を訂正し再度インポートを実行するか、そうでない場合は生成された銀行取引明細書の対応するエントリーを変更して下さい。"
 
 #. module: account_coda
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 74de731aa2f..89423327d68 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -19,7 +19,7 @@
             <field name="model">account_followup.followup.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up Steps">
+                <form string="Follow-Up Steps" version="7.0">
                     <group col="4">
                        <field name="name"/>
                        <field name="delay"/>
@@ -43,7 +43,7 @@
             <field name="model">account_followup.followup</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Follow-Up">
+                <form string="Follow-Up" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
diff --git a/addons/account_followup/i18n/ja.po b/addons/account_followup/i18n/ja.po
index 8722992cc42..d6889a8e67b 100644
--- a/addons/account_followup/i18n/ja.po
+++ b/addons/account_followup/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-12 05:34+0000\n"
+"PO-Revision-Date: 2012-06-09 02:19+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-05-13 04:43+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -243,7 +243,7 @@ msgstr "参照"
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr "フォローアップ行のリスト表示の際の並び順を与えて下さい。"
+msgstr "フォローアップ行のリスト表示の際の並び順を与えます。"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -346,7 +346,7 @@ msgstr ""
 msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
-msgstr "記述が無効です。正しい凡例またはパーセンテージ文字を使う場合は%%を使ってください。"
+msgstr "記述が無効です。正しい凡例またはパーセンテージ文字を使う場合は%%を使って下さい。"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -374,7 +374,7 @@ msgstr "メッセージ"
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr "ブロック済"
+msgstr "ブロック"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:299
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index a58c77a719c..8a592f01ac2 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,18 +7,17 @@
             <field name="model">account.followup.print</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups">
-                <separator string="Send Follow-Ups" colspan="4"/>
-                <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information." colspan="4" nolabel="1"/>
-                <group col="4" colspan="6">
+            <form string="Send followups" version="7.0">
+                <header>
+                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                </header>
+                <separator string="Send Follow-Ups"/>
+                <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
+                <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
                 </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
-                </group>
             </form>
             </field>
         </record>
@@ -75,38 +74,37 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups">
-                <group col="4" colspan="6">
-                        <notebook>
-                            <page string="Partner Selection">
-                                <separator string="Select Partners to Remind" colspan="4"/>
-                                <field name="partner_ids" colspan="4" nolabel="1" context="{'search_default_balance_positive': 1}" domain="[('company_id','=',context.get('company_id',False))]"/>
-                            </page>
-                            <page string="Email Settings">
-                                <field name="email_conf" colspan="4"/>
-                                <field name="partner_lang" colspan="4"/>
-                                <field name="test_print" colspan="4"/>
-                                <field name="email_subject" colspan="4"/>
-                                <separator string="Email Body" colspan="4" />
-                                <field name="email_body" colspan="4" nolabel="1"/>
-                                <separator string="Legend" colspan="4"/>
-                                <label string="%%(partner_name)s: Partner name" colspan="2"/>
-                                <label string="%%(user_signature)s: User name" colspan="2"/>
-                                <label string="%%(followup_amount)s: Total Amount Due" colspan="2"/>
-                                <label string="%%(date)s: Current Date" colspan="2"/>
-                                <label string="%%(company_name)s: User's Company name" colspan="2"/>
-                                <label string="%%(company_currency)s: User's Company Currency" colspan="2"/>
-                                <label string="%%(heading)s: Move line header" colspan="2"/>
-                                <label string="%%(line)s: Ledger Posting lines" colspan="2"/>
-                            </page>
-                        </notebook>
-                </group>
-                <separator colspan="4"/>
-                <group>
-                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
+            <form string="Send followups" version="7.0">
+                <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
-                </group>
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
+                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                </header>
+                <notebook>
+                    <page string="Partner Selection">
+                        <field name="partner_ids" context="{'search_default_balance_positive': 1}" domain="[('company_id','=',context.get('company_id',False))]"/>
+                    </page>
+                    <page string="Email Settings">
+                        <group col="4">
+                            <field name="email_conf" colspan="4"/>
+                            <field name="partner_lang" colspan="4"/>
+                            <field name="test_print" colspan="4"/>
+                            <field name="email_subject" colspan="4"/>
+                            <separator string="Email Body" colspan="4" />
+                            <field name="email_body" colspan="4" nolabel="1"/>
+                        </group>
+                        <group string="Legend">
+                            <label string="%%(partner_name)s: Partner name"/>
+                            <label string="%%(user_signature)s: User name"/>
+                            <label string="%%(followup_amount)s: Total Amount Due"/>
+                            <label string="%%(date)s: Current Date"/>
+                            <label string="%%(company_name)s: User's Company name"/>
+                            <label string="%%(company_currency)s: User's Company Currency"/>
+                            <label string="%%(heading)s: Move line header"/>
+                            <label string="%%(line)s: Ledger Posting lines"/>
+                        </group>
+                    </page>
+                </notebook>
             </form>
             </field>
         </record>
@@ -116,15 +114,12 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Summary">
-                <group col="4" colspan="6">
-                    <separator string="Summary" colspan="4"/>
-                    <field name="summary" height="300" width="800" nolabel="1"/>
-                </group>
-                <separator colspan="4"/>
-                <group>
+            <form string="Summary" version="7.0">
+                <header>
                     <button special="cancel" string="Ok" icon='gtk-cancel'/>
-                </group>
+                </header>
+                <separator string="Summary"/>
+                <field name="summary"/>
             </form>
             </field>
         </record>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index de9f37b4374..8e18ec51d5b 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -95,11 +95,13 @@
         <field name="model">notify.message</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Messages">
-                <separator string="Write a notification or a wishful message."/>
-                <field name="name"/>
-                <separator string="Special Message"/>
-                <field name="msg"/>
+            <form string="Messages" version="7.0">
+                <group string="Write a notification or a wishful message.">
+                    <field name="name"/>
+                </group>
+                <group string="Special Message">
+                    <field name="msg"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index 5bf1e480d1e..1ddef75e05b 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -7,14 +7,13 @@
             <field name="model">account.invoice.special.msg</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select Message">
-                    <group colspan="4" col="6">
-                        <field name="message"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Select Message" version="7.0">
+                    <header>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <group>
+                        <field name="message"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a6fe0de9b14..45f42a3ab1a 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -76,7 +76,7 @@
             <field name="model">payment.mode</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Mode">
+                <form string="Payment Mode" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="journal"/>
@@ -102,7 +102,7 @@
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="open" states="draft" string="Confirm Payments" />
                     <button name="set_done" states="open" string="Make Payments" type="object"/>
@@ -122,11 +122,11 @@
                           type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     </group>
                     <field name="line_ids" context="{'order_id': active_id or False}" >
-                        <form string="Payment Line">
+                        <form string="Payment Line" version="7.0">
                             <notebook>
                                 <page string="Payment">
                                     <group col="4">
-                                        <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
+                                        <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
                                         <label for="amount_currency"/>
@@ -134,7 +134,7 @@
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
                                             <field name="currency" nolabel="1" class="oe_form_inline"/>
                                         </div>
-                                        <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
+                                        <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
                                         <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
                                         <separator colspan="2" string="Owner Account"/>
                                         <separator colspan="2" string="Destination Account"/>
@@ -164,7 +164,7 @@
                         </form>
                         <tree string="Payment Line">
                             <field name="ml_inv_ref" />
-                            <field name="partner_id" select="1"/>
+                            <field name="partner_id"/>
                             <field name="communication"/>
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
@@ -249,7 +249,7 @@
             <field name="model">payment.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Line">
+                <form string="Payment Line" version="7.0">
                     <notebook>
                         <page string="Payment">
                             <group col="4">
@@ -262,7 +262,7 @@
                                     <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
                                     <field name="currency" class="oe_form_inline"/>
                                 </div>
-                                <field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
+                                <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
                                 <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
                                 <separator colspan="2" string="Owner Account"/>
                                 <separator colspan="2" string="Desitination Account"/>
@@ -300,7 +300,7 @@
                     <field name="order_id"/>
                     <field name="ml_inv_ref" />
                     <field name="ml_maturity_date"/>
-                    <field name="partner_id" select="1"/>
+                    <field name="partner_id"/>
                     <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
                     <field name="amount_currency" sum="Currency Amount Total"/>
diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po
index cb518cdcfea..4a05632ede6 100644
--- a/addons/account_payment/i18n/ja.po
+++ b/addons/account_payment/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-15 06:19+0000\n"
+"PO-Revision-Date: 2012-06-08 02:11+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-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -260,7 +260,7 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
-"支払オーダーのオプションを選択して下さい：固定は指定した日付を意味します。直接は直ちに実行を意味します。期日は実行のスケジュールされた日付を意味します。"
+"支払オーダーのオプション選択：固定は指定した日付を意味します。直接は直ちに実行を意味します。期日は実行のスケジュールされた日付を意味します。"
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 538d32efe80..9e4bf416f5e 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -2,39 +2,35 @@
 <openerp>
     <data>
 
-		<record id="view_create_payment_order" model="ir.ui.view">
+        <record id="view_create_payment_order" model="ir.ui.view">
             <field name="name">payment.order.create.form</field>
             <field name="model">payment.order.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Search Payment lines">
-                <group col="4" colspan="6">
-                    <field name="duedate" />
-                </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+            <form string="Search Payment lines" version="7.0">
+                <header>
                     <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                </header>
+                <group>
+                    <field name="duedate" />
                 </group>
             </form>
             </field>
         </record>
 
-		<record id="view_create_payment_order_lines" model="ir.ui.view">
+        <record id="view_create_payment_order_lines" model="ir.ui.view">
             <field name="name">payment.order.create.form</field>
             <field name="model">payment.order.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Search Payment lines">
-                    <group col="4" colspan="6">
-                        <separator colspan="4" string="Entries"/>
-                        <field name="entries" nolabel="1"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <form string="Search Payment lines" version="7.0">
+                    <header>
                         <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
-                    </group>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    </header>
+                    <separator string="Entries"/>
+                    <field name="entries"/>
                 </form>
             </field>
         </record>
@@ -49,5 +45,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index a8835e0da8f..ef95d419427 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -7,27 +7,26 @@
              <field name="model">account.payment.make.payment</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-				<form string="Make Payment">
-					<separator string="Are you sure you want to make payment?"/>
-					<newline/>
-					<group  colspan="2" col="4">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
-	 				</group>
-				</form>
-			</field>
-		</record>
+                <form string="Make Payment" version="7.0">
+                    <header>
+                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <separator string="Are you sure you want to make payment?"/>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_payment_make_payment" model="ir.actions.act_window">
-			<field name="name">Make Payment</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.payment.make.payment</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_payment_make_payment_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_payment_make_payment" model="ir.actions.act_window">
+            <field name="name">Make Payment</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.payment.make.payment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_payment_make_payment_view"/>
+            <field name="target">new</field>
+        </record>
 
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index 55a2158fa7d..afcaf82be3a 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -7,13 +7,12 @@
              <field name="model">account.payment.populate.statement</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Populate Statement:">
-                    <group colspan="4" col="6">
-                        <field name="lines" colspan="4" height="300" width="800" nolabel="1" />
-                        <separator colspan="6"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Populate Statement:" version="7.0">
+                    <header>
                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                    </group>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <field name="lines"/>
                 </form>
              </field>
         </record>
@@ -41,4 +40,4 @@
        </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 70c12684a75..1ecf464923a 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="view_account_sequence_installer" model="ir.ui.view">
-			<field name="name">account.sequence.installer.view</field>
-			<field name="model">account.sequence.installer</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.res_config_installer"/>
-			<field name="arch" type="xml">
-				<data>
-					<form position="attributes">
-						<attribute name="string">Account Sequence Application Configuration</attribute>
-					</form>
-					<separator string="title" position="before">
-						<label string="You can enhance the Account Sequence Application by installing ."/>
-					</separator>
-					<xpath expr="//separator[@string='title']" position="after">
-						<group colspan="8" position="inside">
-							<field name="name" colspan="4"/>
-							<field name="prefix"/>
-							<field name="suffix"/>
-							<field name="number_next"/>
-							<field name="number_increment"/>
-							<field name="padding"/>
-							<field name="company_id" groups="base.group_multi_company"/>
-						</group>
-					</xpath>
-					<separator string="title" position="attributes">
-						<attribute name="string">Configure Your Account Sequence Application</attribute>
-					</separator>
-					<xpath expr="//button[@string='Install Modules']" position="attributes">
-						<attribute name="string">Configure</attribute>
-					</xpath>
-				</data>
-			</field>
-		</record>
+    <data>
+        <record id="view_account_sequence_installer" model="ir.ui.view">
+            <field name="name">account.sequence.installer.view</field>
+            <field name="model">account.sequence.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">Account Sequence Application Configuration</attribute>
+                    </form>
+                    <separator string="title" position="before">
+                        <label string="You can enhance the Account Sequence Application by installing ."/>
+                    </separator>
+                    <xpath expr="//separator[@string='title']" position="after">
+                        <group colspan="8" position="inside">
+                            <field name="name" colspan="4"/>
+                            <field name="prefix"/>
+                            <field name="suffix"/>
+                            <field name="number_next"/>
+                            <field name="number_increment"/>
+                            <field name="padding"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                    </xpath>
+                    <separator string="title" position="attributes">
+                        <attribute name="string">Configure Your Account Sequence Application</attribute>
+                    </separator>
+                    <xpath expr="//button[@string='Install Modules']" position="attributes">
+                        <attribute name="string">Configure</attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
 
-		<record id="action_account_seq_installer" model="ir.actions.act_window">
-			<field name="name">Account Sequence Application Configuration</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.sequence.installer</field>
-			<field name="view_id" ref="view_account_sequence_installer"/>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-	
-		<record id="account_seq_installer_todo" model="ir.actions.todo">
-			<field name="action_id" ref="action_account_seq_installer"/>
-			<field name="category_id" ref="account.category_accounting_configuration"/>
-			<field name="sequence">3</field>
-			<field name="type">automatic</field>
-		</record>
-	</data>
+        <record id="action_account_seq_installer" model="ir.actions.act_window">
+            <field name="name">Account Sequence Application Configuration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.sequence.installer</field>
+            <field name="view_id" ref="view_account_sequence_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    
+        <record id="account_seq_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_account_seq_installer"/>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
+            <field name="sequence">3</field>
+            <field name="type">automatic</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account_sequence/i18n/sv.po b/addons/account_sequence/i18n/sv.po
new file mode 100644
index 00000000000..cc0491fca54
--- /dev/null
+++ b/addons/account_sequence/i18n/sv.po
@@ -0,0 +1,220 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-06-04 17:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Bolaget måste överenstämma för alla konton och perioder."
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Nästa nummer i sekvensen"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Nästa nummer"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Räkna upp nummer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Nästa nummer i sekvensen kommer att beräknas utgående från detta"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Inställningar"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Suffixvärde för löpnumret"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Numerisk utfyllnad"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Transaktioner"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan inte skapa transaktioner på rubrikkonton."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP lägger automatiskt till några '0' till vänster på 'Nästa nummer' för "
+"att få rätt storlek."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan inte skapa transaktioner på ett stängt konto."
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurationsfel! Vald valuta bör delas mellan standard-konton också."
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Fel kredit- eller debetvärde i bokföringstransaktionerna."
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Prefix för löpnumret"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Kontotransaktion"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Suffix"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Journalnamnet måste vara unikt per företag!"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"Valt konto på verifikatet tvingar fram en sekundär valuta. Du kan ta bort "
+"den sekundära valutan på kontot eller välja en flervalutavy för journalen."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Verifikatsdatumet är inte inom den definierade perioden! Du bör ändra datum "
+"eller ta bort denna begränsning från journalen."
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefix"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden måste vara unik per företag!"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index be9d717fb3c..586d06449c8 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -25,7 +25,7 @@
             <field name="model">account.voucher.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Voucher Lines">
+                <form string="Voucher Lines" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_id"/>
@@ -41,7 +41,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                   <header>
                       <button name="proforma_voucher" string="Post" states="draft"/>
                       <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
@@ -53,11 +53,11 @@
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                        <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
                         <field name="name" colspan="2"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="reference" select="1"/>
+                        <field name="reference"/>
                         <field name="account_id" widget="selection" invisible="True"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 79e103e6a85..150830431ca 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -72,17 +72,17 @@
             <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form string="Bill Payment">
+                <form string="Bill Payment" version="7.0">
                     <group col="6">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" />
                         <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
-                            widget="selection" select="1"
+                            widget="selection"
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" string="Payment Ref"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                        <field name="reference" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
                             widget="selection"
@@ -143,7 +143,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
@@ -158,11 +158,11 @@
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
-                            widget="selection" select="1"
+                            widget="selection"
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                        <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
@@ -295,7 +295,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
@@ -314,11 +314,11 @@
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
-                            widget="selection" select="1"
+                            widget="selection"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                        <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
@@ -335,13 +335,13 @@
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
                                         required="1"
-                                        />
+                                        groups="account.group_account_user"/>
                                     <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>
                                     <field name="amount_original" readonly="1"/>
-                                    <field name="amount_unreconciled" readonly="1"/>
-                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index bad68fd1634..dba40940166 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
@@ -96,7 +96,7 @@
                         <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="type" invisible="True"/>
                         <field name="currency_id"/>
                     </group>
@@ -205,7 +205,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
@@ -218,12 +218,12 @@
                     <field name="pay_now" invisible="1"/>
                     <group col="6">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
-                        <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                        <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
-                        <field name="reference" select="1"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                        <field name="reference"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>
                         <field name="currency_id"/>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 9ceee73eda5..38600a385ab 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -7,12 +7,13 @@
             <field name="model">account.voucher.unreconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Unreconciliation">
-                <separator colspan="4" string="Unreconciliation Transactions" />
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-                <separator colspan="4"/>
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
+             <form string="Unreconciliation" version="7.0">
+                <header>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
+                </header>
+                <separator string="Unreconciliation Transactions" />
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
              </form>
             </field>
         </record>
@@ -24,14 +25,6 @@
             <field name="view_id" ref="view_account_voucher_unreconcile"/>
             <field name="target">new</field>
         </record>
-        
-<!--    <act_window name="Unreconcile entries"            -->
-<!--            res_model="account.voucher.unreconcile"-->
-<!--            src_model="account.voucher"-->
-<!--            view_mode="form"-->
-<!--            target="new"        -->
-<!--            key2="client_action_multi"    -->
-<!--            id="action_view_account_voucher_unreconcile"/>-->
-     
+
      </data>
 </openerp>
diff --git a/addons/analytic/i18n/ja.po b/addons/analytic/i18n/ja.po
index 4412d1964e0..8ae21b65464 100644
--- a/addons/analytic/i18n/ja.po
+++ b/addons/analytic/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-15 06:05+0000\n"
+"PO-Revision-Date: 2012-06-08 23:38+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-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -213,7 +213,7 @@ msgstr "残高"
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "エラー。反復した分析アカウントを作ることはできません。"
+msgstr "エラー。再帰的な分析アカウントを作ることはできません。"
 
 #. module: analytic
 #: help:account.analytic.account,type:0
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index 8d03af3e433..13a159a9321 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -60,7 +60,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Information']/group/group/field[@name='account_id']" position="replace">
+                <xpath expr="//page[@string='Information']//field[@name='account_id']" position="replace">
                     <field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)" select="1"/>
                 </xpath>
             </field>
@@ -72,7 +72,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Information']/group/group/field[@name='journal_id']" position="replace">
+                <xpath expr="//page[@string='Information']//field[@name='journal_id']" position="replace">
                     <field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
                 </xpath>
             </field>
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 7f5a2226bdd..162c38b3da1 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -9,15 +9,15 @@
         <field name="model">ir.model.fields.anonymization</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Anonymized Field">
+            <form string="Anonymized Field" version="7.0">
                 <group col="4">
-                    <field name="model_id" select="1" on_change="onchange_model_id(model_id)" />
-                    <field name="model_name" select="1" on_change="onchange_model_name(model_name)" />
+                    <field name="model_id" on_change="onchange_model_id(model_id)" />
+                    <field name="model_name" on_change="onchange_model_name(model_name)" />
                     <field name="field_id"
-                           select="1"
+                          
                            on_change="onchange_field_id(field_id, model_name)"
                            domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" />
-                    <field name="field_name" select="1" on_change="onchange_field_name(field_name, model_name)" />
+                    <field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
                     <field name="state" />
                 </group>
             </form>
@@ -55,7 +55,7 @@
         <field name="model">ir.model.fields.anonymize.wizard</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Database Anonymization">
+            <form string="Database Anonymization" version="7.0">
                 <header>
                     <button name="anonymize_database"
                             string="Anonymize Database"
@@ -101,7 +101,7 @@
         <field name="model">ir.model.fields.anonymization.history</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Anonymization History">
+            <form string="Anonymization History" version="7.0">
                 <group col="4">
                     <field name="date"/>
                     <field name="state"/>
diff --git a/addons/auction/i18n/ja.po b/addons/auction/i18n/ja.po
new file mode 100644
index 00000000000..5278bb5cb44
--- /dev/null
+++ b/addons/auction/i18n/ja.po
@@ -0,0 +1,2365 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-08 02:16+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-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "レポート"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr "オークション実施"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr "ドラフトに設定"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr "出品者"
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr "タイトル"
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr "SMSメッセージ"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr "警告。オークションの落札価格オブジェクトと買い手を削除します。"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr "買い手の第１の銀行取引明細書"
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr "オブジェクトの数"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr "著者"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "買い手"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr "オブジェクトの数"
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr "出品者の請求書が支払済の場合、この項目はTrueとして選択されます。"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr "支払済項目の数（請求書に基づく）："
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr "預け金境界"
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr "請求金額"
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr "オークションオブジェクト名"
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr "預け金境界"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+"オークションが開始される時に状態はドラフトとなります。\n"
+"オークションが終了すると状態は閉鎖済となります。"
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr "第３の銀行取引明細書金額"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buy object"
+msgstr "オブジェクトの購入"
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr "リスト番号"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "日付:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr "経費の名前"
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr "最初のオークション日"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr "アクティブな項目をFalseに設定すると、項目を削除することなくオークションの出品物分類を非表示にできます。"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr "参照"
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr "合計落札"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS Send"
+msgstr "SMS - ゲートウェイ：clickatellによる大量のSMS送信"
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr "預け金の経費"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr "売れず"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr "オークション預け金の検索"
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr "預け入れ人目録のリスト番号"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr "項目"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr "出品者の経費"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr "入札"
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr "総額収入"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr "買い手マップ"
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr "オブジェクト番号"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr "入札オークション"
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr "オブジェクト画像"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr "この出品物には買い手がセットされていません。"
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr "買い手 %s は請求書の住所がありません。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_object_categories
+msgid "Auction object Categories"
+msgstr "オークションオブジェクトの分類"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr "オークション預け金の経費"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr "預け金境界フォーム"
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr "所定の買い手のための銀行取引明細書行"
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr "分類"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr "パートナへの買い手ユーザ名のマップ"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr "オークション出品物の検索"
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr "純収入"
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr "状態"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr "SMS送信"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr "売却済"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr "このオークション日付に沿う出品物はありません。"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "New Object"
+msgstr "新オブジェクト"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr "入札日"
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr "費用勘定"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr "配達管理"
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr "オブジェクトの説明"
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr "作者 / 著者2"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr "行1"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr "買い手の請求書作成"
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr "総収入"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr "買い手のオブジェクトの支払"
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr "オークション終了日"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr "SMS を送信"
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr "短い説明（2）"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr "買い手"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Object Category"
+msgstr "オブジェクト分類"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr "消費税 12%"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr "買い手請求書"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr "買い手の結果"
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr "最高価格"
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr "オークション開始日"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr "オークションの動作"
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr "買い手に対する口座の税金"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr "次のオークション"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr "売却済出品物の選択"
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr "支払"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr "オブジェクト %s は買い手が割り当てられていません。"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr "売却まで"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr "最新オークション日"
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr "エンコード済オブジェクトの数"
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr "出品者支払"
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr "オブジェクトの統計"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr "出品者の数"
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr "請求済"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr "取り除かれた項目の数"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr "オークションの概要"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr "%）"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr "買い手情報"
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr "買い手価格 - 出品者価格"
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr "オブジェクトの数"
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr "最高見積"
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr "買い手価格"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr "入札詳細"
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr "買い手の支払"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr "オークションの終了"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr "Flageyのオークションカタログ"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr "出品者経費1"
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr "作者"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr "買い手の数："
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr "間接経費"
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr "出品者に対する口座の税金"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr "ユーザエラー"
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr "出品者仕訳帳"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoiced Auction"
+msgstr "オークションの請求"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr "子は分類を持つ"
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr "状態が取り除かれた時に、この項目はTrueにマークされます。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr "管理を伴う"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.module.category,name:auction.module_category_auction
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr "オークション"
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr "オブジェクト分類"
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr "入札ID"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr "最低見積："
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr "実質利鞘"
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr "実質上限は？"
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr "手数料の数："
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr "オークション名"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr "出品者経費（12%）"
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr "親は分類を持つ"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr "オークション概要"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr "（自動番号のため空のままとします）"
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr "請求書住所がありません。"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr "執行官リスト"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr "このレコードは存在しません。"
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr "合計金額"
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr "第１の銀行取引明細書の金額"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr "１日あたりのオブジェクト"
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr "作者手数料の口座の税金"
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr "作品は21％"
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr "落札"
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr "撤退価格"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr "その他経費"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr "マップ "
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr "買い手請求書消し込み済"
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr "預入日"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr "預け金"
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr "特別な経費"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr "支払先（"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr "買い手経費（20%）"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr "オークション"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "合計落札"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr "請求書作成"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr "履歴"
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr "コード"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr "バーコードのひと束"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr "番号"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.taken:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr "買い手支払履歴"
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr "略歴"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr "在庫"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr "支払"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices for Seller"
+msgstr "出品者請求書の作成"
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr "実質利鞘"
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr "オークションの場所"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr "分析"
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr "買い手請求書が支払済状態である場合、この項目はTrueとして選択されます。"
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr "上限を10%減少させる"
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr "合計落札"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr "請求書の買い手オブジェクト"
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr "マイオークション"
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr "（総収入*100.0） / オブジェクト価格"
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr "連絡先番号"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "価格"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr "写真"
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr "請求書番号"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr "アクティブIDが見つかりません。"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr "WWW.Auction-in-Europe.com への接続が失敗しました。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+#: model:ir.actions.act_window,name:auction.action_bid_open
+msgid "Open Bids"
+msgstr "公開入札"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr "オークション委員会"
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: view:auction.lots:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr "預け入れ人目録"
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr "買い手には請求書住所がありません。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_adjudication_tree
+msgid "Auction Adjudication Report"
+msgstr "オークション落札レポート"
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr "ログイン"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr "出品者フォーム"
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr "オブジェクト分類"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr "出品物としてマーク"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr "オークションオブジェクト"
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr "カタログ番号"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr "会計"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr "電話入札"
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr "平均見積"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr "借方："
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr "著作権"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during last month."
+msgstr "先月間のオークション"
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr "買い手のための口座仕訳帳"
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr "入札"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr "合計総収入"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr "更新"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "出品者"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Draft Auction"
+msgstr "ドラフトオークション"
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr "最高見積額"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr "オークション日に移動"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr "売れず項目の数："
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr "請求書を作成"
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr "オークション日"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr "落札（"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr "出品物リスト - 横向き"
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr "著者 / 作者"
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr "買い手ユーザ名"
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr "優先度"
+
+#. module: auction
+#: view:board.board:0
+#: model:ir.actions.act_window,name:auction.action_report_latest_objects_tree
+msgid "Latest objects"
+msgstr "最新オブジェクト"
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr "場所"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr "月 -1"
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr "買い手が銀行取引明細書の支払をした時にこの項目はマークされます。"
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr "取り除き済"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr "合計総収入"
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr "最低見積額"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr "預入日"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr "この出品物は存在しません。"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr "呼称"
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr "最低見積 / 落札 / 最高見積"
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr "最低見積"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr "SMS送信済 "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr "オークション日変更"
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr "寿命"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr "取り下げ方法"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr "買い手手数料"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr "オークション分析"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr "支払は中止されました。"
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr "取り下げ価格"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr "オークションの開始"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr "買い手の第３の銀行取引明細書"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr "最高見積"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr "統計的"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr "オークション預け金境界"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr "オブジェクト統計値"
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr "（実質収入*100） / オブジェクト価格"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr "出品物履歴"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr "請求書作成"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr "消費税 5%"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr "消費税5%"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr "出品物"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree
+msgid "Auction Object Date"
+msgstr "オークションオブジェクト日"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr "平均価格"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr "買い手の第２の銀行取引明細書"
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr "買い手仕訳帳"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr "支払済"
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr "電話"
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr "展示日"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr "TVA（フランスの消費税）"
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr "強調する"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr "合計："
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr "TVA1（フランスの消費税）"
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr "日毎のオブジェクト"
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr "出品者請求書"
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr "日毎のオブジェクト"
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr "オークション展示最終日"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr "買い手を逃しました。"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr "オークションマネジャ "
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+"同じ請求書に２つの異なった買い手があります。\n"
+"請求する前にこの問題を修正して下さい。"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr "手数料"
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr "出品者上限"
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr "転送"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr "行３"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr "行２"
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr "オブジェクト保持"
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr "合計落札"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr "出品者に連絡します。"
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr "出品物獲得"
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr "実質利鞘（%）"
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr "）"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr "出品者情報"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr "オブジェクト"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr "出品者請求書"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr "支払済："
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr "マイナス金額を許可"
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr "第２の銀行口座明細書の金額"
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr "オークション日"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr "SMSテキスト"
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr "最初のオークション日"
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices for Buyer"
+msgstr "買い手請求書の作成"
+
+#. module: auction
+#: model:res.groups,name:auction.group_auction_manager
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr "名前"
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr "作者"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr "支払オブジェクト"
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr "オークション展示初日"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr "出品物を開く"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr "預入伝票"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr "出品物の有効化"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr "出品物"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_artist
+msgid "Auction Artists"
+msgstr "オークション作者"
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr "出品者価格"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+msgid "Frais de vente0"
+msgstr "販売"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr "買い手リスト"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr "買い手経費（"
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr "取引明細書"
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr "出品者価格"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr "販売"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr "消費税 1%"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr "著作権"
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr "展示初日"
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr "作成日"
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr "預け金情報の提供：出品者、取り下げ方法、オブジェクト、預け金経費"
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr "実質収入"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_latest_doposit_tree
+msgid "Latest Deposits"
+msgstr "最終預け金"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr "項目の数"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr "著者の権利（4%）"
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr "見積"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr "買い手フォーム"
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr "買い手氏名"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr "請求書出品者オブジェクト"
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr "総利鞘（%）"
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr "閉じた"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr "次回オークション日付の検索"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr "オークションカタログFlageyレポートの印刷"
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr "買い手前払い"
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr "手数料"
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "最低 / 落札 / 最高"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr "カタログFlageyレポート"
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr "オブジェクト価格"
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr "入札行"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr "カタログ"
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr "オブジェクトのオークション"
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr "宛先アカウント"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr "設定"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree_my
+msgid "My Auction Object Date"
+msgstr "マイオークションオブジェクト日"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr "全合計金額を支払って下さい：全額の支払のためには %.2f が不足しています。"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr "購入の支払"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr "バーコードツール"
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr "預け金"
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr "展示最終日"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr "出品可能"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr "消費税 10%"
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr "作者 / 著者名"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr "画像"
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr "買い手価格"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr "オークション出品物分類"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr "消費税 20%"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr "出品者のオークション支払"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr "取除き済"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr "出品者リスト"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr "合計落札"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr "預け金経費"
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr "分類名"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr "オークション概要のツリービュー"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr "落札"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr "オークション日"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr "オークションダッシュボード"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+#: model:res.groups,name:auction.group_auction_user
+msgid "User"
+msgstr "ユーザ"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr "支払行"
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr "住所がありません。"
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr "買い手価格 - 出品者価格 - 間接経費"
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+" ・ ドラフト状態は新しいオブジェクトがコード化された時の状態です。                 \n"
+"・ 売れず状態はオブジェクトが長期間売れなかった時の状態です。ユーザは売れず状態からドラフト状態に設定できます。\n"
+"・ 支払済状態はユーザがオブジェクトに対する支払った時の状態です。\n"
+"・ 売却済状態はユーザがオブジェクトを購入した時の状態です。"
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr "偽物"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr "売れず"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr "買い手経費"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr "オークション日"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr "オブジェクト説明"
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr "買い手請求書"
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr "電話"
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr "作者 / 著者"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr "リスト付きオークション合計"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr "一般情報"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr "オブジェクトエンコード"
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr "オークション入札の検索"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr "見積"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr "出品者手数料"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr "オブジェクト統計"
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr "出品者のアカウント仕訳帳"
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr "最終オークション日"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr "%s のためのオークション日がありません。日付をセットして下さい。"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr "落札価格"
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr "損益勘定"
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr "パスワード"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr "支払オブジェクト"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr "オブジェクトの数"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr "落札："
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr "出品物ごとの入札（電話）"
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr "買い手ログイン"
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr "経費"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current month."
+msgstr "当月のオークション"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr "オークション支払人"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current year."
+msgstr "当年のオークション"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr "オークション名"
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "最終預け金"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr "作者の略歴"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr "オークション履歴"
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index 8ecba7f56b6..9146e8cfb70 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-31 15:15+0000\n"
-"Last-Translator: ThinkOpen Solutions <Unknown>\n"
+"PO-Revision-Date: 2012-06-05 09:42+0000\n"
+"Last-Translator: Tiago Rodrigues <tig.rodrigues@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-01 05:33+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
@@ -242,7 +242,7 @@ msgstr "Total Adj."
 #. module: auction
 #: view:auction.lots.sms.send:0
 msgid "SMS - Gateway: clickatell','Bulk SMS Send"
-msgstr ""
+msgstr "Gateway de SMS: clickatell','Envio de SMS em massa"
 
 #. module: auction
 #: help:auction.lots,costs:0
@@ -1058,7 +1058,7 @@ msgstr "O meu leilão"
 #. module: auction
 #: help:auction.lots,gross_margin:0
 msgid "(Gross Revenue*100.0)/ Object Price"
-msgstr ""
+msgstr "(Rendimentos Brutos*100.0)/ Preço objecto"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index f2615ddee81..295ff2793d5 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -11,7 +11,7 @@
             <field name="model">audittrail.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="AuditTrail Rule">
+                <form string="AuditTrail Rule" version="7.0">
                     <header>
                         <button string="_Subscribe" name="subscribe" icon="gtk-ok"
                             type="object" states="draft" />
@@ -20,8 +20,8 @@
                         <field name="state" widget="statusbar"/>
                     </header>
                     <group col="4">
-                        <field name="name" select="1" required="1"/>
-                        <field name="object_id" select="1"/>
+                        <field name="name" required="1"/>
+                        <field name="object_id"/>
                         <field name="log_read"/>
                         <field name="log_write"/>
                         <field name="log_unlink"/>
@@ -29,7 +29,7 @@
                         <field name="log_action"/>
                         <field name="log_workflow"/>
                         <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
-                        <field name="user_id" select="1" colspan="4" nolabel="1" />
+                        <field name="user_id" colspan="4" nolabel="1" />
                         <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
                 </form>
@@ -95,7 +95,7 @@
             <field name="model">audittrail.log</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="AuditTrail Logs">
+                <form string="AuditTrail Logs" version="7.0">
                     <group col="4">
                         <field name="timestamp" required="1" readonly="1"/>
                         <field name="user_id" readonly="1"/>
@@ -106,7 +106,7 @@
                     </group>
                     <field name="line_ids" mode="tree,form"
                         widget="one2many_list" readonly="1">
-                        <form string="Log Lines">
+                        <form string="Log Lines" version="7.0">
                             <group col="4">
                             <field name="field_id" colspan="4"
                                 readonly="1" />
diff --git a/addons/audittrail/i18n/ja.po b/addons/audittrail/i18n/ja.po
index a3d469d0362..7078bdd1136 100644
--- a/addons/audittrail/i18n/ja.po
+++ b/addons/audittrail/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-18 23:37+0000\n"
+"PO-Revision-Date: 2012-06-08 02:18+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-05-20 04:38+0000\n"
-"X-Generator: Launchpad (build 15259)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
@@ -39,7 +39,9 @@ msgstr "申込済"
 msgid ""
 "There is already a rule defined on this object\n"
 " You cannot define another: please edit the existing one."
-msgstr "このオブジェクトでは既にルールが定義されているので、他のルールの定義ができません：既存のルールを変更して下さい。"
+msgstr ""
+"このオブジェクトでは既にルールが定義されているので、\n"
+"　他のルールの定義ができません：既存のルールを変更して下さい。"
 
 #. module: audittrail
 #: view:audittrail.rule:0
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index e32bc65de40..aa141e34537 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -1,41 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <!-- Audittrail View Log  wizard-->
-    
-  		<record id="view_audittrail_view_log" model="ir.ui.view">
+
+        <record id="view_audittrail_view_log" model="ir.ui.view">
             <field name="name">audittrail.view.log.form</field>
             <field name="model">audittrail.view.log</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Audit Logs">
-                	<group colspan="4" >
-                		 <field name="from" colspan="4"/>
-              			 <newline/>
-              			 <field name="to" colspan="4"/>   
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel"
-                    		string="Cancel" />
-                    	<button icon="gtk-open" string="Open Logs"
-                    		name="log_open_window" type="object" />
+                <form string="Audit Logs" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" />
+                    </header>
+                    <group col="4">
+                         <field name="from"/>
+                         <field name="to"/>
                     </group>
                </form>
             </field>
-  		</record>
-  
+          </record>
+
   <!-- action for audittrail view log wizard -->
-  		
+
         <record id="action_audittrail_view_log" model="ir.actions.act_window">
             <field name="name">View log</field>
             <field name="res_model">audittrail.view.log</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_audittrail_view_log"/> 
+           <field name="view_id" ref="view_audittrail_view_log"/>
            <field name="target">new</field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/auth_openid/i18n/pt.po b/addons/auth_openid/i18n/pt.po
index e3e24a4d8c3..ceea02965de 100644
--- a/addons/auth_openid/i18n/pt.po
+++ b/addons/auth_openid/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-09 11:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-06-05 09:43+0000\n"
+"Last-Translator: Tiago Baptista <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-06 04:37+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -24,7 +24,7 @@ msgstr ""
 #: view:res.users:0
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -33,7 +33,7 @@ msgstr ""
 #: field:res.users,openid_url:0
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
 msgid "OpenID URL"
-msgstr ""
+msgstr "OpenID URL"
 
 #. module: auth_openid
 #: help:res.users,openid_email:0
@@ -43,70 +43,71 @@ msgstr ""
 #. module: auth_openid
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Não pode ter dois utilizadores com o mesmo login!"
 
 #. module: auth_openid
 #: field:res.users,openid_email:0
 msgid "OpenID Email"
-msgstr ""
+msgstr "Email OpenID"
 
 #. module: auth_openid
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"A empresa escolhida não está entre as permitidas para este utilizador"
 
 #. module: auth_openid
 #: field:res.users,openid_key:0
 msgid "OpenID Key"
-msgstr ""
+msgstr "OpenID Chave"
 
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
 msgid "Google"
-msgstr ""
+msgstr "Google"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
 msgid "Google Apps"
-msgstr ""
+msgstr "Google Apps"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
 msgid "Google Apps Domain:"
-msgstr ""
+msgstr "Domínio Google Apps:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
 msgid "Username:"
-msgstr ""
+msgstr "Nome de utilizador:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
 msgid "OpenID URL:"
-msgstr ""
+msgstr "OpenID URL:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
 msgid "Google Apps Domain"
-msgstr ""
+msgstr "Domínio Google Apps"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
 msgid "Username"
-msgstr ""
+msgstr "Nome de utilizador"
diff --git a/addons/auth_openid/i18n/sk.po b/addons/auth_openid/i18n/sk.po
new file mode 100644
index 00000000000..e776a7734da
--- /dev/null
+++ b/addons/auth_openid/i18n/sk.po
@@ -0,0 +1,113 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-09 09:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr "OpenID"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr ""
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nemôžte mať dvoch používateľov s rovnakým pristúpovým menom!"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID Email"
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Zvolená spoločnosť nie je medzi povolenými spoločnosťami tohto používateľa"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "OpenID Kľúč"
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "Heslo"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "Google"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr "Google Apps"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr "Užívateľské meno:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr "OpenID URL:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr "Doména Google Apps"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr "Užívateľské meno:"
diff --git a/addons/auth_openid/i18n/sv.po b/addons/auth_openid/i18n/sv.po
new file mode 100644
index 00000000000..c89dcfe9d9e
--- /dev/null
+++ b/addons/auth_openid/i18n/sv.po
@@ -0,0 +1,114 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 10:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr "OpenID"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr ""
+"Används för att skilja mellan olika användare  i fallet med en delad OpenID-"
+"URL"
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID-epost"
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "OpenID Nyckel"
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "Lösenord"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "Google"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr "Google Apps"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr "Google Apps Domän:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr "OpenID URL:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr "Google Apps Domän"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr "Användarnamn"
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 4e1fe508c1a..c51735f8ded 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -12,7 +12,7 @@
             <field name="model">base.action.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Action Rule">
+                <form string="Action Rule" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="model_id" on_change="onchange_model_id(model_id)"/>
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index 2fc7e0fef91..960ad6f657c 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-19 02:19+0000\n"
+"PO-Revision-Date: 2012-06-08 02:21+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-05-20 04:38+0000\n"
-"X-Generator: Launchpad (build 15259)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -26,7 +26,7 @@ msgstr "責任者にメールを送信するためのルールを望む場合は
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_partner:0
 msgid "Remind Partner"
-msgstr "パートナを思い出して下さい。"
+msgstr "パートナを思い出させる"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_categ_id:0
@@ -120,7 +120,7 @@ msgstr "モデルパートナとしての条件"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Deadline"
-msgstr "締切期限"
+msgstr "期限"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_id:0
@@ -155,8 +155,8 @@ msgid ""
 "specific sales team, or an opportunity which still has status pending after "
 "14 days might trigger an automatic reminder email."
 msgstr ""
-"多種の画面のために自動的なアクションを自動的にトリガー実行するために使って下さい。例えば、特定のユーザにより作成されたリードには自動的に特定の営業チームを"
-"設定したり、オポチュニティが保留中になって14日を経過したので、自動的に通知Eメールの送信をトリガーしたりできます。"
+"多種の画面のために自動的なアクションを自動的にトリガー実行するために使います。例えば、特定のユーザにより作成されたリードには自動的に特定の営業チームを設定"
+"したり、オポチュニティが保留中になって14日を経過したので、自動的に通知Eメールの送信をトリガーしたりできます。"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_email:0
@@ -326,7 +326,7 @@ msgstr "責任者への通知"
 #. module: base_action_rule
 #: help:base.action.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of rules."
-msgstr "ルールのリストを表示する時には、並び順を指定して下さい。"
+msgstr "ルールのリストを表示する時には、並び順を指定します。"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 035aff278f9..fa073938a37 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -8,7 +8,7 @@
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invitation details">
+                <form string="Invitation details" version="7.0">
                     <header>
                         <button name="do_tentative"
                             states="needs-action,declined,accepted"
@@ -156,15 +156,15 @@
             <field name="model">res.alarm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reminder details">
+                <form string="Reminder details" version="7.0">
                     <group col="4">
                         <field name="name" />
                         <field name="active" />
                         <separator string="Reminder Details" colspan="4" />
-                        <field name="trigger_duration" select="1" />
-                        <field name="trigger_interval" select="1" />
-                        <field name="trigger_occurs" select="1" />
-                        <field name="trigger_related" select="1" />
+                        <field name="trigger_duration" />
+                        <field name="trigger_interval" />
+                        <field name="trigger_occurs" />
+                        <field name="trigger_related" />
                     </group>
                 </form>
             </field>
@@ -178,11 +178,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Reminder details">
-                <field name="name" select="1"/>
-                <field name="trigger_interval" select="1"/>
-                <field name="trigger_duration" select="1"/>
-                <field name="trigger_occurs" select="1"/>
-                <field name="trigger_related" select="1"/>
+                <field name="name"/>
+                <field name="trigger_interval"/>
+                <field name="trigger_duration"/>
+                <field name="trigger_occurs"/>
+                <field name="trigger_related"/>
                 </tree>
             </field>
         </record>
@@ -209,7 +209,7 @@
             <field name="model">calendar.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
+                <form string="Events" version="7.0">
                 <header>
                     <button name="do_confirm"
                         string="Confirm"
@@ -231,11 +231,11 @@
                 </header>
                 <sheet>
                     <group col="6">
-                        <field name="name" select="1" string="Summary"
+                        <field name="name" string="Summary"
                             colspan="4" required="1" />
                         <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" />
                         <newline/>
-                        <field name="date" string="Start Date" required="1" select="1"
+                        <field name="date" string="Start Date" required="1"
                             on_change="onchange_dates(date,duration,False,allday)" />
                         <field name="duration" widget="float_time"
                             on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
@@ -272,7 +272,7 @@
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>
                                 <field name="email" />
-                                <field name="role" width="200" select="1" />
+                                <field name="role" width="200" />
                                 <field name="state" />
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
@@ -291,7 +291,7 @@
                                     states="needs-action,tentative,declined,accepted"
                                     context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
-                            <form string="Invitation details">
+                            <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <group col="4">
diff --git a/addons/base_calendar/i18n/ja.po b/addons/base_calendar/i18n/ja.po
index 86889b89ef7..8b8d4bf900f 100644
--- a/addons/base_calendar/i18n/ja.po
+++ b/addons/base_calendar/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-23 06:06+0000\n"
+"PO-Revision-Date: 2012-06-08 02:32+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-05-24 11:09+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -202,7 +202,7 @@ msgstr "イベント参照"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Show Time as"
-msgstr "時間を示して下さい。"
+msgstr "時間として表示"
 
 #. module: base_calendar
 #: field:calendar.event,tu:0
@@ -326,7 +326,7 @@ msgstr "コンタクトと関係あるパートナ"
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr "招待タイプを定義して下さい。"
+msgstr "招待タイプを定義します。"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
@@ -343,7 +343,7 @@ msgstr "任意の参加"
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
 msgid "Deadline"
-msgstr "期限"
+msgstr "締切"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:389
@@ -382,7 +382,7 @@ msgstr "主催者"
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr "責任者"
+msgstr "担当"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -414,7 +414,7 @@ msgstr "出席者"
 #: code:addons/base_calendar/base_calendar.py:1411
 #, python-format
 msgid "Group by date not supported, use the calendar view instead"
-msgstr "日付のグループ化はサポートされませんが、代りにカレンダービューを使って下さい。"
+msgstr "日付のグループ化はサポートされませんが、代りにカレンダービューを使います。"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -505,7 +505,7 @@ msgstr "繰り返し（まで）"
 msgid ""
 "Create specific calendar alarms that may be assigned to calendar events or "
 "meetings."
-msgstr "カレンダーイベントまたはミーティングを割り当てられる特定のカレンダーアラームを作成して下さい。"
+msgstr "カレンダーイベントまたはミーティングを割り当てられる特定のカレンダーアラームを作成します。"
 
 #. module: base_calendar
 #: field:calendar.event,show_as:0
@@ -995,7 +995,7 @@ msgstr "カレンダーの出席者は重複できません。"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr "ミーティングを定期的に行う場合は月の日を選択して下さい。"
+msgstr "ミーティングを定期的に行う場合は月の日を選択します。"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
@@ -1005,7 +1005,7 @@ msgstr "アクション"
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
 msgid "Select whom you want to Invite"
-msgstr "招待したい人を選択して下さい。"
+msgstr "招待したい人を選択します。"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1034,7 +1034,7 @@ msgstr "委任先"
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr "アラームが起動する時に発動するアクションを定義して下さい。"
+msgstr "アラームが起動する時に発動するアクションを定義します。"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
@@ -1219,7 +1219,7 @@ msgstr "詳細"
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr "ルールまたは反復ルールから除外あうする時間の繰り返しパターンを定義して下さい。"
+msgstr "ルールまたは反復ルールから除外する時間の繰り返しパターンを定義します。"
 
 #. module: base_calendar
 #: field:calendar.event,month_list:0
@@ -1306,7 +1306,7 @@ msgstr "土"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day where repeat the meeting"
-msgstr "定例ミーティングの日を選択して下さい。"
+msgstr "定例ミーティングの日を選択します。"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
@@ -1317,7 +1317,7 @@ msgstr "関連先"
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr "カレンダーユーザのために行動しているユーザを指定してして下さい。"
+msgstr "カレンダーユーザのために行動しているユーザを指定します。"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1445,7 +1445,7 @@ msgstr "順序"
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr "イベントが発生する前に今回アラームを設定して下さい。"
+msgstr "イベントが発生する前に今回アラームを設定します。"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
@@ -1512,9 +1512,9 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
-"・ アラームが起動する時に発せられる音のリソースを指定して下さい。\n"
+"・ アラームが起動する時に発せられる音のリソースを指定します。\n"
 "                    ・ ファイルはEメールにメッセージの添付として送信されます。\n"
-"                    ・ アラームが起動された時に処理される手続きのリソースを指定して下さい。"
+"                    ・ アラームが起動された時に処理される手続きのリソースを指定します。"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index ea0d444ce54..985bab8bf6b 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<!--    Attendee invite wizard-->
+    <data>
+        <!--    Attendee invite wizard-->
 
-		<record id="view_calendar_invite_attendee_wizard"
-			model="ir.ui.view">
-			<field name="name">Invite Attendees</field>
-			<field name="model">base_calendar.invite.attendee</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Invite People">
+        <record id="view_calendar_invite_attendee_wizard"
+            model="ir.ui.view">
+            <field name="name">Invite Attendees</field>
+            <field name="model">base_calendar.invite.attendee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invite People">
                     <separator string="Invite People" colspan="4"/>
-					<field name="type"/>
-					<field name="send_mail"/>
+                    <field name="type"/>
+                    <field name="send_mail"/>
                     <notebook colspan="4">
                         <page string="Data">
                             <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
@@ -35,21 +35,21 @@
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
                     </group>
-				</form>
-			</field>
-		</record>
+                </form>
+            </field>
+        </record>
 
 
-		<!--    Attendee invite action-->
+        <!--    Attendee invite action-->
 
-		<record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-			<field name="name">Invite Attendees</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">base_calendar.invite.attendee</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
+            <field name="name">Invite Attendees</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_calendar.invite.attendee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 5c972521cc6..cde9b55f991 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="view_report_designer_installer" model="ir.ui.view">
-			<field name="name">Form View: OpenERP Report Designer Installation</field>
-			<field name="model">base_report_designer.installer</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.res_config_installer"/>
-			<field name="arch" type="xml">
-				<data>
-					<form position="attributes">
-						<attribute name="string">OpenERP Report Designer Configuration</attribute>
-					</form>
-					<separator string="title" position="before">
-						<label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
-					</separator>
-					<xpath expr="//button[@string='Install Modules']" position="replace">
-						<button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-						<button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
-					</xpath>
-					<xpath expr="//button[@string='Cancel']" position="replace">
-						<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
-					</xpath>
-					<xpath expr="//separator[@string='title']" position="after">
-						<group colspan="8" height="450" width="750">
-							<field name="name" invisible="1"/>
-							<field name="plugin_file" filename="name"/>
-							<separator string="Installation and Configuration Steps" colspan="4"/>
-							<field name="description" nolabel="1" colspan="8"/>
-						</group>
-					</xpath>
-					<separator string="title" position="attributes">
-						<attribute name="string">OpenERP Report Designer</attribute>
-					</separator>
-				</data>
-			</field>
-		</record>
-		<record id="action_report_designer_installer" model="ir.actions.act_window">
-			<field name="name">OpenERP Report Designer Installation</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">base_report_designer.installer</field>
-			<field name="view_id" ref="view_report_designer_installer"/>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-		<record id="report_designer_installer_todo" model="ir.actions.todo">
-			<field name="action_id" ref="action_report_designer_installer"/>
-			<field name="category_id" ref="base.category_tools_customization_config"/>
-			<field name="sequence">3</field>
-			<field name="type">automatic</field>
-		</record>
-		<record id="action_report_designer_wizard" model="ir.actions.act_window">
-			<field name="name">OpenERP Report Designer</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">base_report_designer.installer</field>
-			<field name="view_id" ref="view_report_designer_installer"/>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-			<field name="context">{'menu':True}</field>
-		</record>
-		<menuitem parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
-	</data>
+    <data>
+        <record id="view_report_designer_installer" model="ir.ui.view">
+            <field name="name">Form View: OpenERP Report Designer Installation</field>
+            <field name="model">base_report_designer.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">OpenERP Report Designer Configuration</attribute>
+                    </form>
+                    <separator string="title" position="before">
+                        <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
+                    </separator>
+                    <xpath expr="//button[@string='Install Modules']" position="replace">
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Cancel']" position="replace">
+                        <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
+                    </xpath>
+                    <xpath expr="//separator[@string='title']" position="after">
+                        <group colspan="8" height="450" width="750">
+                            <field name="name" invisible="1"/>
+                            <field name="plugin_file" filename="name"/>
+                            <separator string="Installation and Configuration Steps" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="8"/>
+                        </group>
+                    </xpath>
+                    <separator string="title" position="attributes">
+                        <attribute name="string">OpenERP Report Designer</attribute>
+                    </separator>
+                </data>
+            </field>
+        </record>
+        <record id="action_report_designer_installer" model="ir.actions.act_window">
+            <field name="name">OpenERP Report Designer Installation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_report_designer.installer</field>
+            <field name="view_id" ref="view_report_designer_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <record id="report_designer_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_report_designer_installer"/>
+            <field name="category_id" ref="base.category_tools_customization_config"/>
+            <field name="sequence">3</field>
+            <field name="type">automatic</field>
+        </record>
+        <record id="action_report_designer_wizard" model="ir.actions.act_window">
+            <field name="name">OpenERP Report Designer</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_report_designer.installer</field>
+            <field name="view_id" ref="view_report_designer_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'menu':True}</field>
+        </record>
+        <menuitem parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
+    </data>
 </openerp>
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index 3460fb1af79..7467e55a9f4 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -9,11 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report">
-	            <separator string="Select your report" colspan="4"/>
-	            <field name="report_id"/>
-	             <separator string="" colspan="4"/>
-	               <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	               <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
+                <separator string="Select your report" colspan="4"/>
+                <field name="report_id"/>
+                 <separator string="" colspan="4"/>
+                   <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
             </form>
             </field>
        </record>
@@ -54,10 +54,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Save RML FIle">
-	            <separator string="The RML Report" colspan="4"/>
-	            <field name="file_rml"/>
-	            <newline/>
-	             <separator string="" colspan="4"/>
+                <separator string="The RML Report" colspan="4"/>
+                <field name="file_rml"/>
+                <newline/>
+                 <separator string="" colspan="4"/>
                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
             </form>
             </field>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index b228f1fbd98..5046b122bf5 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -9,7 +9,7 @@
           <field name="inherit_id" ref="base.res_config_view_base"/>
          <field name="arch" type="xml">
             <data>
-              <form position="attributes">
+              <form position="attributes" version="7.0">
                 <attribute name="string">Specify Your Terminology</attribute>
               </form>
              <group string="res_config_contents" position="replace">
@@ -37,7 +37,7 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Configure Sales">
+            <form string="Configure Sales" version="7.0">
                 <header>
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 7752f3ed5ac..0b85e13a08f 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">base.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings">
+                <form string="General Settings" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
index d3d95a02373..2f32045786c 100644
--- a/addons/board/i18n/ja.po
+++ b/addons/board/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 04:45+0000\n"
+"PO-Revision-Date: 2012-06-08 02:39+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-05-24 11:09+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -224,7 +224,7 @@ msgstr "11月"
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr "ボード行のリストを表示する場合、並び順を指定して下さい。"
+msgstr "ボード行のリストを表示する場合、並び順を指定します。"
 
 #. module: board
 #: selection:res.log.report,month:0
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index a4398d1a07d..af71fa5a2eb 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -1,41 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <!--Board menu create wizard  -->
-    
-  		<record id="view_board_menu_create" model="ir.ui.view">
+
+        <record id="view_board_menu_create" model="ir.ui.view">
             <field name="name">board.menu.create.form</field>
             <field name="model">board.menu.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Menu For Dashboard">
-                	<group colspan="4" >
-                		 <separator string="Menu Information" colspan="4"/>
-              			 <field name="menu_name"/>
-              			 <field name="menu_parent_id"/>
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel"
-                    		string="Cancel" />
-                    	<button icon="gtk-save" string="Create Menu"
-                    		name="board_menu_create" type="object" />
+                <form string="Create Menu For Dashboard" version="7.0">
+                    <header>
+                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    </header>
+                    <group colspan="4" string="Menu Information">
+                        <field name="menu_name"/>
+                        <field name="menu_parent_id"/>
                     </group>
                </form>
             </field>
-  		</record>
-  		
+        </record>
+
   <!-- Action for Board Menu create wizard. -->
-  
+
         <record id="action_board_menu_create" model="ir.actions.act_window">
             <field name="name">Create Board Menu</field>
             <field name="res_model">board.menu.create</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_board_menu_create"/> 
+           <field name="view_id" ref="view_board_menu_create"/>
            <field name="target">new</field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 79915d9308a..53adcd97e16 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -7,7 +7,7 @@
             <field name="priority">40</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Calendar Collections">
+                <form string="Calendar Collections" version="7.0">
                     <group col="4">
                         <field name="name" colspan="4"/>
                         <field name="user_id"/>
@@ -80,7 +80,7 @@
             <field name="model">basic.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Calendar">
+                <form string="Calendar" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="type"/>
@@ -93,7 +93,7 @@
                     <notebook>
                         <page string="Calendar Lines">
                             <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
-                                <form string="Calendar Lines">
+                                <form string="Calendar Lines" version="7.0">
                                     <group col="4">
                                         <field name="name" required="1"/>
                                         <field name="object_id" required="1"/>
@@ -106,7 +106,7 @@
                                             <field name="field_id" required="1" domain="[('model_id', '=', parent.object_id)]" />
                                             <field name="expr" />
                                         </tree>
-                                        <form string="Attributes Mapping">
+                                        <form string="Attributes Mapping" version="7.0">
                                             <group col="4">
                                                 <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
                                                 <field name="field_id" domain="[('model_id', '=', parent.object_id)]"
diff --git a/addons/caldav/i18n/ja.po b/addons/caldav/i18n/ja.po
index cb0c2dc92e5..df1e49a8275 100644
--- a/addons/caldav/i18n/ja.po
+++ b/addons/caldav/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 17:42+0000\n"
+"PO-Revision-Date: 2012-06-08 02:42+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-05-25 04:40+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -99,7 +99,7 @@ msgstr "遠隔カレンダーへの経路を指定して下さい。"
 #. module: caldav
 #: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
 msgid "Import .ics File"
-msgstr ".ics ファイルをインポートして下さい。"
+msgstr ".ics ファイルのインポート"
 
 #. module: caldav
 #: view:caldav.browse:0
@@ -346,7 +346,7 @@ msgstr "タイプ"
 #. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
-msgstr ".ics 形式で保存して下さい。"
+msgstr ".ics 形式で保存"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:1293
@@ -424,7 +424,7 @@ msgstr "カレンダー"
 msgid ""
 "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
 msgstr ""
-"http://vobject.skyhouseconsulting.com/ からpython-vobjectをダウンロードして、インストールしてください"
+"http://vobject.skyhouseconsulting.com/ からpython-vobjectをダウンロードして、インストールして下さい。"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:63
@@ -493,7 +493,7 @@ msgstr "集合"
 #. module: caldav
 #: field:basic.calendar,write_date:0
 msgid "Write Date"
-msgstr "日付を入れて下さい。"
+msgstr "記入日"
 
 #. module: caldav
 #: code:addons/caldav/wizard/caldav_browse.py:32
@@ -581,7 +581,7 @@ msgstr "basic.calendar.alias"
 #: view:calendar.event.import:0
 #: field:calendar.event.import,file_path:0
 msgid "Select ICS File"
-msgstr "ICS ファイルを選んで下さい。"
+msgstr "ICS ファイルの選択"
 
 #. module: caldav
 #: field:user.preference,device:0
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index fd6b95d81f9..a9c0d6a48bb 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -65,7 +65,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard" layout="manual">
+                <form string="Sales Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action string="My Opportunities" name="%(act_my_oppor)d" creatable="true"/>
@@ -156,7 +156,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statistics Dashboard" layout="manual">
+                <form string="Statistics Dashboard" layout="manual" version="7.0">
                     <board style="1-1">
                         <column>
                             <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dfceb723a1c..7d7cf917cfe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -60,7 +60,7 @@
         <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Leads Form">
+            <form string="Leads Form" version="7.0">
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity"/>
@@ -129,8 +129,8 @@
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     widget="selection" colspan="2" />
-                                <field name="type_id" select="1" widget="selection"/>
-                                <field name="channel_id" select="1" widget="selection"/>
+                                <field name="type_id" widget="selection"/>
+                                <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
@@ -361,16 +361,26 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities" validate="0">
+            <form string="Opportunities" validate="0" version="7.0">
                 <header>
-                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
-                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
-                    <button name="case_cancel" string="Cancel" states="draft" type="object" />
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    <button name="case_mark_won" string="Mark Won" type="object"
+                            states="draft,open,pending"/>
+                    <button name="case_open" string="Open" type="object"
+                            states="draft,pending"/>
+                    <button name="case_escalate" string="Escalate" type="object"
+                            states="open"/>
+                    <button name="case_mark_lost" string="Mark Lost" type="object"
+                            states="draft,open"/>
+                    <button name="case_reset" string="Reset to Draft" type="object"
+                            states="done,cancel"/>
+                    <button name="case_cancel" string="Cancel" type="object"
+                            states="draft"/>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
+                    <field name="stage_id" widget="statusbar"
+                            on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_form_button_box">
@@ -417,7 +427,7 @@
                             <field name="section_id" colspan="1" widget="selection"/>
                         </group>
                         <group>
-                            <field name="categ_id" select="1"
+                            <field name="categ_id"
                                 string="Category" widget="selection"
                                 domain="[('object_id.model', '=', 'crm.lead')]" />
 
@@ -471,6 +481,8 @@
                                 <field name="day_open" groups="base.group_no_one"/>
                                 <field name="day_close" groups="base.group_no_one"/>
                                 <field name="referred"/>
+                                <field name="state" groups="base.group_no_one"/>
+                                <field name="type" invisible="1"/>
                             </group>
                             <group string="References">
                                 <field name="ref"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 857edc8a900..e98ce2ce8f6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -25,7 +25,7 @@
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Meetings">
+            <form string="Meetings" version="7.0">
                 <header>
                     <button name="case_open" string="Confirm" type="object"
                             states="draft"/>
@@ -115,7 +115,7 @@
                                     states="needs-action,tentative,declined,accepted"
                                     context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
-                            <form string="Invitation details">
+                            <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <field name="email" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2e1c35e683a..b5c75aa6ccf 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -62,7 +62,7 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
@@ -72,57 +72,47 @@
                         states="cancel" icon="gtk-convert"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending" icon="gtk-cancel"/>
+                <button string="Convert to Opportunity"
+                    name="%(phonecall2opportunity_act)d"
+                    icon="gtk-index" type="action"
+                    attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                <button string="Schedule Other Call"
+                    icon="terp-call-start"
+                    name="%(phonecall_to_phonecall_act)d"
+                    type="action"  />
+                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
-            <sheet string="Phone Call" layout="auto">
-                 <group colspan="6" col="7">
+            <sheet string="Phone Call">
+                 <group col="4">
                     <field name="name" required="1"/>
                     <field name="partner_phone"/>
                     <field name="duration" widget="float_time"/>
-                    <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
-                    <button string="Schedule Other Call"
-                     icon="terp-call-start"
-                    name="%(phonecall_to_phonecall_act)d"
-                    type="action"  />
-                    <label colspan="6"  string=""/>
-                    <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        icon="gtk-index" type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-
                 </group>
 
-                <group col="3" colspan="2">
-                    <separator colspan="3" string="Contacts" />
-                    <field name="partner_id"
-                        on_change="onchange_partner_id(partner_id)" />
-                    <button string="Create a Partner"
-                        icon="terp-partner"
-                        name="%(action_crm_phonecall2partner)d"
-                        type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}"
-                        groups="base.group_partner_manager"/>
-                    <newline/>
-                    <newline/>
-                    <field name="partner_mobile" />
+                <group>
+                    <group string="Contacts">
+                        <field name="partner_id"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_mobile"/>
+                    </group>
+                    <group string="Categorization">
+                        <field name="categ_id" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="priority"/>
+                        <field name="opportunity_id"/>
+                    </group>
                 </group>
-                <group col="2" colspan="2">
-                    <separator colspan="2" string="Categorization" />
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
-                </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
+                <separator string="Description"/>
+                <field name="description"/>
             </sheet>
-            <div class="oe_form_sheet_width">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-            </div>
+            <footer>
+                <field name="message_ids" widget="ThreadView"/>
+            </footer>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index dacfa5c2946..b9da39c4721 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -30,8 +30,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Channels">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
+                    <field name="name"/>
+                    <field name="active"/>
                 </tree>
             </field>
         </record>
@@ -40,9 +40,11 @@
             <field name="model">crm.case.channel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Channel">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
+                <form string="Channel" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -63,38 +65,34 @@
             <field name="model">crm.case.section</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Team">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="2"/>
-                        <field name="parent_id" select="2"/>
-                        <field name="code" select="1"/>
-                        <newline/>
-                        <field name="user_id" select="2"/>
-                        <field name="resource_calendar_id" select="2"/>
-                        <field name="active" select="2"/>
+                <form string="Sales Team" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name" colspan="2"/>
+                            <field name="parent_id"/>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="resource_calendar_id"/>
+                            <field name="active"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Team">
-                            <group col="2" colspan="1">
-                                <separator string="Mail Gateway" colspan="2"/>
-                                <field name="reply_to" select="2"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <separator string="Configuration" colspan="2"/>
-                                <field name="allow_unlink" select="2"/>
+                            <group col="4">
+                                <field name="reply_to"/>
+                                <field name="allow_unlink"/>
                                 <field name="change_responsible"/>
-                            </group>
-                            <group col="1" colspan="4">
-                                <separator string="Team Members" colspan="4"/>
-                                <field name="member_ids" nolabel="1" colspan="4"   height="250"/>
+                                <field name="member_ids"/>
                             </group>
                         </page>
                         <page string="Stages">
-                            <separator string="Select Stages for this Sales Team" colspan="4"/>
-                            <field name="stage_ids" colspan="4" nolabel="1"/>
+                            <separator string="Select Stages for this Sales Team"/>
+                            <field name="stage_ids"/>
                         </page>
                         <page string="Notes">
-                            <field name="note" select="1" colspan="4" nolabel="1"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -110,9 +108,9 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Sales Team">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
@@ -157,9 +155,9 @@
             <field name="type">form</field>
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
-                <form string="Stage">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
+                <form string="Stage" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
                         <field name="probability"/>
                         <field name="on_change"/>
                         <field name="case_default"/>
@@ -168,9 +166,9 @@
                         <field name="fold"/>
                         <field name="type"/>
                     </group>
-                    <separator string="Requirements" colspan="4"/>
-                    <field name="requirements" nolabel="1" colspan="4"/>
-                    <field name="section_ids" invisible="1" colspan="4"/>
+                    <separator string="Requirements"/>
+                    <field name="requirements" nolabel="1"/>
+                    <field name="section_ids" invisible="1"/>
                 </form>
             </field>
         </record>
@@ -192,10 +190,12 @@
             <field name="model">crm.case.categ</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Case Category">
-                    <field name="name" select="1"/>
-                    <field name="section_id" select="1"/>
-                    <field name="object_id"  invisible="1" />
+                <form string="Case Category" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="section_id"/>
+                        <field name="object_id"  invisible="1" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -235,9 +235,11 @@
             <field name="model">crm.case.resource.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Campaign">
-                    <field name="name" select="1"/>
-                    <field name="section_id"/>
+                <form string="Campaign" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="section_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -288,15 +290,16 @@
             <field name="model">crm.segmentation.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Segmentation Lines">
-                    <field colspan="4" name="name" select="1"/>
-                    <group col="2" colspan="4">
-                        <field name="expr_name"/>
-                        <field name="expr_operator"/>
-                        <field name="expr_value"/>
+                <form string="Partner Segmentation Lines" version="7.0">
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                        <group col="2" colspan="4">
+                            <field name="expr_name"/>
+                            <field name="expr_operator"/>
+                            <field name="expr_value"/>
+                        </group>
+                        <field name="operator"/>
                     </group>
-                    <newline/>
-                    <field name="operator"/>
                 </form>
             </field>
         </record>
@@ -308,24 +311,8 @@
             <field name="model">crm.segmentation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Segmentation">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="categ_id"/>
-                        <field name="exclusif"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Sales Purchase">
-                            <field name="sales_purchase_active"/>
-                            <separator colspan="4" string="Segmentation Test"/>
-                            <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
-                        </page>
-                        <page string="Description">
-                               <field colspan="4" name="description" nolabel="1"/>
-                           </page>
-                    </notebook>
-                    <field name="state"/>
-                    <group col="3" colspan="2">
+                <form string="Partner Segmentation" version="7.0">
+                    <header>
                         <button name="process_start"
                             states="not running"
                             string="Compute Segmentation" type="object"
@@ -336,7 +323,25 @@
                         <button name="process_continue" states="running"
                             string="Continue Process" type="object"
                             icon="gtk-go-forward" />
+                        <field name="state" widget="statusbar"/>
+                    </header>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="categ_id"/>
+                        <field name="exclusif"/>
                     </group>
+                    <notebook>
+                       <page string="Sales Purchase">
+                           <group>
+                               <field name="sales_purchase_active"/>
+                           </group>
+                           <separator string="Segmentation Test"/>
+                           <field name="segmentation_line" widget="one2many_list"/>
+                       </page>
+                       <page string="Description">
+                           <field name="description"/>
+                       </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index b603b8e8c1f..c2a7b248d93 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -9,15 +9,13 @@
             <field name="model">crm.add.note</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add Note">
-                    <separator string="Add Note" colspan="4" />
-                    <field name="body" nolabel="1" colspan="4" default_focus="1"/>
-                    <separator string="" colspan="6"/>
-                    <group colspan="6" col="4" >
-                        <field name="state" />
-                        <button string="_Cancel" icon="gtk-close" special="cancel" />
+                <form string="Add Note" version="7.0">
+                    <header>
                         <button name="action_add" type="object" string="_Add" icon="gtk-ok" />
-                    </group>
+                        <button string="_Cancel" icon="gtk-close" special="cancel" />
+                    </header>
+                    <separator string="Add Note"/>
+                    <field name="body"/>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index b587e548049..e067f43e955 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -8,16 +8,15 @@
           <field name="model">crm.lead2partner</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-              <form string="Create a Partner">
-                  <separator string="Create a Partner" colspan="4" />
-                  <field name="action"/>
-                  <group attrs="{'invisible':[('action','!=','exist')]}">
-                    <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
-                </group>
-                <separator string="" colspan="4" />
-                  <group col="4" colspan="4">
+              <form string="Create a Partner" version="7.0">
+                  <header>
                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                       <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                  </header>
+                  <separator string="Create a Partner"/>
+                  <group col="4">
+                      <field name="action"/>
+                      <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                   </group>
               </form>
           </field>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 65990f3a232..7e3f7b2b0f4 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -9,9 +9,13 @@
             <field name="model">crm.merge.opportunity</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Merge Opportunities">
-                    <separator string="Select Opportunities" colspan="4"/>
-                    <field name="opportunity_ids" nolabel="1" colspan="4" width="550" height="300" >
+                <form string="Merge Opportunities" version="7.0">
+                    <header>
+                        <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                    </header>
+                    <separator string="Select Opportunities"/>
+                    <field name="opportunity_ids">
                         <tree>
                             <field name="name" />
                             <field name="partner_id" />
@@ -19,12 +23,6 @@
                             <field name="section_id" />
                         </tree>
                     </field>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_merge" type="object"
-                                string="_Merge" icon="gtk-ok" />
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index d0499bbdf6c..b91b31d7721 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -9,30 +9,30 @@
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule/Log a Call" layout="manual">
+                <form string="Schedule/Log a Call" layout="manual" version="7.0">
                 <header>
                     <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
                     <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
                     <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                 </header>
-            <group>
                 <group>
-                <field name="action"/>
-                <field name="name"/>
-                <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
-            </group>
-            <group>
-                <field name="partner_id" readonly="True"/>
-                <field name="categ_id" string="Type"
-                    widget="selection"
-                domain="[('object_id.model', '=', 'crm.phonecall')]"
-                groups="base.group_no_one"/>
-                <field name="phone"/>
-                <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-            </group>
+                    <group>
+                        <field name="action"/>
+                        <field name="name"/>
+                        <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                    </group>
+                    <group>
+                        <field name="partner_id" readonly="True"/>
+                        <field name="categ_id" string="Type"
+                            widget="selection"
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"
+                        groups="base.group_no_one"/>
+                        <field name="phone"/>
+                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                    </group>
                 </group>
-                    <field name="note"/>
+                <field name="note"/>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 48cfec802d7..a65aa4ae5e0 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -8,16 +8,16 @@
           <field name="model">crm.partner2opportunity</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-              <form string="Create Opportunity">
-            <field name="name"/>
-            <field name="partner_id"/>
-            <newline/>
-            <field name="planned_revenue"/>
-            <field name="probability"/>
-                <separator string="" colspan="4" />
-                  <group col="4" colspan="4">
+              <form string="Create Opportunity" version="7.0">
+                  <header>
                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                       <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
+                  </header>
+                  <group col="4">
+                      <field name="name"/>
+                      <field name="partner_id"/>
+                      <field name="planned_revenue"/>
+                      <field name="probability"/>
                   </group>
               </form>
           </field>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index a2929ef5a16..6415fddd2ab 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -3,7 +3,7 @@
     <data>
 
             
-	    <!-- Phonecall to meeting view -->
+        <!-- Phonecall to meeting view -->
 
         <record model="ir.ui.view" id="phonecall2phonecall2meeting_view">
             <field name="name">crm.phonecall2meeting.form</field>
@@ -11,18 +11,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Meeting">
-                	<label string="Are you sure to schedule a Meeting for this Phonecall?" colspan="4"/>
-                	<newline/>
-                	<separator colspan="4" string=""/>
-                	<button name="action_cancel" string="_Cancel"
-                		icon="gtk-cancel" special="cancel" />
-                	<button name="action_make_meeting" type="object"
-                		string="_Schedule" icon="gtk-go-forward" />
+                    <header>
+                        <button name="action_cancel" string="_Cancel"
+                            icon="gtk-cancel" special="cancel" />
+                        <button name="action_make_meeting" type="object"
+                            string="_Schedule" icon="gtk-go-forward" />
+                    </header>
+                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
                 </form>
             </field>
         </record>
 
-	    <!-- Phonecall to meeting action -->
+        <!-- Phonecall to meeting action -->
 
         <record model="ir.actions.act_window" id="phonecall2meeting_act">
             <field name="name">Convert To Meeting</field>
@@ -34,4 +34,4 @@
         </record>
 
     </data>
-</openerp>   
\ No newline at end of file
+</openerp>   
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index d3c59f89433..5f12181c48f 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -9,17 +9,16 @@
             <field name="model">crm.phonecall2opportunity</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Convert To Opportunity ">
-                		<field name="name"/>
-						<field name="partner_id" />
-						<newline/>
-						<field name="planned_revenue"/>
-						<field name="probability"/>
-					<separator string=" " colspan="4"/>
-                    <group colspan="4" col="3" >
-                    	<label string=" " />
+                <form string="Convert To Opportunity " version="7.0">
+                    <header>
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" />
+                    </header>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="partner_id" />
+                        <field name="planned_revenue"/>
+                        <field name="probability"/>
                     </group>
                 </form>
             </field>
@@ -37,4 +36,4 @@
         </record>
 
     </data>
-</openerp>   
\ No newline at end of file
+</openerp>   
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index b9f7dad6c07..c1ba57a7a24 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -1,49 +1,47 @@
 <openerp>
-  	<data>
+      <data>
 
-  	<!-- Phonecall to partner confirmation form -->
-  	
-  		<record id="view_crm_phonecall2partner_create" model="ir.ui.view">
-	      <field name="name">crm.phonecall2partner.view.create</field>
-	      <field name="model">crm.phonecall2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<label string="Are you sure you want to create a partner based on this Phonecall ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        		<separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	
-	<!-- Phonecall to partner  form view -->
-	
-	   <record id="view_crm_phonecall2partner" model="ir.ui.view">
-	      <field name="name">crm.phonecall2partner.view</field>
-	      <field name="model">crm.phonecall2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id" attrs="{'required':[('action','=','exist')]}" />
-		        </group>
-		        <separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
+      <!-- Phonecall to partner confirmation form -->
+      
+          <record id="view_crm_phonecall2partner_create" model="ir.ui.view">
+          <field name="name">crm.phonecall2partner.view.create</field>
+          <field name="model">crm.phonecall2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+            <form string="Create a Partner" version="7.0">
+                <header>
+                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                </header>
+                <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
+                <label string="You may have to verify that this partner does not exist already."/>
+            </form>
+        </field>
+       </record>
+    
+    <!-- Phonecall to partner  form view -->
+    
+       <record id="view_crm_phonecall2partner" model="ir.ui.view">
+          <field name="name">crm.phonecall2partner.view</field>
+          <field name="model">crm.phonecall2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+            <form string="Create a Partner" version="7.0">
+                <header>
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                </header>
+                <group>
+                    <field name="action"/>
+                    <field name="partner_id" attrs="{'required':[('action','=','exist')],'invisible':[('action','!=','exist')]}" />
+                </group>
+            </form>
+          </field>
+       </record>
 
-	 <!-- Phonecall to Partner wizard -->
+     <!-- Phonecall to Partner wizard -->
 
-		<record id="action_crm_phonecall2partner" model="ir.actions.act_window">
+        <record id="action_crm_phonecall2partner" model="ir.actions.act_window">
             <field name="name">Create a Partner</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.phonecall2partner</field>
@@ -51,7 +49,7 @@
             <field name="view_id" ref="view_crm_phonecall2partner_create"/>
             <field name="target">new</field>
         </record>
-		
+        
 
- 	</data>
+     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 345d8ba0ba5..b1f40c4eebd 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -9,7 +9,13 @@
             <field name="model">crm.phonecall2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule/Log a Call">
+                <form string="Schedule/Log a Call" version="7.0">
+                    <header>
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                    </header>
+                    <group col="4">
                         <separator string="Schedule/Log a Call" colspan="4"/>
                         <field name="action"/>
                         <separator string="Call Details" colspan="4"/>
@@ -19,12 +25,7 @@
                         <field name="user_id" />
                         <field name="section_id"/>
                         <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <separator string=" " colspan="4"/>
-                        <group colspan="4" col="3" >
-                            <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                            <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                            <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po
index cd5ef5d23a8..f76197d8d79 100644
--- a/addons/crm_claim/i18n/ja.po
+++ b/addons/crm_claim/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-25 05:03+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-06-09 18:59+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-04-26 04:41+0000\n"
-"X-Generator: Launchpad (build 15149)\n"
+"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -570,7 +570,7 @@ msgstr "最高"
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr "パートナー連絡先"
+msgstr "パートナ連絡先"
 
 #. module: crm_claim
 #: view:crm.claim:0
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 02f85b1ad7f..eb7bcade10b 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -61,7 +61,7 @@
             <field name="model">crm.fundraising</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form version="7.0">
                 <header>
                     <button name="case_close" string="Done" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
@@ -72,57 +72,55 @@
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet string="Funds Form" layout="auto">
-                    <group colspan="4" col="6" class="oe_form_header">
-                        <field name="name" select="1" string="Name"/>
+                    <group col="4">
+                        <field name="name" string="Name"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="user_id" string="Responsible"/>
                         <field name="date"/>
-                        <field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                        <field name="type_id" string="Payment Mode" select="1" widget="selection"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="type_id" string="Payment Mode" widget="selection"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Funds">
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Communication"/>
-                                <field name="partner_id" select="1"
-                                    on_change="onchange_partner_id(partner_id, email_from)"
-                                    colspan="2" />
-                                <field name="email_from" colspan="2"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Estimates"/>
-                                <field name="planned_cost"/>
-                                <field name="planned_revenue"/>
-                                <field name="probability"/>
+                            <group>
+                                <group string="Communication">
+                                    <field name="partner_id"
+                                        on_change="onchange_partner_id(partner_id, email_from)"
+                                        />
+                                    <field name="email_from"/>
+                                </group>
+                                <group string="Estimates">
+                                    <field name="planned_cost"/>
+                                    <field name="planned_revenue"/>
+                                    <field name="probability"/>
+                                </group>
                             </group>
                             <separator colspan="4" string="Notes"/>
-                                <field name="description" nolabel="1" colspan="4"/>
+                            <field name="description"/>
                         </page>
                         <page string="Extra Info">
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Misc"/>
-                                <field name="active"/>
-                                <field name="id" select="1"/>
-                                <field name="priority" string="Priority"/>
-                            </group>
-                            <group col="2" colspan="2" groups="base.group_no_one">
-                                <separator colspan="4" string="Dates"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="duration"/>
-                            </group>
-                            <newline/>
-                            <group colspan="4" col="2">
-                                <separator colspan="4" string="References"/>
-                                <field colspan="4" name="ref"/>
-                                <field colspan="4" name="ref2"/>
+                            <group>
+                                <group string="Misc">
+                                    <field name="active"/>
+                                    <field name="id"/>
+                                    <field name="priority" string="Priority"/>
+                                </group>
+                                <group groups="base.group_no_one" string="Dates">
+                                    <field name="create_date"/>
+                                    <field name="date_closed"/>
+                                    <field name="duration"/>
+                                </group>
+                                <group string="References">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <footer>
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_fundraising/i18n/ja.po b/addons/crm_fundraising/i18n/ja.po
index 9dd56d5cf6a..e094f9ed8d0 100644
--- a/addons/crm_fundraising/i18n/ja.po
+++ b/addons/crm_fundraising/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-23 05:47+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-06-09 19:04+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-04-24 04:53+0000\n"
-"X-Generator: Launchpad (build 15135)\n"
+"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
@@ -698,11 +698,8 @@ msgid ""
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 "案件を作ると「予定」状態に設定されます。　　　\n"
-"\n"
 "案件が進行中になると、「受付中」に設定されます。　　\n"
-"\n"
 "案件が終了すると、「終了」に設定されます。　\n"
-"\n"
 "案件が再検討することになると、「保留」に設定されます。"
 
 #. module: crm_fundraising
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 6cdf7410348..afdcf56d50e 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -37,17 +37,19 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cases">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="section_id" select="1"/>
-                    <field name="nbr" select="1"/>
-                    <field name="delay_close"/>
-                    <field name="amount_revenue"/>
-                    <field name="amount_revenue_prob"/>
-                    <field name="probability"/>
-                    <field name="state" select="1"/>
+                <form string="Cases" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="user_id"/>
+                        <field name="section_id"/>
+                        <field name="nbr"/>
+                        <field name="delay_close"/>
+                        <field name="amount_revenue"/>
+                        <field name="amount_revenue_prob"/>
+                        <field name="probability"/>
+                        <field name="state"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index d6b21ab9191..0997cbfc87b 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -28,7 +28,7 @@
             <field name="model">crm.helpdesk</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form layout="manual" version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
@@ -42,73 +42,64 @@
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet string="Helpdesk Support" layout="auto">
-                    <group colspan="4" col="7" class="oe_form_header">
-                        <field name="name" select="1" string="Query"/>
+                    <group col="4" class="oe_form_header">
+                        <field name="name" string="Query"/>
                         <field name="section_id" widget="selection"/>
-                        <field name="user_id" select="1"/>
-                        <button name="remind_user"
-                            states="open,pending"
-                            string="Send Reminder" type="object"
-                            icon="gtk-go-forward" />
-                        <field name="date" select="1"/>
+                        <field name="user_id"/>
+                        <field name="date"/>
                         <field name="date_deadline"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="General">
-                            <group col="3" colspan="2">
-                                <separator colspan="4" string="Communication"/>
-                                <field name="partner_id" colspan="2"
-                                    on_change="onchange_partner_id(partner_id, email_from)"
-                                    select="1" />
-                                <newline/>
-                                <field name="email_from" colspan="2"/>
-                                <button name="remind_partner"
-                                    states="open,pending"
-                                    string="Send Reminder" type="object"
-                                    icon="gtk-go-forward" />
+                            <group>
+                                <group string="Communication">
+                                    <field name="partner_id"
+                                        on_change="onchange_partner_id(partner_id, email_from)"
+                                        />
+                                    <field name="email_from"/>
+                                    <button name="remind_partner"
+                                        states="open,pending"
+                                        string="Send Reminder" type="object"
+                                        icon="gtk-go-forward" />
+                                </group>
+                                <group string="Categorization">
+                                    <field name="priority"/>
+                                    <field name="categ_id" context="{'object_id':'crm.helpdesk'}"/>
+                                    <field name="channel_id"/>
+                                </group>
                             </group>
 
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Categorization"/>
-                                <field name="priority"/>
-                                <field name="categ_id" context="{'object_id':'crm.helpdesk'}"/>
-                                <field name="channel_id"/>
-                            </group>
-
-                            <separator colspan="4" string="Notes"/>
-                            <field name="description" colspan="4" nolabel="1" />
+                            <separator string="Notes"/>
+                            <field name="description"/>
                         </page>
                         <page string="Extra Info">
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator colspan="4" string="Dates"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Misc"/>
-                                <field name="id" select="1"/>
-                                <field name="active"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Estimates"/>
-                                <field name="planned_cost"/>
-                            </group>
-                            <newline/>
-                            <group colspan="4" col="2">
-                                <separator colspan="4" string="References"/>
-                                <field colspan="4" name="ref"/>
-                                <field colspan="4" name="ref2"/>
+                            <group>
+                                <group groups="base.group_no_one" string="Dates">
+                                    <field name="create_date"/>
+                                    <field name="write_date"/>
+                                    <field name="date_closed"/>
+                                </group>
+                                <group string="Misc">
+                                    <field name="id"/>
+                                    <field name="active"/>
+                                </group>
+                                <group string="Estimates">
+                                    <field name="planned_cost"/>
+                                </group>
+                                <group string="References">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 4bd768179a3..4138cbf7f09 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -9,9 +9,11 @@
             <field name="model">res.partner.activation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Activation">
-                    <field name="name" />
-                    <field name="sequence" />
+                <form string="Activation" version="7.0">
+                    <group col="4">
+                        <field name="name" />
+                        <field name="sequence" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -54,9 +56,9 @@
         <field name="model">res.partner.grade</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Partner Grade">
-                <group col="6" colspan="4">
-                    <field name="name" select="1"/>
+            <form string="Partner Grade" version="7.0">
+                <group col="4">
+                    <field name="name"/>
                     <field name="sequence"/>
                     <field name="active"/>
                 </group>
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 88955f43af4..6c70f30c036 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -7,14 +7,13 @@
             <field name="model">open.questionnaire</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Questionnaires">
-                    <field name="questionnaire_id" required="1"/>
-                    <newline/>
-                    <separator string="" colspan="4"/>
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2"/>
-                        <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+                <form string="Questionnaires" version="7.0">
+                    <header>
                         <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/>
+                        <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+                    </header>
+                    <group>
+                        <field name="questionnaire_id"/>
                     </group>
                 </form>
             </field>
@@ -34,7 +33,7 @@
             <field name="model">open.questionnaire</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                     <separator colspan="4" string="Questionnaire"/>
                     <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
                     <separator string="" colspan="4" />
@@ -64,7 +63,7 @@
             <field name="model">open.questionnaire.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Questionnaire">
+                <form string="Questionnaire" version="7.0">
                     <field name="question_id"/>
                     <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
                 </form>
diff --git a/addons/decimal_precision/decimal_precision_view.xml b/addons/decimal_precision/decimal_precision_view.xml
index 661bf643239..5dec74cd8f4 100644
--- a/addons/decimal_precision/decimal_precision_view.xml
+++ b/addons/decimal_precision/decimal_precision_view.xml
@@ -6,7 +6,7 @@
             <field name="name">Decimal Precision</field>
             <field name="model">decimal.precision</field>
             <field name="arch" type="xml">
-                <form string="Decimal Precision">
+                <form string="Decimal Precision" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="digits"/>
@@ -20,7 +20,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Decimal Precision">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="digits"/>
                 </tree>
             </field>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 421b821002c..099754aef06 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -20,7 +20,7 @@
             <field name="model">delivery.carrier</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Carrier">
+                <form string="Carrier" version="7.0">
                     <group col="4" name="general">
                         <field name="name"/>
                         <field name="partner_id"/>
@@ -41,7 +41,7 @@
                               <field name="sequence"/>
                               <field name="name"/>
                          </tree>
-                        <form string="Delivery grids">
+                        <form string="Delivery grids" version="7.0">
                              <group col="4">
                                  <field name="name"/>
                                  <field name="active"/>
@@ -99,7 +99,7 @@
             <field name="model">delivery.grid</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Delivery grids">
+                <form string="Delivery grids" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
@@ -139,8 +139,8 @@
             <field name="model">delivery.grid.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Grid Lines">
-                    <field colspan="4" name="name" select="1"/>
+                <form string="Grid Lines" version="7.0">
+                    <field colspan="4" name="name"/>
                     <div>
                         <label string="condition" for="type"/>
                         <field name="type" class="oe_form_inline"/>
@@ -230,9 +230,8 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <group colspan="2" col="2" position="after">
-                    <group colspan="2" col="2">
-                        <separator string="Weights" colspan="2"/>
+                <group name="picking" position="after">
+                    <group string="Weights">
                         <field name="weight"/>
                         <field name="weight_net"/>
                     </group>
@@ -246,9 +245,8 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
             <field name="arch" type="xml">
-                <group colspan="2" col="2" position="after">
-                    <group colspan="2" col="2">
-                        <separator string="Weights" colspan="2"/>
+                <group name="picking" position="after">
+                    <group string="Weights">
                         <field name="weight"/>
                         <field name="weight_net"/>
                     </group>
@@ -262,11 +260,15 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='bellow_the_lines_hook']" position="inside">
-                    <separator string="Delivery Costs" colspan="4"/>
-                    <field name="carrier_id" context="{'order_id':active_id or False}" colspan="2"/>
-                    <button name="delivery_set" states="draft" string="Add Now on the Sale Order" type="object" icon="gtk-add" colspan="2"/>
-                    <label string="if you don't click on 'Add Now', the delivery cost won't be added on the Sale Order, but will be added on the Delivery Order only" colspan="4"/>
+                <xpath expr="//group[@name='sale_total']" position="after">
+                    <group>
+                        <label for="carrier_id"/>
+                        <div>
+                            <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_form_inline"/>
+                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
+                        </div>
+                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
+                    </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index acfcf4cb63a..287a6c296e8 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -6,7 +6,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board" layout="manual">
+                <form string="Document board" layout="manual" version="7.0">
                      <board style="2-1" >
                         <column>
                             <action string="New Files"
@@ -54,7 +54,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board" layout="manual">
+                <form string="Document board" layout="manual" version="7.0">
                      <board style="2-1">
                         <column>
                             <action string="Wall of Shame"
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 12eda959b2a..52d2f2b7cff 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:18+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-06-07 03:33+0000\n"
+"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:06+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-08 04:40+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -300,7 +300,7 @@ msgstr "在这里选择一个对象并且这资源的每个记录有一个目录
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr "如果你想对可得到的资源自动过滤, 规定一个范围"
+msgstr "如果要自动筛选可见的资源，请使用过滤条件"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
@@ -410,7 +410,7 @@ msgstr "关联的文档"
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr "范围"
+msgstr "过滤条件"
 
 #. module: document
 #: field:document.directory,write_date:0
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 478f1d75a29..4f4c441b362 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -10,10 +10,12 @@
             <form position="attributes">
                 <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
+            <group string="res_config_contents" position="attributes">
+            </group>
             <group string="res_config_contents" position="replace">
-            	<group string="Configure Directories">
-	            	<label string="OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."/>
-	                <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
+                <group string="Configure Directories">
+                    <label string="OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."/>
+                    <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
                 </group>
             </group>
             <xpath expr="//button[@name='action_skip']" position="replace"/>
diff --git a/addons/document_ftp/i18n/sk.po b/addons/document_ftp/i18n/sk.po
new file mode 100644
index 00000000000..d5b3f7c734d
--- /dev/null
+++ b/addons/document_ftp/i18n/sk.po
@@ -0,0 +1,114 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-09 09:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Prehľadávať súbory"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Obrázok"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Adresa"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP Server"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "Nastavenia FTP Servera"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr ""
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 90182b70e0d..8ed31ee2323 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -6,14 +6,14 @@
             <field name="model">document.ftp.browse</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Browse Document">
-                    <separator string="Browse Document" colspan="4"/>
-                    <field name="url" widget="url" colspan="4" width="250"/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <label string="" colspan="2"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                <form string="Browse Document" version="7.0">
+                    <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <separator string="Browse Document"/>
+                    <group>
+                        <field name="url" widget="url"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index d1d633b1052..881db073ae9 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -7,7 +7,7 @@
         <field name="model">document.webdav.dir.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties">
+            <form string="Properties" version="7.0">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
@@ -86,7 +86,7 @@
                     <field name="namespace"/>
                     <field name="name"/>
                 </tree>
-                <form string="Properties">
+                <form string="Properties" version="7.0">
                     <group col="4">
                         <field name="namespace"/>
                         <field name="name"/>
@@ -107,7 +107,7 @@
         <field name="model">document.webdav.file.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties">
+            <form string="Properties" version="7.0">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index feb4d54a1ed..1403721af53 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -7,7 +7,7 @@
             <field name="model">email.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Templates">
+                <form string="Templates" version="7.0">
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 72b46a74116..4f6e3a37b08 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -39,7 +39,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Association Dashboard" layout="manual">
+                <form string="Association Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action string="Next Events"
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index 2fe8682540a..b79cae03723 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -7,13 +7,12 @@
             <field name="model">event.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Event Confirmation">
-              		<label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
-                    </group>
+              <form string="Event Confirmation" version="7.0">
+                  <header>
+                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
+                      <button  icon="gtk-close" special="cancel" string="Close"/>
+                  </header>
+                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
             </form>
             </field>
         </record>
@@ -30,4 +29,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index 198c8ee405d..0678f120f06 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -7,15 +7,16 @@
             <field name="model">event.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="Retro-Planning">
-                    <field name="project_id" colspan="4"/>
-                    <field name="date_start"/>
-                    <field name="date"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object"/>
-                    </group>
+               <form string="Retro-Planning" version="7.0">
+                   <header>
+                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object"/>
+                       <button  icon="gtk-close" special="cancel" string="Close"/>
+                   </header>
+                   <group col="4">
+                       <field name="project_id" colspan="4"/>
+                       <field name="date_start"/>
+                       <field name="date"/>
+                   </group>
               </form>
             </field>
         </record>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 2f92891ab86..d19fb4c4ca1 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -24,36 +24,38 @@
             <field name="model">fetchmail.server</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Incoming Mail Server">
+                <form string="Incoming Mail Server" version="7.0">
                     <header attrs="{'invisible' : [('type', '=', 'local')]}">
                         <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
                         <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
-                    <group>
+                    <group col="4">
                         <field name="name"/>
                         <field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                         <field name="date"/>
                     </group>
                     <notebook>
                         <page string="Server &amp; Login">
-                            <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
-                                <field name="server" colspan="2" attrs="{'required' : [('type', '!=', 'local')]}" />
-                                <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" />
-                                <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
-                            </group>
-                            <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Login Information">
-                                <field name="user" attrs="{'required' : [('type', '!=', 'local')]}"/>
-                                <field name="password" password="True" attrs="{'required' : [('type', '!=', 'local')]}"/>
-                            </group>
-                            <group string="Actions to Perform on Incoming Mails">
-                                <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/>
-                                <field name="action_id"/>
-                            </group>
-                            <group attrs="{'invisible' : [('type', '!=', 'local')]}" string="Configuration">
-                                <field name="configuration" colspan="4"/>
-                                <field name="script" colspan="4" widget="url"/>
+                            <group>
+                                <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
+                                    <field name="server" colspan="2" attrs="{'required' : [('type', '!=', 'local')]}" />
+                                    <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" />
+                                    <field name="is_ssl" on_change="onchange_server_type(type, is_ssl)"/>
+                                </group>
+                                <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Login Information">
+                                    <field name="user" attrs="{'required' : [('type', '!=', 'local')]}"/>
+                                    <field name="password" password="True" attrs="{'required' : [('type', '!=', 'local')]}"/>
+                                </group>
+                                <group string="Actions to Perform on Incoming Mails">
+                                    <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/>
+                                    <field name="action_id"/>
+                                </group>
+                                <group attrs="{'invisible' : [('type', '!=', 'local')]}" string="Configuration">
+                                    <field name="configuration" colspan="4"/>
+                                    <field name="script" colspan="4" widget="url"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Advanced" groups="base.group_no_one">
@@ -110,7 +112,7 @@
           <field name="inherit_id" ref="mail.view_email_message_tree"/>
           <field name="arch" type="xml">
               <field name="user_id" position="after">
-                  <field name="fetchmail_server_id" select="1"/>
+                  <field name="fetchmail_server_id"/>
               </field>
           </field>
       </record>
diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 73dddcdf0f5..db189d659db 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -7,8 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="inside">
-                    <page string=" Synchronization ">
+                <xpath expr="//notebook" position="inside">
+                    <page string="Synchronization">
                         <separator string="Google Account" colspan="4"/>
                         <field name="gmail_user"/>
                         <field name="gmail_password" password="True"/>
diff --git a/addons/google_base_account/i18n/sv.po b/addons/google_base_account/i18n/sv.po
new file mode 100644
index 00000000000..a90418cbfde
--- /dev/null
+++ b/addons/google_base_account/i18n/sv.po
@@ -0,0 +1,121 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-04 09:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Användarnamn"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Googleinloggning"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontaktimportfel!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Synkronisering "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Fel"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Googleinloggning"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google-lösenord"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google-konto"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google-användarnamn"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Vänligen installera gdata-python-client från http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google-kontakt"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "Logga _in"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Lösenord"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Autenticering misslyckades, kontrollera användarid och lösenord !"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "ex: user@gmail.com"
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index 9c5c93c613e..0e19a14d221 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -6,22 +6,15 @@
             <field name="model">google.login</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Google login" >
-                    <group colspan="4" col="4" width="300">
-                        <field name="user" />
-                        <newline/>
-                        <label string="ex: user@gmail.com" align="1.0" colspan="2"/>
-                        <newline/>
+                <form string="Google login"  version="7.0">
+                    <header>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button name="login" string="_Login" type="object" icon="terp-check"/>
+                    </header>
+                    <group>
+                        <field name="user" placeholder="user@gmail.com"/>
                         <field name="password" password="True"/>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2"/>
-                        <group colspan="2">  
-                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="login" string="_Login" type="object" icon="terp-check"/>
-                        </group>
-                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index a6e85c3cd66..33e28aa8f84 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -34,9 +34,7 @@ Using this you can directly open Google Map from the URL widget.""",
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': [
-                   'google_map_view.xml',
-                  ],
+    'update_xml': [ ],
     'demo_xml': [],
     'js': ['static/src/js/google_map.js'],
     'installable': True,
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
deleted file mode 100644
index eda86a0662f..00000000000
--- a/addons/google_map/google_map_view.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="view_partner_form_inheritg">
-            <field name="name">res.partner.form.inheritg</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="street2" position="replace">
-                        <label string="Street2 : " align="1.0"/>
-                        <group colspan="1" col="2">
-                        <field name="street2" nolabel="1"/>
-                        <button name="open_map" string="Map" type="object" icon="gtk-zoom-in"/>
-                        </group>
-                    </field>
-                </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index e665c5067eb..22687d27c69 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -7,7 +7,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Board" layout="manual">
+            <form string="My Board" layout="manual" version="7.0">
                 <board style="2-1">
                     <column/>
                     <column/>
@@ -34,7 +34,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="HR Manager Board" layout="manual">
+            <form string="HR Manager Board" layout="manual" version="7.0">
                 <board style="2-1">
                     <column/>
                     <column/>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 4e2746e2c27..d6fd393edf8 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -12,7 +12,7 @@
             <field name="model">hr.department</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="department">
+                <form string="department" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index dea72fc3db2..bed32142a39 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -22,7 +22,7 @@
             <field name="model">hr.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee">
+                <form string="Employee" version="7.0">
                     <sheet>
                     <div class="oe_right oe_form_button_box">
                         <!-- Put here related buttons -->
@@ -112,7 +112,7 @@
                     <field name="department_id" widget="selection">
                     </field>
                     <field name="job_id" widget="selection"/>
-                    <field name="category_ids" select="1"/>
+                    <field name="category_ids"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
@@ -274,7 +274,7 @@
             <field name="model">hr.employee.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Category">
+                <form string="Employee Category" version="7.0">
                     <group>
                         <field name="name" />
                         <field name="parent_id" />
@@ -349,7 +349,7 @@
             <field name="model">hr.job</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Job">
+                <form string="Job" version="7.0">
                     <header>
                         <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
                         <button name="job_open" string="In Position" states="old,recruit" type="object"/>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 4cb42f55585..e3cfd96d26f 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -14,7 +14,7 @@
             <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Human Resources">
+                <form string="Configure Human Resources" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index b4cde27484d..c2c964565ad 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.attendance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee attendances">
+                <form string="Employee attendances" version="7.0">
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
@@ -90,7 +90,7 @@
             <field name="model">hr.action.reason</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Define attendance reason">
+                <form string="Define attendance reason" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="action_type"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 660cdbc81cd..a5015fe4fe5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -7,13 +7,15 @@
             <field name="model">hr.attendance.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Attendance Report Monthly">
-                <field name="month"/>
-                <field name="year"/>
-                <newline/>
-                <separator colspan="4"/>
-                <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
+            <form string="Print Attendance Report Monthly" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                </header>
+                <group col="4">
+                    <field name="month"/>
+                    <field name="year"/>
+                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 8f943d7d1da..a9557fa2962 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -7,16 +7,17 @@
             <field name="model">hr.attendance.error</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Attendance Report Error">
-                <separator string="Analysis Information" colspan="4"/>
-                <field name="init_date"/>
-                <field name="end_date"/>
-                <field name="max_delay"/>
+            <form string="Print Attendance Report Error" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object" icon="gtk-print" colspan="2"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel' colspan="2"/>
+                </header>
+                <group string="Analysis Information" col="4">
+                    <field name="init_date"/>
+                    <field name="end_date"/>
+                    <field name="max_delay"/>
+                </group>
                 <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
-                <newline/>
-                <separator colspan="4"/>
-                <button special="cancel"  string="Cancel" icon='gtk-cancel' colspan="2"/>
-                <button name="print_report" string="Print" type="object" icon="gtk-print" colspan="2"/>
             </form>
             </field>
         </record>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index a215e04a3bf..710c33f12b9 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -25,7 +25,7 @@
             <field name="model">hr_evaluation.plan</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal Plan">
+                <form string="Appraisal Plan" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -71,7 +71,7 @@
             <field name="model">hr_evaluation.plan.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal Plan Phases">
+                <form string="Appraisal Plan Phases" version="7.0">
                  <notebook>
                    <page string="General">
                     <group>
@@ -146,7 +146,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal">
+                <form string="Appraisal" version="7.0">
                 <header>
                     <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
                     <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
@@ -170,7 +170,7 @@
                     <notebook>
                         <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
                             <field name="survey_request_ids">
-                                <form string="Interview Appraisal">
+                                <form string="Interview Appraisal" version="7.0">
                                     <group col="4">
                                         <field name="survey_id"/>
                                         <div colspan="2">
@@ -273,7 +273,7 @@
             <field name="model">hr.evaluation.interview</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Interview Appraisal">
+                <form string="Interview Appraisal" version="7.0">
                     <header>
                         <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 1bae791dca1..2b16e494c74 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -2,24 +2,22 @@
 <openerp>
     <data>
 
-	<record id="view_hr_evaluation_send_mail" model="ir.ui.view">
+    <record id="view_hr_evaluation_send_mail" model="ir.ui.view">
         <field name="name">hr.evaluation.send.mail</field>
         <field name="model">hr.evaluation.reminder</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-			<form string="Evaluation Reminders">
-				<group width="340">
-				<separator string="Send Evaluation Reminder" colspan="4"/>
-				<field name="evaluation_id"/>
-				<separator colspan="4"/>
-					<group colspan="4">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-         	</form>
+            <form string="Evaluation Reminders" version="7.0">
+                <header>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+                </header>
+                <group string="Send Evaluation Reminder">
+                    <field name="evaluation_id"/>
+                </group>
+             </form>
         </field>
-	</record>
+    </record>
 
     <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
         <field name="name">Evaluation Send Mail</field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b8e699e278f..e57f20734eb 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -63,7 +63,7 @@
             <field name="type">form</field>
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
-                <form string="Expenses Sheet">
+                <form string="Expenses Sheet" version="7.0">
                 <header>
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
@@ -85,7 +85,7 @@
                     <notebook>
                         <page string="Description">
                             <field name="line_ids" context="{'currency_id': currency_id}">
-                                <form string="Expense Lines">
+                                <form string="Expense Lines" version="7.0">
                                     <group col="6" colspan="4">
                                         <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
                                         <field name="name" colspan="4"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f0f809922a7..5576025b7dd 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -63,7 +63,7 @@
             <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form layout="manual" version="7.0">
                 <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
@@ -112,7 +112,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Allocation Request">
+                <form string="Allocation Request" version="7.0">
                 <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
@@ -178,7 +178,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Leaves Management">
+                <form string="Leaves Management" version="7.0">
                     <header>
                         <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                         <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
@@ -369,7 +369,7 @@
             <field name="model">hr.holidays.status</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Leave Type">
+                <form string="Leave Type" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="color_name"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index ba8b180ff9a..12cb3ceeb0d 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -2,24 +2,22 @@
 <openerp>
     <data>
 
-		<record id="view_hr_holidays_summary_dept" model="ir.ui.view">
+        <record id="view_hr_holidays_summary_dept" model="ir.ui.view">
             <field name="name">hr.holidays.summary.dept.form</field>
             <field name="model">hr.holidays.summary.dept</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Holidays by Department">
-			    <group col="4" colspan="6">
-				    <field name="date_from" />
-				    <newline/>
-				    <field name="holiday_type" colspan="4"/>
-				    <newline/>
-				    <field name="depts" colspan="4"/>
-					<separator colspan="4"/>
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="print_report" string="Print" type="object"/>
-				</group>
-			</form>
+            <form string="Holidays by Department" version="7.0">
+                <header>
+                    <button icon="gtk-print" name="print_report" string="Print" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                </header>
+                <group>
+                    <field name="date_from" />
+                    <field name="holiday_type"/>
+                    <field name="depts"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -32,14 +30,14 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
-		
-		<menuitem
-	        name="Leaves by Department"
-	        parent="menu_hr_leaves_reports"
-	        action="action_hr_holidays_summary_dept"
-	        id="menu_account_central_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
+        
+        <menuitem
+            name="Leaves by Department"
+            parent="menu_hr_leaves_reports"
+            action="action_hr_holidays_summary_dept"
+            id="menu_account_central_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 530d2a60351..d8a46ff4af4 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -2,25 +2,25 @@
 <openerp>
     <data>
 
-		<record id="view_hr_holidays_summary_employee" model="ir.ui.view">
+        <record id="view_hr_holidays_summary_employee" model="ir.ui.view">
             <field name="name">hr.holidays.summary.employee.form</field>
             <field name="model">hr.holidays.summary.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Employee's Holidays">
-			    <group col="4" colspan="6">
-				    <field name="date_from"/>
-				    <newline/>
-				    <field name="holiday_type"/>
-				    <newline/>
-				    <field name="emp" invisible="True"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-				</group>
-			</form>
+            <form string="Employee's Holidays">
+                <group col="4" colspan="6">
+                    <field name="date_from"/>
+                    <newline/>
+                    <field name="holiday_type"/>
+                    <newline/>
+                    <field name="emp" invisible="True"/>
+                </group>
+                <separator colspan="4"/>
+                <group col="2" colspan="4">
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -33,7 +33,7 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="hr_holidays_summary_employee_value">
+        <record model="ir.values" id="hr_holidays_summary_employee_value">
             <field name="model_id" ref="hr.model_hr_employee" />
             <field name="name">Employee's Holidays</field>
             <field name="key2">client_print_multi</field>
@@ -42,5 +42,5 @@
             <field name="model">hr.employee</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4d3a90aa554..75a74c88139 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -70,7 +70,7 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Jobs - Recruitment Form">
+            <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
                         states="open,pending"/>
@@ -378,7 +378,7 @@
         <field name="model">hr.recruitment.stage</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Stage">
+            <form string="Stage" version="7.0">
                 <group col="4" string="Stage Definition">
                     <field name="name"/>
                     <field name="department_id"/>
@@ -429,7 +429,7 @@
         <field name="model">hr.recruitment.degree</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Degree">
+            <form string="Degree" version="7.0">
                 <group>
                     <field name="name"/>
                     <field name="sequence"/>
@@ -471,7 +471,7 @@
         <field name="model">hr.recruitment.source</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Sources of Applicants">
+            <form string="Sources of Applicants" version="7.0">
                 <group>
                     <field name="name"/>
                 </group>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index c6920406576..c18ac4de667 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -57,7 +57,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" select="1"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>
@@ -160,7 +160,7 @@
             <field name="model">hr_timesheet_invoice.factor</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Type of invoicing">
+                <form string="Type of invoicing" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="customer_name"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 8aa2b07f927..663fc9b58de 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -7,27 +7,24 @@
             <field name="model">hr.timesheet.invoice.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Create Invoice">
-                <notebook colspan="4">
+            <form string="Create Invoice" version="7.0">
+                <header>
+                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                </header>
+                <notebook>
                     <page string="Billing Data">
-                       <group col="4" colspan="4">
-                           <separator string="Do you want to show details of work in invoice?" colspan="4"/>
-                                <field name="date"/>
-                                <field name="time"/>
-                                <field name="name"/>
-                                <field name="price"/>
-                           </group>
-                        <group col="2" colspan="4">
-                            <separator string="Force to use a specific product" colspan="4"/>
-                            <field name="product"/>
-                        </group>
+                       <group string="Do you want to show details of work in invoice?">
+                           <field name="date"/>
+                           <field name="time"/>
+                           <field name="name"/>
+                           <field name="price"/>
+                       </group>
+                       <group  string="Force to use a specific product">
+                           <field name="product"/>
+                       </group>
                     </page>
                 </notebook>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
-                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index a4f11225a7e..cb658f46704 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -19,7 +19,7 @@
             <field name="model">hr_timesheet_sheet.sheet.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by Accounts">
+                <form string="Timesheet by Accounts" version="7.0">
                     <group col="4">
                         <field name="sheet_id"/>
                         <field name="name" groups="analytic.group_analytic_accounting"/>
@@ -62,7 +62,7 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet">
+                <form string="Timesheet" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
@@ -81,7 +81,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="department_id"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                         <field name="user_id" invisible="1"/>
                     </group>
                     <notebook>
@@ -122,7 +122,7 @@
                                     <field invisible="1" name="general_account_id"/>
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
-                                <form string="Timesheet Lines">
+                                <form string="Timesheet Lines" version="7.0">
                                     <field name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>
@@ -239,7 +239,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
                 <field name="date" position="after">
-                    <field name="sheet_id" select="1"/>
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
@@ -255,7 +255,7 @@
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
                 <field name="action" position="after">
-                    <field name="sheet_id" select="1" />
+                    <field name="sheet_id" />
                 </field>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 8c32cf924e7..90ffc938116 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -6,12 +6,12 @@
         <field name="model">hr.timesheet.current.open</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Timesheet">
-               <separator string="It will open your current timesheet" colspan="4" />
-               <group colspan="4" col="6">
+            <form string="My Timesheet" version="7.0">
+               <header>
                     <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
                     <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
-               </group>
+               </header>
+               <separator string="It will open your current timesheet"/>
            </form>
         </field>
     </record>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 3d2df613276..416056cfe7f 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -19,7 +19,7 @@
             <field name="model">idea.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Category of Ideas">
+                <form string="Category of Ideas" version="7.0">
                     <group>
                         <field name="name"/>
                     </group>
@@ -65,7 +65,7 @@
         <field name="model">idea.idea</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Idea">
+            <form string="Idea" version="7.0">
                 <header>
                     <button name="idea_open" string="Open" states="draft"/>
                     <button name="idea_close" string="Accept" states="open"/>
diff --git a/addons/import_base/i18n/sv.po b/addons/import_base/i18n/sv.po
new file mode 100644
index 00000000000..b42d17376c0
--- /dev/null
+++ b/addons/import_base/i18n/sv.po
@@ -0,0 +1,103 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-04 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "Import misslyckades på grund av oväntat fel"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "Startade på %s och avslutade på %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "Importen av dina data avslutades på %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"men misslyckades, till följd att inga data importerades för att hålla "
+"databasen konsistent\n"
+"  fel: \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr ""
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr ""
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Import"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "utan varning"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "med varning: %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " importerade fält: "
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
index 0ea8b15f286..215de9ba59c 100644
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -7,16 +7,12 @@
             <field name="model">google.import.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Google Data">
-                    <group colspan="4" col="4" width="300">
-                        <field name='name' nolabel='1'/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4">
-                        <group colspan="2"/>
-                        <group colspan="2">
-                            <button  icon="gtk-ok" special="cancel" string="_Ok"/>
-                        </group>        
+                <form string="Import Google Data" version="7.0">
+                    <header>
+                        <button  icon="gtk-ok" special="cancel" string="_Ok"/>
+                    </header>
+                    <group>
+                        <field name='name'/>
                     </group>
                 </form>
             </field>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 9fcd7302499..7df067a643b 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -20,7 +20,6 @@
                     </group>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="4">
-                        <group colspan="2" col="2"/>
                         <group colspan="2" col="2">
                             <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                             <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+"/>
@@ -43,7 +42,6 @@
                     </group>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="4">
-                        <group colspan="2" col="2"/>
                         <group colspan="2" col="2">
                             <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                             <button name="import_google" string="_Import Events" type="object" icon="terp-calendar"/>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index 1b5ac984223..c851fa0e559 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -7,7 +7,7 @@
             <field name="model">partner.vat.intra</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner VAT intra">
+                <form string="Partner VAT intra" version="7.0">
                     <header>
                         <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute"/>
                         <button name="preview" string="_Preview" type="object" icon="gtk-print"/>
@@ -39,7 +39,7 @@
             <field name="model">partner.vat.intra</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Save XML">
+                <form string="Save XML" version="7.0">
                     <header>
                         <button special="cancel" string="Close" icon="gtk-cancel" colspan="4"/>
                     </header>
diff --git a/addons/l10n_br/l10n_br_view.xml b/addons/l10n_br/l10n_br_view.xml
index 0a2955b81a3..65fcd0c401b 100644
--- a/addons/l10n_br/l10n_br_view.xml
+++ b/addons/l10n_br/l10n_br_view.xml
@@ -7,7 +7,7 @@
             <field name="model">l10n_br_account.cst.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Tax Situation Code Template">
+                <form string="Tax Situation Code Template" version="7.0">
                     <group col="4">
                         <field name="code"/>
                         <field name="name"/>
@@ -23,9 +23,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tax Situation Code Template">
-                    <field name="code" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="tax_code_template_id" select="2"/>
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="tax_code_template_id"/>
                 </tree>
             </field>
         </record>
@@ -44,7 +44,7 @@
             <field name="model">l10n_br_account.cst</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Tax Situation Code">
+                <form string="Tax Situation Code" version="7.0">
                     <group col="4">
                         <field name="code"/>
                         <field name="name"/>
@@ -60,9 +60,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tax Situation Code">
-                    <field name="code" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="tax_code_id" select="2"/>
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="tax_code_id"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index ec7ba5f29f7..6625aaef9cd 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -7,9 +7,9 @@
             <field name="model">bvr.import.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="BVR Import">
+                <form string="BVR Import" version="7.0">
                     <header>
-                        button name="import_bvr" string="Import" type="object" icon="gtk-ok"  colspan="2"/>
+                        <button name="import_bvr" string="Import" type="object" icon="gtk-ok" colspan="2"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
                     </header>
                     <group>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 9f9812f2499..005b491cc8f 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -7,7 +7,7 @@
             <field name="model">create.dta.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="DTA file creation - Results">
+                <form string="DTA file creation - Results" version="7.0">
                     <header>
                         <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index c78e3195088..1f059c69049 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <openerp>
     <data>
 
@@ -8,7 +7,7 @@
             <field name="model">account.bilan.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bilan Report">
+                <form string="Bilan Report" version="7.0">
                    <header>
                         <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index fa52eb6a663..58ad0d8333e 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.cdr.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string='Compte de resultat'>
+                <form string='Compte de resultat' version="7.0">
                     <header>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                         <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok"/>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index c45929da727..47e9a4ca3f7 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -6,7 +6,7 @@
             <field name="model">vat.declaration.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Print Tax Statements">
+                <form string="Print Tax Statements" version="7.0">
                    <header>
                         <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
index 186018e7cbc..fc9c5ba1e82 100644
--- a/addons/lunch/i18n/ja.po
+++ b/addons/lunch/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-25 02:30+0000\n"
+"PO-Revision-Date: 2012-06-08 02:44+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-05-26 05:07+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
@@ -306,8 +306,8 @@ msgid ""
 "by supplier. It will be easier for the lunch manager to filter lunch orders "
 "by categories."
 msgstr ""
-"従業員が昼食時間にオーダーできる全ての製品を定義して下さい。複数の場所で昼食をオーダーするなら、仕入先毎に分離した製品分類を使うことができます。これは昼食"
-"マネジャにとって分類別に昼食オーダーをフィルタすることを容易にします。"
+"従業員が昼食時間にオーダーできる全ての製品を定義します。複数の場所で昼食をオーダーするなら、仕入先毎に分離した製品分類を使うことができます。これは昼食マネ"
+"ジャにとって分類別に昼食オーダーをフィルタすることを容易にします。"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 42eb90311ea..47de833a66b 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -23,7 +23,7 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
@@ -105,7 +105,7 @@
             <field name="name">Cashboxes</field>
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
-                <form string="Cashboxes">
+                <form string="Cashboxes" version="7.0">
                     <field name="name"/>
                     <field name="manager"/>
                 </form>
@@ -145,7 +145,7 @@
             <field name="name">CashMove</field>
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
-                <form string="CashMove">
+                <form string="CashMove" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="user_cashmove"/>
@@ -219,7 +219,7 @@
             <field name="name"> Category of product </field>
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
-                <form string="Category">
+                <form string="Category" version="7.0">
                     <separator string="Category Related to Products" colspan="4"/>
                     <field name="name"/>
                 </form>
@@ -253,7 +253,7 @@
             <field name="type">form</field>
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
-                <form string="Products">
+                <form string="Products" version="7.0">
                      <group col="6">
                           <field name="name"/>
                           <field name="category_id"/>
@@ -349,7 +349,7 @@
             <field name="model">report.lunch.amount</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Box Amount by User">
+                <form string="Box Amount by User" version="7.0">
                     <group col="4">
                         <field name="user_id"/>
                         <field name="box"/>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 97219507eed..c7bf795aafc 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -9,7 +9,7 @@
             <field name="model">lunch.cashbox.clean</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reset cashbox">
+                <form string="Reset cashbox" version="7.0">
                     <header>
                         <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
                         <button  icon="gtk-cancel" special="cancel" string="No"/>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 69d3c4cc46d..1bc98f089cb 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -9,7 +9,7 @@
             <field name="model">lunch.order.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cancel Order">
+                <form string="Cancel Order" version="7.0">
                     <header>
                         <button  icon="gtk-ok" name="cancel" string="Yes" type="object"/>
                         <button  icon="gtk-cancel" special="cancel" string="No"/>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index c15023ee124..9cf41d4d333 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -9,7 +9,7 @@
             <field name="model">lunch.order.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Confirm">
+                <form string="Confirm" version="7.0">
                     <header>
                         <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
                         <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 7dc12d52e8f..1f7ec2297de 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -25,7 +25,7 @@
             <field name="type">form</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <form string="Message">
+                <form string="Message" version="7.0">
                     <group>
                         <group>
                             <field name="subject"/>
@@ -78,11 +78,11 @@
             <field name="model">mail.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Email message">
+                <form string="Email message" version="7.0">
                     <label for="subject" class="oe_form_readonly_hidden"/>
                     <h1><field name="subject"/></h1>
                     <label for="user_id"/>
-                    <h2><field name="user_id" class="or_form_inline" string="User"/> on <field name="date" class="or_form_inline"/></h2>
+                    <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
                     <group col="4">
                         <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
                         <field name="type"/>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 554f8085fb5..f8975d67b78 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -9,6 +9,12 @@
     background: white;
 }
 
+.openerp div.oe_mail_wall_act {
+    padding: 8px;
+    background: #eee;
+    border: 1px solid #ccc;
+}
+
 .openerp div.oe_mail_wall_act:after {
     content: "";
     display: block;
@@ -32,23 +38,38 @@
 }
 
 .openerp textarea.oe_mail_wall_action_textarea {
-    width: 550px;
+    width: 474px;
     height: 60px;
-    padding: 5px;
+    padding: 4px;
+    margin-bottom: 8px;
+    float: right;
 }
 
 .openerp div.oe_mail_wall_threads textarea {
-    height: 20px;
-    padding: 2px;
+    height: 40px;
+    padding: 4px;
 }
 
 .openerp div.oe_mail_thread_subthread img {
-    width: 30px;
-    height: 30px;
+    width: 28px;
+    height: 28px;
+}
+
+.openerp div.oe_mail_msg_content {
+    width: 486px;
+}
+
+.openerp div.oe_mail_msg_content p {
+    margin: 4px 0;
+}
+
+.openerp div.oe_mail_msg_content li{
+    float: left;
+    margin-right: 3px;
 }
 
 .openerp div.oe_mail_thread_subthread div.oe_mail_msg_content {
-    margin-left: 40px;
+    width: 440px;
 }
 
 .openerp div.oe_mail_wall_more {
@@ -74,10 +95,16 @@
     margin-bottom: 8px;
 }
 
+.openerp div.oe_mail_recthread_followers img.oe_mail_msg_image {
+    width: 28px;
+    height: 28px;
+    margin: 4px;
+}
+
 /* RecordThread: 2 columns view */
 .openerp div.oe_mail_recthread_left {
     float: left;
-    width: 55%;
+    width: 560px;
 }
 
 .openerp div.oe_mail_recthread_right {
@@ -127,8 +154,9 @@
 
 .openerp div.oe_mail_thread_act {
     white-space: normal;
-    margin-bottom: 5px;
-    padding: 4px;
+    padding: 8px;
+    background: #eee;
+    border-top: 1px solid #ccc
 }
 
 .openerp div.oe_mail_thread_act:after {
@@ -142,8 +170,11 @@
 }
 
 .openerp div.oe_mail_thread_subthread {
-    margin-top: 8px;
-    padding-left: 5%;
+    margin-left: 66px;
+}
+
+.openerp div.oe_mail_thread_subthread li.oe_mail_thread_msg:last-child {
+    margin-bottom: 8px;
 }
 
 .openerp div.oe_mail_thread_more {
@@ -151,10 +182,6 @@
     border-bottom: 1px solid #D2D9E7;
 }
 
-.openerp li.oe_mail_thread_msg {
-    padding: 1px;
-}
-
 .openerp li.oe_mail_thread_msg:after {
     content: "";
     display: block;
@@ -168,23 +195,20 @@
 }
 
 .openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
-    padding: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    -o-border-radius: 4px;
-    -ms-border-radius: 4px;
-    border-radius: 4px;
+    padding: 8px;
 }
 
-.openerp li.oe_mail_thread_msg > .oe_mail_msg_comment {
-    background: #eee;
+.openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email, .openerp .oe_mail_msg_notification {
+    background: white;
+    border-top: 1px solid #ccc
+}
+
+.openerp .oe_email_icon {
+    width: 50px;
+    height: 50px;
 }
 
 .openerp div.oe_mail_thread_subthread .oe_mail_msg_comment {
-    background: white;
-}
-
-.openerp .oe_mail_msg_notification {
     background: #eee;
 }
 
@@ -195,7 +219,7 @@
 }
 
 .openerp .oe_mail_msg_content {
-    margin-left: 60px;
+    float: left;
 }
 
 .openerp .oe_mail_msg_content:after {
@@ -205,16 +229,15 @@
 }
 
 .openerp img.oe_mail_msg_image {
-    margin-right: 8px;
-    width: 45px;
-    height: 45px;
+    width: 50px;
+    height: 50px;
     text-align: center;
     overflow: hidden;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    -o-border-radius: 4px;
-    -ms-border-radius: 4px;
-    border-radius: 4px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
     -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
     -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
@@ -222,14 +245,6 @@
     clip: rect(5px, 40px, 45px, 0px);
 }
 
-.openerp p.oe_mail_msg_p_email_header {
-    border-bottom: 1px solid #D2D9E7;
-}
-
-.openerp span.oe_mail_msg_body a.reduce, .openerp span.oe_mail_msg_body_short a.expand {
-    color: #4E43E7;
-}
-
 /* ------------------------------ */
 /* Styling (should be openerp)    */
 /* ------------------------------ */
@@ -241,11 +256,10 @@
 
 .openerp li.oe_mail {
     list-style-type: none;
-    margin-bottom: 2px;
 }
 
 .openerp input.oe_mail, textarea.oe_mail {
-    width: 100%;
+    width: 432px;
     padding: 4px;
     font-size: 12px;
     border: 1px solid #cccccc;
@@ -272,7 +286,7 @@
 
 .openerp p.oe_mail_msg {
     padding: 0;
-    margin: 0;
+    margin: 0 0 4px 0;
 }
 
 .openerp a.oe_mail_oe_intlink {
@@ -283,7 +297,7 @@
     font-weight: bold;
 }
 
-.openerp .oe_mail_oe_space {
-    margin-left: 15px;
-    margin-right: 4px;
-}
+/*.openerp .oe_mail_oe_space:after {*/
+    /*content: " · ";*/
+    /*margin-right: 2px;*/
+/*}*/
diff --git a/addons/mail/static/src/img/email_icon.png b/addons/mail/static/src/img/email_icon.png
old mode 100644
new mode 100755
index 6390d9e6e69..78c131c0ff2
Binary files a/addons/mail/static/src/img/email_icon.png and b/addons/mail/static/src/img/email_icon.png differ
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1ec6fe32eb5..905e95f3aef 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -535,13 +535,13 @@ openerp.mail = function(session) {
         display_subscribers: function (records) {
             var self = this;
             this.is_subscriber = false;
-            var sub_node = this.$element.find('div.oe_mail_recthread_followers')
-            sub_node.empty();
-            $('<h4/>').html('Followers (' + records.length + ')').appendTo(sub_node);
+            var user_list = this.$element.find('ul.oe_mail_followers_display').empty();
+            this.$element.find('div.oe_mail_recthread_followers h4').html('Followers (' + records.length + ')');
             _(records).each(function (record) {
                 if (record.id == self.session.uid) { self.is_subscriber = true; }
                 var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id);
-                $('<img class="oe_mail_oe_left oe_mail_msg_image" src="' + mini_url + '" title="' + record.name + '" alt="' + record.name + '"/>').appendTo(sub_node);
+                $('<li><img class="oe_mail_oe_left oe_mail_msg_image" src="' + mini_url + '"/>' +
+                  '<a href="#" class="intlink oe_mail_oe_intlink" data-res-model="res.users" data-res-id="' + record.id + '">' + record.name + '</a></li>').appendTo(user_list);
             });
             if (self.is_subscriber) {
                 self.$element.find('button.oe_mail_button_follow').hide();
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 874cd406852..a34e362960b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -10,6 +10,7 @@
         </table>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
+                <img class="oe_mail_msg_image oe_left" alt="User img"/>
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
@@ -38,8 +39,7 @@
             </div>
             <div class="oe_mail_recthread_followers">
                 <h4>Followers</h4>
-                <div class="oe_mail_followers_display">
-                </div>
+                <ul class="oe_mail_followers_display"></ul>
             </div>
         </div>
     </div>
@@ -48,7 +48,7 @@
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
-                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
+                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
             </div>
         </div>
         <div class="oe_mail_thread_display"></div>
@@ -59,7 +59,8 @@
 
     <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
+            <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
+            <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
                 <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
@@ -74,19 +75,27 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-            <br />
-            <span class="oe_mail_oe_fade">
-                <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
-                on <t t-raw="record.date"/>
-            </span>
-            <t t-if="display['show_reply']"><a href="#" class="oe_mail_oe_space oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
-            <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
-            </t>
-            <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></t>
-            </t>
+            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t><br/>
+            <ul>
+              <t t-if="display['show_reply']">
+                <li><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+              </t>
+              <t t-if="display['show_delete']">
+                <t t-if="thread._is_author(record.user_id[0])">
+                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+                </t>
+              </t>
+              <t t-if="display['show_hide']">
+                <t t-if="!(thread._is_author(record.user_id[0]))">
+                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+                </t>
+              </t>
+              <li>
+                <span class="oe_fade"><t t-raw="record.date"/>
+                  by <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                </span>
+              </li>
+            </ul>
         </p>
     </t>
     
@@ -95,22 +104,29 @@
             <t t-if="params.thread_level > 0">
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
-            <br />
-            <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
-            <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
-            <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
         </p>
+        <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
+        <p><span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/></p>
         <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-            <br />
-            <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
-            </t>
-            <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
-            </t>
         </p>
+
+        <ul>
+          <t t-if="display['show_delete']">
+            <t t-if="thread._is_author(record.user_id[0])">
+              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+            </t>
+          </t>
+          <t t-if="display['show_hide']">
+            <t t-if="!(thread._is_author(record.user_id[0]))">
+              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
+            </t>
+          </t>
+          <li>
+            <span class="oe_fade"><t t-raw="record.date"/></span>
+          </li>
+        </ul>
     </t>
 
 </template>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 6c9ec73d1de..c51818f13f5 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">marketing.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Marketing">
+                <form string="Configure Marketing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/marketing_campaign/i18n/ja.po b/addons/marketing_campaign/i18n/ja.po
index be2f9543108..cab3e3de304 100644
--- a/addons/marketing_campaign/i18n/ja.po
+++ b/addons/marketing_campaign/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-26 21:33+0000\n"
+"PO-Revision-Date: 2012-06-08 02:46+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-05-27 04:39+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -62,7 +62,7 @@ msgid ""
 "Set an expected revenue if you consider that every campaign item that has "
 "reached this point has generated a certain revenue. You can get revenue "
 "statistics in the Reporting section"
-msgstr "全てのキャンペーン項目が生成するであろう、期待される売上を設定して下さい。売上統計はレポートセクションで取得できます。"
+msgstr "全てのキャンペーン項目が生成するであろう、期待される売上を設定します。売上統計はレポートセクションで取得できます。"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,trigger:0
@@ -421,7 +421,7 @@ msgid ""
 "Set a variable cost if you consider that every campaign item that has "
 "reached this point has entailed a certain cost. You can get cost statistics "
 "in the Reporting section"
-msgstr "全てのキャンペーン項目が必要とするであろう、変動経費を設定して下さい。経費統計はレポートセクションで取得できます。"
+msgstr "全てのキャンペーン項目が必要とするであろう、変動経費を設定します。経費統計はレポートセクションで取得できます。"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -506,8 +506,8 @@ msgid ""
 "for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
 "views."
 msgstr ""
-"生成された作業項目はパートナに関連したレコードとリンクされます。レコードがパートナ自身である場合、この項目を空のままとして下さい。これは、キャンペーンの分"
-"析やキャンペーンのフォローアップビューを介して、レポート目的のために役立ちます。"
+"生成された作業項目はパートナに関連したレコードとリンクされます。レコードがパートナ自身である場合、この項目を空のままとします。これは、キャンペーンの分析や"
+"キャンペーンのフォローアップビューを介して、レポート目的のために役立ちます。"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -578,9 +578,9 @@ msgid ""
 "records which have the same value for the unique field as other records that "
 "already entered the campaign."
 msgstr ""
-"キャンペーンに入れる新しいレコードの選択時に、フィルタに追加する追加基準を決定して下さい。重複なしは既に以前のキャンペーンに入れたレコードを選択するのを避"
-"けます。キャンペーンが固有項目セットと重複なしである場合、固有項目であるために同じ値を持つれレコードや既にキャンペーンで入力されたレコードを選択するのを避"
-"けます。"
+"キャンペーンに入れる新しいレコードの選択時に、フィルタに追加する追加基準を決定します。重複なしは既に以前のキャンペーンに入れたレコードを選択するのを避けま"
+"す。キャンペーンが固有項目セットと重複なしである場合、固有項目であるために同じ値を持つれレコードや既にキャンペーンで入力されたレコードを選択するのを避けま"
+"す。"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 8cb3dabe3ef..0a88c718f8a 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -15,7 +15,7 @@
         <field name="model">marketing.campaign</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form>
+            <form version="7.0">
             <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Done" states="running"/>
@@ -133,7 +133,7 @@
         <field name="model">marketing.campaign.segment</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form layout="manual" version="7.0">
             <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Close" states="running"/>
@@ -240,7 +240,7 @@
         <field name="model">marketing.campaign.activity</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Activities">
+            <form string="Activities" version="7.0">
                 <group>
                     <group string="Activity">
                         <field name="name"/>
@@ -275,7 +275,7 @@
                         <field name="interval_nbr"/>
                         <field name="interval_type"/>
                     </tree>
-                    <form string="Incoming Transitions">
+                    <form string="Incoming Transitions" version="7.0">
                         <group col="4">
                             <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                             <field name='trigger'/>
@@ -291,7 +291,7 @@
                         <field name="interval_nbr"/>
                         <field name="interval_type"/>
                     </tree>
-                    <form string="Outgoing Transitions">
+                    <form string="Outgoing Transitions" version="7.0">
                         <group col="4">
                             <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                             <field name='trigger'/>
@@ -352,7 +352,7 @@
         <field name="model">marketing.campaign.workitem</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Marketing Campaign Activities">
+            <form string="Marketing Campaign Activities" version="7.0">
             <header>
                 <button string="Process" states="todo" name="process" type="object"/>
                 <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
index 82790ae2d4c..d32ca79deee 100644
--- a/addons/membership/i18n/ja.po
+++ b/addons/membership/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-29 01:29+0000\n"
+"PO-Revision-Date: 2012-06-07 17:00+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-05-30 05:21+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
+"X-Launchpad-Export-Date: 2012-06-08 04:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -466,7 +466,7 @@ msgstr "月"
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr "グル―化…"
+msgstr "グル―プ化…"
 
 #. module: membership
 #: code:addons/membership/membership.py:411
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index dedecf1e9dc..e29ef87f141 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -7,14 +7,14 @@
             <field name="model">membership.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Membership Invoice">
-                	<group colspan="4" >
-                     	<field name="product_id" colspan="4" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
-                        <field name="member_price" colspan="4" />
-                    </group>
-                    <group colspan="4" col="6">
+                <form string="Membership Invoice" version="7.0">
+                    <header>
+                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
                         <button  icon="gtk-close" special="cancel" string="Close"/>
-           	            <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
+                    </header>
+                    <group>
+                        <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
+                        <field name="member_price"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index c3cc21ce893..49ec0f44909 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -6,7 +6,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing board" layout="manual">
+                <form string="Manufacturing board" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index f5f06518565..bb342ccde41 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -10,7 +10,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <field name="manufacturing_lead"/>
+                    <group>
+                        <field name="manufacturing_lead"/>
+                    </group>
                 </page>
             </field>
         </record>
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index b4316fe0196..c9c0ebfc882 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-06-02 04:49+0000\n"
+"PO-Revision-Date: 2012-06-08 02:52+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-06-03 04:47+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:38+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -112,7 +112,7 @@ msgstr "部品表の検索"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr "在庫可能製品と消耗品"
+msgstr "在庫可能製品と売り切り品"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
@@ -142,7 +142,7 @@ msgstr "完成した製品"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr "現在生産中の製造オーダー"
+msgstr "現在製造中の製造オーダー"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -206,7 +206,7 @@ msgstr "製品数量"
 msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
-msgstr "分析会計の中で生産コストを簡単に追跡するためのこの製品を満たして下さい。"
+msgstr "分析会計の中で製造コストを簡単に追跡するため、この製品を埋めて下さい。"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -223,7 +223,7 @@ msgstr "改訂"
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
-msgstr "購入または販売した全ての製品フォームを作成して下さい。製品を購入することがでできる場合、仕入先を指定して下さい。"
+msgstr "購入または販売する全ての製品フォームを作成して下さい。製品を仕入れることができる場合、仕入先を指定して下さい。"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -362,21 +362,21 @@ msgstr "時間数"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr "生産確認"
+msgstr "製造確認"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
 msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
-msgstr "システムは販売数量そして製品のパラメータに応じてオーダー（生産または仕入）を作成します。"
+msgstr "システムは販売数量そして製品のパラメータに応じてオーダー（製造または仕入）を作成します。"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
 msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
-msgstr "製品の供給方法が生産である場合は、システムは生産オーダーを作成します。"
+msgstr "製品の供給方法が製造である場合は、システムは製造オーダーを作成します。"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -388,7 +388,7 @@ msgid ""
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
 "同じ製品で異なった構築方法を持つ場合、OpenERPの属性は製品製造のための正しい部品表を選択するのに使用されます。それぞれの部品表には幾つかの属性を割り"
-"当てることができます。販売員が販売オーダーを作成した時、彼はそれを幾つかの属性に関連付けることができ、そして、OpenERPは要求によって使用する部品表を"
+"当てることができます。販売員が受注オーダーを作成した時、彼はそれを幾つかの属性に関連付けることができ、そして、OpenERPは要求によって使用する部品表を"
 "自動的に選択します。"
 
 #. module: mrp
@@ -396,7 +396,7 @@ msgstr ""
 msgid ""
 "This is the Internal Picking List that brings the finished product to the "
 "production plan"
-msgstr "これは生産計画のために完成した製品を持ってくる内部の集荷リストです。"
+msgstr "これは製造計画のために完成した製品を持ってくる内部の集荷リストです。"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -522,7 +522,7 @@ msgstr "生産する製品"
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr "生産場所"
+msgstr "製造場所"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -557,7 +557,7 @@ msgstr "製品部品表構成"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr "生産の検索"
+msgstr "製造の検索"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -569,7 +569,7 @@ msgstr "単位当りの仕入価格"
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
-msgstr "作業センタの経路のリストを表示する時の順序を与えて下さい。"
+msgstr "作業センタの経路のリストを表示する時の順序を与えます。"
 
 #. module: mrp
 #: constraint:stock.move:0
@@ -669,7 +669,7 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
-"完成した製品を生産するための操作のリスト（作業センタのリスト）。経路は操作の間の作業センタのコストを計算し、生産計画化を基本とする作業センタの将来の負荷を"
+"完成した製品を製造するための操作のリスト（作業センタのリスト）。経路は操作の間の作業センタのコストを計算し、製造計画化を基本とする作業センタの将来の負荷を"
 "計画するために主に利用されます。"
 
 #. module: mrp
@@ -685,7 +685,7 @@ msgstr "部品表のライン製品は部品表製品と同じではいけませ
 #. module: mrp
 #: view:mrp.production:0
 msgid "In Production"
-msgstr "生産中"
+msgstr "製造中"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
@@ -742,7 +742,7 @@ msgstr "無効なアクションです。"
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
-msgstr "0.9の数は生産過程の中での10％の損失を意味します。"
+msgstr "0.9の数は製造過程の中での10％の損失を意味します。"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:734
@@ -784,7 +784,8 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
-"サービス提供のための選択された方法に応じて、調達オーダーは下請け仕入のための見積依頼を作成するか、またはサービスが完了（製品の配達）するまで待ちます。"
+"サービス提供のための選択された方法に応じて、調達オーダーは下請け発注オーダーのための見積依頼を作成するか、またはサービスが完了（製品の配達）するまで待ちま"
+"す。"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -995,13 +996,13 @@ msgstr "部品表名"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Start Production"
-msgstr "生産の開始"
+msgstr "製造の開始"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr "生産のダッシュボード"
+msgstr "製造のダッシュボード"
 
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
@@ -1169,7 +1170,7 @@ msgstr "注記"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr "生産開始準備ができた製造オーダーです。"
+msgstr "製造開始準備ができた製造オーダーです。"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1201,7 +1202,7 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
-"経路は全ての作業センタが長さとサイクルがどのくらい使われるかを示します。経路が示される場合、生産オーダー（作業センタ）の第３のタブは自動的に事前完了します"
+"経路は全ての作業センタが長さとサイクルがどのくらい使われるかを示します。経路が示される場合、製造オーダー（作業センタ）の第３のタブは自動的に事前完了します"
 "。"
 
 #. module: mrp
@@ -1252,7 +1253,7 @@ msgstr "製造オーダー %s は %s に予定されています。"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr "s生産オーダー番号："
+msgstr "製造オーダー番号："
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:647
@@ -1263,7 +1264,7 @@ msgstr "製造オーダー %s は生産する準備ができています。"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr "生産予定済製品"
+msgstr "製造予定済製品"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:204
@@ -1308,14 +1309,14 @@ msgid ""
 "production steps or define a single multi-level bill of materials."
 msgstr ""
 "マスター部品表は完成品を作るために使用される必要な原材料のリストを作成し管理します。OpenERPは製品のニーズに応じて製造オーダーを自動的に提案するため"
-"にそれらの部品表を使用します。特定の生産手順の定義や、単一の多層部品表の定義のために部品表を作成できます。"
+"にそれらの部品表を使用します。特定の製造手順の定義や、単一の多層部品表の定義のために部品表を作成できます。"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
-msgstr "製品の供給方法が購入の場合、システムは仕入オーダーを作成します。"
+msgstr "製品の供給方法が購入の場合、システムは発注オーダーを作成します。"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1337,12 +1338,12 @@ msgstr "構成部品仕入先"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr "生産作業センタ"
+msgstr "製造作業センタ"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Split in production lots"
-msgstr "生産ロットに分割"
+msgstr "製造ロットに分割"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -1410,7 +1411,7 @@ msgstr "部品表の改訂"
 #: help:mrp.production,origin:0
 msgid ""
 "Reference of the document that generated this production order request."
-msgstr "この生産オーダー要求を生成したドキュメントへの参照"
+msgstr "この製造オーダー要求を生成したドキュメントへの参照"
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1529,7 +1530,7 @@ msgstr "消費製品"
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr "生産"
+msgstr "製造"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
@@ -1554,7 +1555,7 @@ msgstr "作業センタの説明。この作業センタは何がサイクルで
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
-msgstr "生産製品"
+msgstr "製造製品"
 
 #. module: mrp
 #: field:mrp.production,date_finished:0
@@ -1590,7 +1591,7 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
-"完成した製品を生産するための操作のリスト（作業センタのリスト）。経路は操作の間の作業センタのコストを計算し、生産計画化を基本とする作業センタの将来の負荷を"
+"完成した製品を製造するための操作のリスト（作業センタのリスト）。経路は操作の間の作業センタのコストを計算し、製造計画化を基本とする作業センタの将来の負荷を"
 "計画するために主に利用されます。"
 
 #. module: mrp
@@ -1606,7 +1607,7 @@ msgstr "属性の分類"
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr "作業オーダーリストの表示の際には並びの順序を与えて下さい。"
+msgstr "作業オーダーリストの表示の際には並びの順序を与えます。"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1622,7 +1623,7 @@ msgstr "予定済製品"
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr "生産製品の消費"
+msgstr "製造製品の消費"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
@@ -1644,7 +1645,7 @@ msgid ""
 "ordered quantities are produced."
 msgstr ""
 "消費のみモードでは、製品は選択した量だけを消費します。\n"
-"消費と生産モードでは、製品を選択した数量生産すると同様に消費もされます。そして合計注文量が生産された時に生産オーダーが終わります。"
+"消費と生産モードでは、製品を選択した数量製造すると同様に消費もされます。そして合計注文量が製造された時に製造オーダーが終わります。"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1718,7 +1719,7 @@ msgstr "サイクル当りの時間（時）"
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr "生産オーダー"
+msgstr "製造オーダー"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
@@ -1833,8 +1834,8 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
-"サブ製品が複数の製品の中で使われている場合、それ自身の部品表を作成すると便利です。このサブ製品のために分離された生産オーダーを望まない場合、部品表タイプに"
-"設定 / 模型を選択して下さい。模型部品表が根幹の製品に使われる場合、生産される代わりに構成部品のセットとして販売され、出荷されます。"
+"サブ製品が複数の製品の中で使われている場合、それ自身の部品表を作成すると便利です。このサブ製品のために分離された製造オーダーを望まない場合、部品表タイプに"
+"設定 / 模型を選択します。模型部品表が根幹の製品に使われる場合、製造される代わりに構成部品のセットとして販売され、出荷されます。"
 
 #. module: mrp
 #: help:mrp.production,state:0
@@ -1847,12 +1848,12 @@ msgid ""
 " When the production gets started then the state is set to 'In Production'.\n"
 " When the production is over, the state is set to 'Done'."
 msgstr ""
-"生産オーダーが作成された時、状態はドラフトに設定されます。\n"
+"製造オーダーが作成された時、状態はドラフトに設定されます。\n"
 "　オーダーが確認されると、状態は商品待ちに設定されます。\n"
 "　何か例外がある場合は、状態は集荷例外に設定されます。\n"
-"在庫が使用可能になった時に、状態は生産準備完了に設定されます。\n"
-"　生産が開始されると、状態は生産中に設定されます。\n"
-"　生産が終了すると、状態は完了に設定されます。"
+"在庫が使用可能になった時に、状態は製造準備完了に設定されます。\n"
+"　製造が開始されると、状態は製造中に設定されます。\n"
+"　製造が終了すると、状態は完了に設定されます。"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1908,7 +1909,7 @@ msgstr "丸めは製品数量に適用されます。"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr "生産または仕入オーダーから割り当てて下さい。"
+msgstr "製造または発注オーダーから割り当てます。"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -1941,7 +1942,7 @@ msgstr "在庫価値変動"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr "在庫から割り当てて下さい。"
+msgstr "在庫から割当"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1973,7 +1974,7 @@ msgstr "通常"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production started late"
-msgstr "生産が遅れて開始"
+msgstr "製造は遅れて開始"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
@@ -2014,8 +2015,7 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
-"構成部品の部品表はマスター部品表を作成するために使われる構成部品とサブ製品です。特定の構成部品が使われている部品表を検索するにはこのメニューを使って下さい"
-"。"
+"構成部品の部品表はマスター部品表を作成するために使われる構成部品とサブ製品です。特定の構成部品が使われている部品表を検索するにはこのメニューを使います。"
 
 #. module: mrp
 #: model:product.uom,name:mrp.product_uom_litre
@@ -2035,7 +2035,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr "製品タイプは在庫可能または消費可能です。"
+msgstr "製品タイプは在庫可能または売り切り品です。"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:603
@@ -2048,7 +2048,7 @@ msgstr "エラー"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Production Started"
-msgstr "生産開始済"
+msgstr "製造開始済"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
@@ -2083,7 +2083,7 @@ msgstr "一般情報"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr "生産"
+msgstr "製造"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2104,12 +2104,12 @@ msgstr "予定日"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "この製品に生産ロットを割り当てて下さい。"
+msgstr "この製品に製造ロットを割り当てる必要があります。"
 
 #. module: mrp
 #: field:stock.move,production_id:0
 msgid "Production"
-msgstr "生産"
+msgstr "製造"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
@@ -2135,7 +2135,7 @@ msgstr "製品価格"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr "生産ロットに分割"
+msgstr "製造ロットに分割"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2184,7 +2184,7 @@ msgstr "製造"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr "次の生産オーダー"
+msgstr "次の製造オーダー"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
@@ -2197,7 +2197,7 @@ msgstr "属性グループ"
 msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
-msgstr "在庫可能製品の供給をするために選択された方法にしたがって、調達オーダーは見積依頼や生産オーダーなどを作成します。 "
+msgstr "在庫可能製品の供給をするために選択された方法にしたがって、調達オーダーは見積依頼や製造オーダーなどを作成します。 "
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:874
@@ -2231,7 +2231,7 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
-"原料を供給するために（仕入または生産される）、生産オーダーはMRPスケジューラを実行することを通して、部品表にリストされている構成部品と同様の調達オーダー"
+"原料を供給するために（仕入または製造される）、製造オーダーはMRPスケジューラを実行することを通して、部品表にリストされている構成部品と同様の調達オーダー"
 "を作成します。"
 
 #. module: mrp
@@ -2239,7 +2239,7 @@ msgstr ""
 msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
-msgstr "生産あるいは購入する製品の数量を指定して下さい。コスト構造のレポートはこの数量を元にして表示されます。"
+msgstr "製造あるいは購入する製品の数量を指定します。コスト構造のレポートはこの数量を元にして表示されます。"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -2262,7 +2262,7 @@ msgstr "リソースの休暇"
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr "部品表のリストを表示する際には並び順を与えて下さい。"
+msgstr "部品表のリストを表示する際には並び順を与えます。"
 
 #. module: mrp
 #: view:mrp.production:0
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6d27eec1e66..b2ace70fc08 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -23,11 +23,11 @@
             <field name="model">mrp.property.group</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Properties categories">
-                    <separator colspan="4" string="Property Group"/>
-                    <field colspan="4" name="name" select="1" nolabel="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="Properties categories" version="7.0">
+                    <label for="name"/>
+                    <field name="name"/>
+                    <label name="description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -63,12 +63,14 @@
             <field name="model">mrp.property</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Properties">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="group_id" select="1"/>
-                    <field name="composition" select="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="Properties" version="7.0">
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                        <field name="group_id"/>
+                        <field name="composition"/>
+                    </group>
+                    <label for="description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -140,37 +142,37 @@
             <field name="model">mrp.workcenter</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Work Center">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
+                <form string="Work Center" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
                         <field name="active"/>
                         <field name="resource_type"/>
                         <field name="calendar_id" widget="selection"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="General Information">
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Capacity Information"/>
-                            <field name="time_efficiency"/>
-                            <field name="capacity_per_cycle"/>
-                            <field name="time_cycle" widget="float_time"/>
-                            <field name="time_start" widget="float_time"/>
-                            <field name="time_stop" widget="float_time"/>
+                            <group>
+                                <group string="Capacity Information">
+                                    <field name="time_efficiency"/>
+                                    <field name="capacity_per_cycle"/>
+                                    <field name="time_cycle" widget="float_time"/>
+                                    <field name="time_start" widget="float_time"/>
+                                    <field name="time_stop" widget="float_time"/>
+                                </group>
+                                <group string="Costing Information">
+                                    <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                    <field name="costs_hour"/>
+                                    <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_cycle"/>
+                                    <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                    <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
+                                </group>
                             </group>
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Costing Information"/>
-                            <field name="product_id" on_change="on_change_product_cost(product_id)"/>
-                            <field name="costs_hour"/>
-                            <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_cycle"/>
-                            <field name="costs_cycle_account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_journal_id" attrs="{'required':['|',('costs_hour_account_id', '=', True),('costs_cycle_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                            <field name="costs_general_account_id" attrs="{ 'required':['|',('costs_cycle_account_id', '=', True),('costs_hour_account_id', '=', True)]}" groups="analytic.group_analytic_accounting"/>
-                            </group>
-                            <separator colspan="4" string="Description"/>
-                            <field colspan="4" name="note" nolabel="1"/>
+                            <label for="note"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -227,16 +229,17 @@
             <field name="model">mrp.routing.workcenter</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Routing Work Centers">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="sequence" select="1"/>
-                    <field name="workcenter_id"/>
-                    <field name="cycle_nbr"/>
-                    <field name="hour_nbr" widget="float_time"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="note" nolabel="1"/>
+                <form string="Routing Work Centers" version="7.0">
+                    <group col="4" string="General Information">
+                        <field colspan="4" name="name"/>
+                        <field name="sequence"/>
+                        <field name="workcenter_id"/>
+                        <field name="cycle_nbr"/>
+                        <field name="hour_nbr" widget="float_time"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <label for="note"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -246,20 +249,20 @@
             <field name="model">mrp.routing</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Routing">
-                    <group colspan="4" col="6">
+                <form string="Routing" version="7.0">
+                    <group col="4">
                         <field name="name"/>
                         <field name="code"/>
                         <field name="active"/>
                         <field name="location_id"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Work Center Operations">
-                           <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
+                           <field name="workcenter_lines"/>
                         </page>
                         <page string="Notes">
-                           <field colspan="4" name="note" nolabel="1"/>
+                           <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -317,99 +320,59 @@
             <field name="model">mrp.bom</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bill of Material">
-                    <group colspan="4" col="6">
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1" string="Reference"/>
-                        <newline/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
+                <form string="Bill of Material" version="7.0">
+                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
+                        <field name="product_qty" class="oe_form_inline"/>
+                        <field name="product_uom" class="oe_form_inline"/>
+                    </h1>
+                    <label for="routing_id" class="oe_form_readonly_hidden"/>
+                    <h2>
                         <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                        <newline/>
-                        <field name="product_uos_qty" groups="product.group_uos" />
-                        <field name="product_uos"  groups="product.group_uos"/>
-                        <newline/>
-                        <field name="type"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="code" string="Reference"/>
+                        </group>
+                        <group>
+                            <field name="type"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="product_uos_qty" groups="product.group_uos" />
+                            <field name="product_uos"  groups="product.group_uos"/>
+                        </group>
                     </group>
-                    <notebook colspan="4" >
+                    <notebook>
                         <page string="Components">
-                            <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
+                            <field name="bom_lines" widget="one2many_list">
                                 <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="name" invisible="1"/>
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
                                 </tree>
-                                <form string="Bill of Material">
-                                    <group colspan="4" col="6">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                                    <field name="name" select="1"/>
-                                    <field name="code" select="1" string="Reference"/>
-                                    <newline/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom"/>
-                                    <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                                    <newline/>
-                                    <field name="product_uos_qty" groups="product.group_uos" />
-                                    <field name="product_uos"  groups="product.group_uos"/>
-                                    <newline/>
-                                    <field name="type"/>
-                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                                </group>
-                                <group>
-                                <notebook colspan="4">
-                                    <page string="Components">
-                                        <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
-                                            <tree string="Components" editable="bottom">
-                                                <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                                                <field name="product_qty"/>
-                                                <field name="product_uom"/>
-                                                <field name="name" invisible="1"/>
-                                                <field name="date_start"/>
-                                                <field name="date_stop"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                                        <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
-                                    </page>
-                                    <page string="Properties" groups="product.group_mrp_properties">
-                                        <field name="position"/>
-                                        <field name="active"/>
-                                        <field name="sequence"/>
-                                        <field name="bom_id"/>
-
-                                        <field name="date_start"/>
-                                        <field name="date_stop"/>
-                                        <field name="product_rounding"/>
-                                        <field name="product_efficiency"/>
-                                        <field colspan="4" name="property_ids" nolabel="2"/>
-                                    </page>
-                                </notebook>
-                                </group>
-                            </form>
                             </field>
                         </page>
                         <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                            <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
+                            <field name="revision_ids"/>
                         </page>
                         <page string="Properties" groups="product.group_mrp_properties">
-                            <field name="position"/>
-                            <field name="active"/>
-                            <field name="sequence"/>
-                            <field name="bom_id"/>
+                            <group col="4">
+                                <field name="position"/>
+                                <field name="active"/>
+                                <field name="sequence"/>
+                                <field name="bom_id"/>
 
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                            <field name="product_rounding"/>
-                            <field name="product_efficiency"/>
-                            <separator string="Properties" colspan="4"/>
-                            <newline/>
-                            <field colspan="4" name="property_ids" nolabel="1"/>
+                                <field name="date_start"/>
+                                <field name="date_stop"/>
+                                <field name="product_rounding"/>
+                                <field name="product_efficiency"/>
+                            </group>
+                            <separator string="Properties"/>
+                            <field name="property_ids"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -552,13 +515,15 @@
             <field name="model">mrp.bom.revision</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="BoM Revisions">
-                    <field colspan="4" name="name"/>
-                    <field colspan="1" name="indice"/>
-                    <field colspan="1" name="date"/>
-                    <field name="author_id" readonly="1"/>
-                    <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="BoM Revisions" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="indice"/>
+                        <field name="date"/>
+                        <field name="author_id" readonly="1"/>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -631,7 +596,7 @@
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Manufacturing Orders" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Confirm Production"/>
                     <button name="button_produce" states="ready" string="Start Production"/>
@@ -642,61 +607,66 @@
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Manufacturing Orders" layout="auto">
-                    <group colspan="4" col="7">
-                        <field name="name" string="Reference"/>
-                        <field name="date_planned"/>
-                        <field name="origin"/>
-                        <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]"/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
+                <sheet>
+                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_form_inline"/>
+                        <field name="product_qty" class="oe_form_inline"/>
+                        <field name="product_uom" class="oe_form_inline"/>
                         <button type="action"
-                            icon="terp-accessories-archiver+"
+                            icon="terp-accessories-archiver+" class="oe_form_inline"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
+                    </h1>
+                    <label for="routing_id"  groups="mrp.group_mrp_routings"  class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="date_planned"/>
+                            <field name="origin"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="product_uos_qty" groups="product.group_uos"/>
+                            <field name="product_uos" groups="product.group_uos"/>
+                        </group>
                     </group>
-                    <group colspan="4" col="4">
-                        <label string="" colspan="2"/>
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-                        <field name="user_id"/>
-                    </group>
-
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Consumed Products">
-                            <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                            <field name="routing_id" groups="mrp.group_mrp_routings" select="1"/>
-                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                            <separator string="" colspan="4"/>
-
-                            <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
-                                mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
-                                <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
-                                    <field name="product_id" />
-                                    <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="Unit of Measure"/>
-                                    <field name="location_id"  string="Source Loc."/>
-                                    <field name="state" invisible="1"/>
-                                    <button name="%(stock.move_consume)d"
-                                        string="Consume Products" type="action"
-                                        icon="gtk-go-forward" context="{'consume': True}"
-                                        states="draft,waiting,confirmed,assigned" />
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in Serial Numbers"
-                                           type="action" icon="gtk-justify-fill"
-                                           states="draft,waiting,confirmed,assigned" />
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                </tree>
-                            </field>
-
-                            <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                                       widget="one2many_list" mode="tree,form" height="275">
+                            <group col="4">
+                                <group>
+                                    <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                                    <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                </group>
+                                <group>
+                                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                                </group>
+                                <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                                    <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                        <field name="product_id" />
+                                        <field name="product_qty"  string="Qty"/>
+                                        <field name="product_uom"  string="Unit of Measure"/>
+                                        <field name="location_id"  string="Source Loc."/>
+                                        <field name="state" invisible="1"/>
+                                        <button name="%(stock.move_consume)d"
+                                            string="Consume Products" type="action"
+                                            icon="gtk-go-forward" context="{'consume': True}"
+                                            states="draft,waiting,confirmed,assigned" />
+                                        <button
+                                               name="%(stock.track_line)d"
+                                               string="Split in Serial Numbers"
+                                               type="action" icon="gtk-justify-fill"
+                                               states="draft,waiting,confirmed,assigned" />
+                                        <button name="%(stock.move_scrap)d"
+                                            string="Scrap Products" type="action"
+                                            icon="gtk-convert" context="{'scrap': True}"
+                                            states="draft,waiting,confirmed,assigned"/>
+                                    </tree>
+                                </field>
+                                <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]">
                                    <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
@@ -710,11 +680,12 @@
                                            icon="gtk-convert"
                                            states="done,cancel"/>
                                    </tree>
-                               </field>
+                                </field>
+                            </group>
                         </page>
                         <page string="Finished Products">
-                            <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
-                                mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            <group>
+                            <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
@@ -730,37 +701,37 @@
                                         states="draft,waiting,confirmed,assigned" />
                                 </tree>
                             </field>
-
-                            <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                                       widget="one2many_list" mode="tree,form" height="275">
-                                   <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
-                                       <field name="product_id" readonly="1"/>
-                                       <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="Unit of Measure"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
-                                       <field name="prodlot_id" context="{'product_id': product_id}"/>
-                                       <field name="scrapped" invisible="1"/>
-                                       <field name="state" invisible="1"/>
-                                       <button name="%(stock.track_line)d"
-                                            string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
-                                       <button name="%(stock.move_scrap)d"
-                                           string="Scrap Products" type="action" icon="gtk-convert"
-                                           states="done,cancel" />
-                                   </tree>
-                               </field>
+                            <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]">
+                                <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
+                                    <field name="product_id" readonly="1"/>
+                                    <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_uom" readonly="1" string="Unit of Measure"/>
+                                    <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
+                                    <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                    <field name="scrapped" invisible="1"/>
+                                    <field name="state" invisible="1"/>
+                                    <button name="%(stock.track_line)d"
+                                         string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action" icon="gtk-convert"
+                                        states="done,cancel" />
+                                </tree>
+                            </field>
+                            </group>
                         </page>
                         <page string="Work Orders">
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
-                                icon="terp-stock_format-scientific"
-                                colspan="2" />
-                            <field colspan="4" name="workcenter_lines" nolabel="1">
-                                <form string="Production Work Centers">
-                                    <field colspan="4" name="name"/>
-                                    <field name="workcenter_id" widget="selection"/>
-                                    <field name="sequence"/>
-                                    <field name="cycle"/>
-                                    <field name="hour"/>
+                                icon="terp-stock_format-scientific"/>
+                            <field name="workcenter_lines">
+                                <form string="Production Work Centers" version="7.0">
+                                    <group col="4">
+                                        <field colspan="4" name="name"/>
+                                        <field name="workcenter_id" widget="selection"/>
+                                        <field name="sequence"/>
+                                        <field name="cycle"/>
+                                        <field name="hour"/>
+                                    </group>
                                 </form>
                                 <tree string="Production Work Centers">
                                     <field name="sequence"/>
@@ -774,24 +745,24 @@
                         <page string="Scheduled Products">
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
-                                icon="terp-stock_format-scientific"
-                                colspan="2" />
-                            <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
+                                icon="terp-stock_format-scientific"/>
+                            <field name="product_lines"/>
                         </page>
                         <page string="Extra Information">
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="priority"/>
-                            <newline/>
-                            <field name="date_start"/>
-                            <field name="date_finished"/>
-                            <field name="picking_id"/>
-                            <field name="move_prod_id"/>
+                            <group col="4">
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="priority"/>
+                                <field name="date_start"/>
+                                <field name="date_finished"/>
+                                <field name="picking_id"/>
+                                <field name="move_prod_id"/>
+                            </group>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -891,54 +862,21 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
-        
-        <!-- Where is object in py file?-->
-
-        <!--<record id="mrp_production_lot_form_view" model="ir.ui.view">-->
-        <!--    <field name="name">mrp.production.lot.line.form</field>-->
-        <!--    <field name="model">mrp.production.lot.line</field>-->
-        <!--    <field name="type">form</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <form string="Production Products">-->
-        <!--            <field colspan="4" name="move_id" on_change="onchange_lot_line_id(lot_id)"/>-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="product_id"/>-->
-        <!--            <field name="product_qty"/>-->
-        <!--            <field name="product_uom"/>-->
-        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
-        <!--            <field name="product_uos" groups="product.group_uos"/>-->
-        <!--            <field name="tracking_id"/>-->
-        <!--        </form>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!--<record id="mrp_production_lot_tree_view" model="ir.ui.view">-->
-        <!--    <field name="name">mrp.production.lot.line.tree</field>-->
-        <!--    <field name="model">mrp.production.lot.line</field>-->
-        <!--    <field name="type">tree</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <tree string="Production Products Consommation">-->
-        <!--            <field name="product_id"/>-->
-        <!--            <field name="product_qty"/>-->
-        <!--            <field name="product_uom"/>-->
-        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
-        <!--            <field name="product_uos" groups="product.group_uos"/>-->
-        <!--            <field name="tracking_id"/>-->
-        <!--        </tree>-->
-        <!--    </field>-->
-        <!--</record>-->
 
         <record id="mrp_production_product_form_view" model="ir.ui.view">
             <field name="name">mrp.production.product.line.form</field>
             <field name="model">mrp.production.product.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scheduled Products">
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="product_uos" groups="product.group_uos"/>
+                <form string="Scheduled Products" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="product_id"/>
+                        <field name="product_qty"/>
+                        <field name="product_uom"/>
+                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <field name="product_uos" groups="product.group_uos"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -968,10 +906,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/sheet/notebook/page/field[@name='move_id']" position="before">
+                <xpath expr="//field[@name='move_id']" position="before">
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
-                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="after">
+                <xpath expr="//field[@name='close_move']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
                     <separator colspan="4" string="Properties" />
                     <field colspan="4" name="property_ids" nolabel="1"/>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 251eafc89ea..fa68d1bdcff 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -63,9 +63,11 @@
             <field name="model">report.mrp.inout</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock value variation" type="bar">
-                    <field name="date" select="1"/>
-                    <field name="value" select="1"/>
+                <form string="Stock value variation" version="7.0">
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="value"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 258fe4f8356..26b833a8202 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -6,24 +6,26 @@
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing" layout="manual">
+                <form string="Configure Manufacturing" layout="manual" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
-                        <separator string="Manufacturing Order" colspan="4"/>
-                        <field name="module_mrp_operations"/>
-                        <field name="module_stock_planning"/>
-                        <field name="module_mrp_subproduct"/>
-                        <field name="module_mrp_repair"/>
-
-                        <separator string="Logistics" colspan="4"/>
-                        <field name="module_mrp_jit"/>
-                        <field name="module_stock_no_autopicking"/>
-                        <separator string="Bill Of Material" colspan="4"/>
-                        <field name="group_mrp_routings"/>
-                        <field name="group_mrp_properties"/>
+                        <group col="4" string="Manufacturing Order">
+                            <field name="module_mrp_operations"/>
+                            <field name="module_stock_planning"/>
+                            <field name="module_mrp_subproduct"/>
+                            <field name="module_mrp_repair"/>
+                        </group>
+                        <group string="Logistics" col="4">
+                            <field name="module_mrp_jit"/>
+                            <field name="module_stock_no_autopicking"/>
+                        </group>
+                        <group string="Bill Of Material" col="4">
+                            <field name="group_mrp_routings"/>
+                            <field name="group_mrp_properties"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 00e94e57c9b..e166e2a96a7 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -4,7 +4,7 @@
         
         <!--  Change Product Quantity -->
         
-		<record id="view_change_production_qty_wizard" model="ir.ui.view">
+        <record id="view_change_production_qty_wizard" model="ir.ui.view">
             <field name="name">Change Product Qty</field>
             <field name="model">change.production.qty</field>
             <field name="type">form</field>
@@ -12,15 +12,15 @@
                 <form string="Change Product Qty">
                     <separator string="Change Quantity" colspan="4"/>
                     <newline/>
-				    <field name="product_qty"/>
-				    <newline/>
-				    <separator colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="change_prod_qty" string="Approve"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <field name="product_qty"/>
+                    <newline/>
+                    <separator colspan="4"/>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="change_prod_qty" string="Approve"
+                            colspan="1" type="object" icon="gtk-ok" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -34,5 +34,5 @@
             <field name="target">new</field>            
         </record>
        
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index e1a5d3a1d6e..9bafa51b941 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -4,22 +4,22 @@
         
         <!--  Product Cost Structure Report -->
         
-		<record id="view_mrp_product_price_wizard" model="ir.ui.view">
+        <record id="view_mrp_product_price_wizard" model="ir.ui.view">
             <field name="name">Product Cost Structure</field>
             <field name="model">mrp.product_price</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Cost Structure">
                     <separator colspan="4" string="Print Cost Structure of Product." />
-				    <field name="number"/>
-				    <newline/>
+                    <field name="number"/>
+                    <newline/>
                     <separator string="" colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="print_report" string="Print"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="print_report" string="Print"
+                            colspan="1" type="object" icon="gtk-print" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -27,9 +27,9 @@
        <act_window name="Product Cost Structure"
             res_model="mrp.product_price"
             src_model="product.product"
-		    view_mode="form"
-		    target="new"        
+            view_mode="form"
+            target="new"        
             key2="client_print_multi"    
-		    id="action_view_mrp_product_price_wizard"/>
-	</data>
-</openerp>	
+            id="action_view_mrp_product_price_wizard"/>
+    </data>
+</openerp>    
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 187574e0e6f..c0576405788 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -5,24 +5,24 @@
         
         <!--  Produce -->
         
-		<record id="view_mrp_product_produce_wizard" model="ir.ui.view">
+        <record id="view_mrp_product_produce_wizard" model="ir.ui.view">
             <field name="name">MRP Product Produce</field>
             <field name="model">mrp.product.produce</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Produce">
-                	<separator string="Produce" colspan="4"/>
-				    <field name="mode" colspan="4"/>
-				    <field name="product_qty" colspan="2"/>
-                	<newline/>
-                	<separator string="" colspan="4" />
-                	<label string="" colspan="2" />
-                	<group col="2" colspan="1">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="do_produce" string="Confirm"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <separator string="Produce" colspan="4"/>
+                    <field name="mode" colspan="4"/>
+                    <field name="product_qty" colspan="2"/>
+                    <newline/>
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2" />
+                    <group col="2" colspan="1">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="do_produce" string="Confirm"
+                            colspan="1" type="object" icon="gtk-ok" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -37,5 +37,5 @@
         </record>    
         
         
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index d2f675988d4..79a7df1a6a0 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -4,32 +4,32 @@
         
         <!--  Work Center Load Report -->
         
-		<record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
+        <record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
             <field name="name">Work Center Load</field>
             <field name="model">mrp.workcenter.load</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Select time unit">
-				    <field name="time_unit"/>
-				    <newline/>
-				    <field name="measure_unit"/>
-				    <newline/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-stop' special="cancel"
-                			string="Cancel" />
-                		<button name="print_report" string="Print"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
-				</form>
-			</field>
-		</record>
-		
-		<act_window name="Work Center Load"
+                <form string="Select time unit">
+                    <field name="time_unit"/>
+                    <newline/>
+                    <field name="measure_unit"/>
+                    <newline/>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-stop' special="cancel"
+                            string="Cancel" />
+                        <button name="print_report" string="Print"
+                            colspan="1" type="object" icon="gtk-print" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <act_window name="Work Center Load"
             res_model="mrp.workcenter.load"
             src_model="mrp.workcenter"
-		    view_mode="form"
-		    target="new"   
+            view_mode="form"
+            target="new"   
             key2="client_print_multi"    
-		    id="action_mrp_workcenter_load_wizard"/>
-	</data>
+            id="action_mrp_workcenter_load_wizard"/>
+    </data>
 </openerp>
diff --git a/addons/mrp_operations/i18n/ja.po b/addons/mrp_operations/i18n/ja.po
index 9a0445ff6c2..1faa26eb1e9 100644
--- a/addons/mrp_operations/i18n/ja.po
+++ b/addons/mrp_operations/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-01 04:26+0000\n"
+"PO-Revision-Date: 2012-06-08 02:54+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-06-02 05:35+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -79,7 +79,7 @@ msgstr "（"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr "生産製品"
+msgstr "製造製品"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
@@ -120,7 +120,7 @@ msgstr "オーダーのキャンセル"
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
 msgid "Production Order"
-msgstr "生産オーダー"
+msgstr "製造オーダー"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -152,7 +152,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr "作業オーダーは生産オーダーを元にして作成されます。"
+msgstr "作業オーダーは製造オーダーを元にして作成されます。"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:134
@@ -222,7 +222,7 @@ msgstr "終了日"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "In Production"
-msgstr "生産中"
+msgstr "製造中"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -462,7 +462,7 @@ msgstr "保留中"
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr "生産操作コード"
+msgstr "製造操作コード"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:466
@@ -485,7 +485,7 @@ msgstr "開始済"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production started late"
-msgstr "生産が遅れて開始"
+msgstr "製造は遅れて開始"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -506,7 +506,7 @@ msgstr "合計サイクル"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr "生産準備完了"
+msgstr "製造準備完了"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
@@ -564,7 +564,7 @@ msgstr "操作はまだ開始されていません。"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr "生産オーダーからの情報"
+msgstr "製造オーダーからの情報"
 
 #. module: mrp_operations
 #: sql_constraint:mrp.production:0
@@ -639,7 +639,7 @@ msgid ""
 "the related products are produced."
 msgstr ""
 "作業オーダーは各製造オーダーを実行するための操作のリストです。製造オーダーの最初の作業オーダーを開始すると、製造オーダーは自動的に開始したとマークされます"
-"。製造オーダーの最後の操作が終わると、製造オーダーは自動的に完了となり関連製品は生産されます。"
+"。製造オーダーの最後の操作が終わると、製造オーダーは自動的に完了となり関連製品は製造されます。"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -659,7 +659,7 @@ msgstr "作業センターバーコード"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "この製品に生産ロットを割り当てて下さい。"
+msgstr "この製品に製造ロットを割り当てる必要があります。"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -677,7 +677,7 @@ msgstr "遅延"
 #: field:mrp.workorder,production_id:0
 #: field:mrp_operations.operation,production_id:0
 msgid "Production"
-msgstr "生産"
+msgstr "製造"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -817,7 +817,7 @@ msgstr "作業オーダーの詳細"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr "生産状態"
+msgstr "製造状態"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 2ef70a9edf8..b25041bef98 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -8,7 +8,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-           <xpath expr="//field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
+           <xpath expr="//field[@name='workcenter_lines']/form//field[@name='hour']" position="after">
                <group colspan="8" col="8">
                    <separator colspan="8"/>
                    <field name="state"/>
@@ -67,7 +67,7 @@
         <field name="type">form</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form version="7.0">
             <header>
                 <button name="button_start_working" string="Start" states="draft"/>
                 <button name="button_resume" string="Resume" states="pause"/>
@@ -77,46 +77,43 @@
                 <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 <field name="state" widget="statusbar" statusbar_visible="draft,startworking"/>
             </header>
-            <sheet string="Work Orders" layout="auto">
-                <group col="6" colspan="4" class="oe_form_header">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="workcenter_id" select="1" widget="selection"/>
+            <sheet string="Work Orders">
+                <group col="4">
+                    <field colspan="4" name="name"/>
+                    <field name="workcenter_id" widget="selection"/>
                     <field name="production_id"/>
                     <field name="production_state"/>
                     <field name="sequence"/>
                 </group>
-                <notebook colspan="4">
+                <notebook>
                 <page string="Information">
-                    <group colspan="2" col="2">
-                        <separator string="Planned Date" colspan="2"/>
-                        <field name="date_planned"/>
-                        <field name="date_planned_end"/>
-                    </group>
+                    <group>
+                        <group string="Planned Date">
+                            <field name="date_planned"/>
+                            <field name="date_planned_end"/>
+                        </group>
 
-                    <group colspan="2" col="2">
-                        <separator string="Duration" colspan="2"/>
-                        <field name="cycle"/>
-                        <field name="hour" widget="float_time"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Real" colspan="2"/>
-                        <field name="date_start" readonly="1"/>
-                        <field name="date_finished" readonly="1"/>
-                        <field name="delay" widget="float_time"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Product to Produce" colspan="2"/>
-                        <field name="product"/>
-                        <field name="qty"/>
-                        <field name="uom" widget="selection"/>
+                        <group string="Duration">
+                            <field name="cycle"/>
+                            <field name="hour" widget="float_time"/>
+                        </group>
+                        <group string="Real" >
+                            <field name="date_start" readonly="1"/>
+                            <field name="date_finished" readonly="1"/>
+                            <field name="delay" widget="float_time"/>
+                        </group>
+                        <group string="Product to Produce">
+                            <field name="product"/>
+                            <field name="qty"/>
+                            <field name="uom" widget="selection"/>
+                        </group>
                     </group>
                 </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
             </form>
         </field>
     </record>
@@ -278,9 +275,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Production Operation Code">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
-                <field name="start_stop" select="1"/>
+                <field name="name"/>
+                <field name="code"/>
+                <field name="start_stop"/>
             </tree>
         </field>
     </record>
@@ -289,10 +286,12 @@
         <field name="model">mrp_operations.operation.code</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Production Operation Code">
-                <field name="name" select="1"/>
-                <field name="code" select="1"/>
-                <field name="start_stop" select="1"/>
+            <form string="Production Operation Code" version="7.0">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="start_stop"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/mrp_repair/i18n/ja.po b/addons/mrp_repair/i18n/ja.po
index 69cd8c15e8a..a42c9a8df67 100644
--- a/addons/mrp_repair/i18n/ja.po
+++ b/addons/mrp_repair/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-01 04:27+0000\n"
+"PO-Revision-Date: 2012-06-08 02:54+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-06-02 05:35+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -58,7 +58,7 @@ msgid ""
 "invoiced to the customer or not."
 msgstr ""
 "修理オーダーは製品の修理を手配します。修理オーダーでは、取除いた、追加した、交換した部品を詳述でき、異なる操作で費やした時間を記録できます。修理オーダーは"
-"、その修理を顧客に請求すべきであるかどうかを知るために生産ロットの保証日付を使用します。"
+"、その修理を顧客に請求すべきであるかどうかを知るために製造ロットの保証日付を使用します。"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -78,8 +78,8 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
-"製品が修理された後の配送を管理したい場合、このボックスをチェックして下さい。チェックすると、製品の選択とともに集荷を作成します。拡張ビューをしている場合は"
-"、情報タブで場所を指定することができます。"
+"製品が修理された後の配送を管理したい場合、このボックスをチェックします。チェックすると、製品の選択とともに集荷を作成します。拡張ビューをしている場合は、情"
+"報タブで場所を指定することができます。"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
@@ -393,7 +393,7 @@ msgstr "キャンセル済"
 #: code:addons/mrp_repair/mrp_repair.py:337
 #, python-format
 msgid "Production lot is required for opration line with product '%s'"
-msgstr "生産ロットは製品 %s が操作ラインのために必要です。"
+msgstr "製造ロットは製品 %s が操作ラインのために必要です。"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 7d78fb46490..6f14ba22bea 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -230,10 +230,9 @@ class mrp_repair(osv.osv):
             data['value']['location_id'] = move.location_dest_id.id
             data['value']['location_dest_id'] = move.location_dest_id.id
             if move.partner_id:
-                data['value']['partner_id'] = move.partner_id and move.partner_id.id
+                data['value']['partner_id'] = move.partner_id.id
             else:
                 data['value']['partner_id'] = False
-            data['value']['partner_id'] = move.partner_id and move.partner_id.id
             d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['partner_id'])
             data['value'].update(d['value'])
         return data
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 21e3dd5aa25..6e40bb8fd26 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -8,8 +8,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
-                <field name="name" select="1" />
-                <field name="product_id" select="1" />
+                <field name="name" />
+                <field name="product_id" />
                 <field name="move_id"/>
                 <field name="partner_id"/>
                 <field name="address_id"/>
@@ -27,7 +27,7 @@
         <field name="model">mrp.repair</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form version="7.0">
                <header>
                    <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                    <button name="repair_ready" states="confirmed" string="Start Repair"/>
@@ -42,54 +42,59 @@
                    <button name="cancel" states="draft" string="Cancel Repair"/>
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,ready" />
                </header>
-               <sheet string="Repairs order" layout="auto">
-                <group col="6" colspan="4" class="oe_form_header">
-                    <field name="name"/>
-                    <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
-                    <field name="deliver_bool"/>
-                    <newline/>
-                    <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
-                    <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
-                    <field name="repaired"/>
-                    <newline/>
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
-                    <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
-                    <field name="invoiced"/>
-                </group>
-                <notebook colspan="4">
+               <sheet string="Repairs order">
+                    <label for="product_id" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    </h1>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="name"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
+                            <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
+                            <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
+                            <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
+                        </group>
+                        <group>
+                            <field name="deliver_bool"/>
+                            <field name="repaired"/>
+                            <field name="invoiced"/>
+                            <field name="guarantee_limit" />
+                        </group>
+                    </group>
+                <notebook>
                     <page string="Operations">
-                        <field name="guarantee_limit" />
-                        <newline/>
-                        <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
-                            <form string="Operations">
+                        <field name="operations">
+                            <form string="Operations" version="7.0">
                                 <notebook>
                                     <page string="Repair Line">
-                                        <field name="name" colspan="4"/>
-                                        <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
-                                        <field name='prodlot_id'/>
-                                        <field name="product_uom_qty" string="Qty" />
-                                        <field name="product_uom" string="Unit of Measure"/>
-                                        <field name="price_unit"/>
-                                        <field name="price_subtotal"/>
-                                        <field name="location_id"/>
-                                        <field name="location_dest_id"/>
-                                        <newline/>
-                                        <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
-                                        <group colspan="2">
+                                        <group col="4">
+                                            <field name="name" colspan="4"/>
+                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                            <field name='prodlot_id'/>
+                                            <field name="product_uom_qty" string="Qty" />
+                                            <field name="product_uom" string="Unit of Measure"/>
+                                            <field name="price_unit"/>
+                                            <field name="price_subtotal"/>
+                                            <field name="location_id"/>
+                                            <field name="location_dest_id"/>
+                                            <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit,parent.company_id,context)"/>
                                             <field name="to_invoice"/>
+                                            <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <field name="invoiced"/>
                                         </group>
-                                        <newline/>
-                                        <separator colspan="4" string="Taxes"/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                                         <separator colspan="4" string="States"/>
                                         <field name="state"/>
                                     </page>
                                     <page string="History">
-                                        <field colspan="4" name="move_id" />
-                                        <field colspan="4" name="invoice_line_id"/>
+                                        <group>
+                                            <field name="move_id" />
+                                            <field name="invoice_line_id"/>
+                                        </group>
                                     </page>
-
                                  </notebook>
                             </form>
                             <tree string="Operations" editable="bottom">
@@ -107,42 +112,41 @@
                                 <field name="price_subtotal"/>
                             </tree>
                         </field>
-                        <newline/>
-                        <group col="7" colspan="4">
+                        <group class="oe_form_subtotal_footer">
                             <field name="amount_untaxed" sum="Untaxed amount"/>
                             <field name="amount_tax"/>
                             <field name="amount_total" sum="Total amount"/>
                             <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         </group>
+                        <div class="oe_clear"/>
                     </page>
                     <page string="Invoicing">
-                        <field name="invoice_method" colspan="4"/>
-                        <field
-                            name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}"
-                            attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
-                        <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                        <group col="4">
+                            <field name="invoice_method"/>
+                            <field
+                                name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}"
+                                attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                            <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                        </group>
                         <!-- <field name="invoice_id"/> -->
-                        <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
-                            <form string="Fees">
+                        <field name="fees_lines">
+                            <form string="Fees" version="7.0">
                                 <notebook>
                                     <page string="Fees Line">
-                                        <field name='name'/>
-                                        <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
-                                        <field name="product_uom_qty" string="Qty"/>
-                                        <field name="product_uom" string="Unit of Measure" />
-                                        <field name="price_unit"/>
-                                        <field name="price_subtotal"/>
-                                        <newline/>
-                                        <group colspan="2">
+                                        <group col="4">
+                                            <field name='name'/>
+                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
+                                            <field name="product_uom_qty" string="Qty"/>
+                                            <field name="product_uom" string="Unit of Measure" />
+                                            <field name="price_unit"/>
+                                            <field name="price_subtotal"/>
                                             <field name="to_invoice"/>
                                             <field name="invoiced"/>
+                                            <field widget="many2many_tags" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                         </group>
-                                        <newline/>
-                                        <separator colspan="4" string="Taxes"/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                                      </page>
                                      <page string="History">
-                                        <field colspan="4" name="invoice_line_id" />
+                                        <field name="invoice_line_id" />
                                     </page>
                                   </notebook>
                             </form>
@@ -158,17 +162,19 @@
                         </field>
                     </page>
                     <page string="Extra Info">
-                        <field name="invoice_id"/>
-                        <field name="picking_id"/>
-                        <field name="location_id"/>
-                        <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <group col="4">
+                            <field name="invoice_id"/>
+                            <field name="picking_id"/>
+                            <field name="location_id"/>
+                            <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
                     </page>
                     <page string="Notes">
-                        <separator colspan="4" string="Internal Notes"/>
-                        <field colspan="4" name="internal_notes" nolabel="1"/>
-                        <separator colspan="4" string="Quotation Notes"/>
-                        <field colspan="4" name="quotation_notes" nolabel="1"/>
+                        <separator string="Internal Notes"/>
+                        <field name="internal_notes"/>
+                        <separator string="Quotation Notes"/>
+                        <field name="quotation_notes"/>
                     </page>
                 </notebook>
                 </sheet>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index e307580be7b..dd0be7b053e 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -4,20 +4,17 @@
         
         <!--  Cancel Repair -->
         
-		<record id="view_cancel_repair" model="ir.ui.view">
+        <record id="view_cancel_repair" model="ir.ui.view">
             <field name="name">Cancel Repair</field>
             <field name="model">mrp.repair.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cancel Repair Order">
-				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
-				    <newline/>
-				    <group col="2" colspan="4">
-                		<button icon="gtk-stop" special="cancel"
-                			string="No" />
-                		<button name="cancel_repair" string="Yes"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                <form string="Cancel Repair Order" version="7.0">
+                    <header>
+                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" />
+                        <button icon="gtk-stop" special="cancel" string="No" />
+                    </header>
+                    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                 </form>
             </field>
         </record>         
@@ -30,7 +27,7 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record> 
- 		
+         
         
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 92804d0cb23..8fd88a5fd38 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -4,32 +4,30 @@
         
         <!--  Make Invoice -->
         
-		<record id="view_make_invoice" model="ir.ui.view">
+        <record id="view_make_invoice" model="ir.ui.view">
             <field name="name">Make Invoice</field>
             <field name="model">mrp.repair.make_invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create invoices">
-    		        <separator colspan="4" string="Do you really want to create the invoice(s)?" />  
-			        <field name="group"/>
-                    <newline/>  
-                    <group col="2" colspan="4">                        
-                		<button icon="gtk-stop" special="cancel"
-                			string="Cancel" />
-                		<button name="make_invoices" string="Create Invoice"
-                			colspan="1" type="object" icon="terp-gtk-go-back-rtl" />
-                	</group>
+            <form string="Create invoices" version="7.0">
+                <header>
+                    <button icon="gtk-stop" special="cancel" string="Cancel" />
+                    <button name="make_invoices" string="Create Invoice" type="object" icon="terp-gtk-go-back-rtl" />
+                </header>
+                <group string="Do you really want to create the invoice(s)?">
+                    <field name="group"/>
+                </group>
                 </form>
             </field>
         </record>
 
-        <act_window name="Make Invoice"		    
-		    res_model="mrp.repair.make_invoice"
-		    src_model="mrp.repair"
-		    view_mode="form"
-		    target="new"        
+        <act_window name="Make Invoice"            
+            res_model="mrp.repair.make_invoice"
+            src_model="mrp.repair"
+            view_mode="form"
+            target="new"        
             key2="client_action_multi"    
-		    id="act_mrp_repair_invoice"/>        
+            id="act_mrp_repair_invoice"/>        
         
-	</data>
-</openerp>	
+    </data>
+</openerp>    
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 70b3ea8efaa..652490685e0 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -9,18 +9,20 @@
             <field name="arch" type="xml">
              <notebook position="inside">
                  <page string="Sub Products" position="inside">
-                     <field colspan="4" name="sub_products" nolabel="1" widget="one2many_list">
+                     <field name="sub_products">
                          <tree string="sub products"  editable="top">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
                              <field name="product_uom"/>
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </tree>
-                         <form string="Sub Products">
-                             <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                             <field name="product_uom"/>
-                             <field name="product_qty"/>
-                             <field name="subproduct_type"/>
+                         <form string="Sub Products" version="7.0">
+                             <group col="4">
+                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                                 <field name="product_uom"/>
+                                 <field name="product_qty"/>
+                                 <field name="subproduct_type"/>
+                             </group>
                          </form>
                     </field>
                 </page>
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
new file mode 100644
index 00000000000..6d33164d1c4
--- /dev/null
+++ b/addons/plugin/i18n/sv.po
@@ -0,0 +1,23 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-04 15:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 549de48ee06..ec9a8c72610 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="view_thunderbird_installer" model="ir.ui.view">
-			<field name="name">plugin_thunderbird.installer.view</field>
-			<field name="model">plugin_thunderbird.installer</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.res_config_installer"/>
-			<field name="arch" type="xml">
-				<data>
-					<form position="attributes">
-						<attribute name="string">Install Thunderbird Plug-In</attribute>
-					</form>
-					 <separator string="title" position="before">
-						<label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
-					</separator>
-					<xpath expr="//button[@string='Install Modules']" position="replace">
-						<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-					</xpath>
-					<xpath expr="//button[@string='Cancel']" position="replace"></xpath>
-					<xpath expr="//separator[@string='title']" position="after">
-						<group colspan="8" height="450" width="750">
-							<field name="thunderbird" invisible="1"/>
-							<field name="name" invisible="1"/>
-							<field name="pdf_name" invisible="1"/>
-							<newline/>
-							<field name="plugin_file" filename="name" widget="url"/>
-							<newline/>
-							<field name="pdf_file" filename="pdf_name" widget="url"/>
-							<newline/>
-							<separator string="Installation and Configuration Steps" colspan="4"/>
-							<field name="description" nolabel="1" colspan="8"/>
-						</group>
-					</xpath>
-					<separator string="title" position="attributes">
-						 <attribute name="string">Install Thunderbird Plug-In</attribute>
-					</separator>
-				</data>
-			</field>
-		</record>
+    <data>
+        <record id="view_thunderbird_installer" model="ir.ui.view">
+            <field name="name">plugin_thunderbird.installer.view</field>
+            <field name="model">plugin_thunderbird.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">Install Thunderbird Plug-In</attribute>
+                    </form>
+                     <separator string="title" position="before">
+                        <label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
+                    </separator>
+                    <xpath expr="//button[@string='Install Modules']" position="replace">
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
+                    <xpath expr="//separator[@string='title']" position="after">
+                        <group colspan="8" height="450" width="750">
+                            <field name="thunderbird" invisible="1"/>
+                            <field name="name" invisible="1"/>
+                            <field name="pdf_name" invisible="1"/>
+                            <newline/>
+                            <field name="plugin_file" filename="name" widget="url"/>
+                            <newline/>
+                            <field name="pdf_file" filename="pdf_name" widget="url"/>
+                            <newline/>
+                            <separator string="Installation and Configuration Steps" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="8"/>
+                        </group>
+                    </xpath>
+                    <separator string="title" position="attributes">
+                         <attribute name="string">Install Thunderbird Plug-In</attribute>
+                    </separator>
+                </data>
+            </field>
+        </record>
 
-		<record id="action_thunderbird_installer" model="ir.actions.act_window">
-		  <field name="name">Install Thunderbird Plug-In</field>
-		  <field name="type">ir.actions.act_window</field>
-		  <field name="res_model">plugin_thunderbird.installer</field>
-		  <field name="view_id" ref="view_thunderbird_installer"/>
-		  <field name="view_type">form</field>
-		  <field name="view_mode">form</field>
-		  <field name="target">new</field>
-		</record>
-	
-		<!-- Sales Configuration -->
-		<record id="view_config_thunderbird_installer" model="ir.ui.view">
-			<field name="name">Sales Application</field>
-			<field name="model">sale.config.settings</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_sale_config_settings"/>
-			<field name="arch" type="xml">
-				<field name="module_plugin_thunderbird" position="after">
-					<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-						<button name="%(action_thunderbird_installer)d" type="action"
-							string="Configure Thunderbird Plugin" icon="gtk-execute"/>
-					</group>
-				</field>
-			</field>
-		</record>
+        <record id="action_thunderbird_installer" model="ir.actions.act_window">
+          <field name="name">Install Thunderbird Plug-In</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">plugin_thunderbird.installer</field>
+          <field name="view_id" ref="view_thunderbird_installer"/>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+        </record>
+    
+        <!-- Sales Configuration -->
+        <record id="view_config_thunderbird_installer" model="ir.ui.view">
+            <field name="name">Sales Application</field>
+            <field name="model">sale.config.settings</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_sale_config_settings"/>
+            <field name="arch" type="xml">
+                <field name="module_plugin_thunderbird" position="after">
+                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <button name="%(action_thunderbird_installer)d" type="action"
+                            string="Configure Thunderbird Plugin" icon="gtk-execute"/>
+                    </group>
+                </field>
+            </field>
+        </record>
 
 <!--      <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>-->
-		<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/>
+        <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index f65e8872a7c..ce858ab93b6 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-01 20:39+0000\n"
+"PO-Revision-Date: 2012-06-08 02:57+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-06-02 05:35+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -25,7 +25,7 @@ msgstr "商品番号"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr "日毎の販売"
+msgstr "日毎売上"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:49
@@ -82,7 +82,7 @@ msgstr "レジスター分析"
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
 #: report:pos.details:0 report:pos.details_summary:0
 msgid "Details of Sales"
-msgstr "販売の詳細"
+msgstr "売上の詳細"
 
 #. module: point_of_sale
 #: view:report.cash.register:0 field:report.cash.register,day:0
@@ -246,7 +246,7 @@ msgstr "Leffe Brune 330ml"
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
 #: report:pos.sales.user:0
 msgid "Sales Report"
-msgstr "販売レポート"
+msgstr "売上レポート"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beverage
@@ -303,7 +303,7 @@ msgstr "ファンタ オレンジ 330ml"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
 msgid "Sales by User Monthly"
-msgstr "月間ユーザ別販売"
+msgstr "月間ユーザ別売上"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -598,7 +598,7 @@ msgstr "POSオーダー"
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr "販売合計（売上）"
+msgstr "売上合計"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -755,7 +755,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Sales total"
-msgstr "販売合計"
+msgstr "売上合計"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -785,7 +785,7 @@ msgstr "作成日"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr "本日の販売"
+msgstr "本日の売上"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
@@ -807,7 +807,7 @@ msgstr "合計："
 #. module: point_of_sale
 #: view:report.cash.register:0 view:report.pos.order:0
 msgid "My Sales"
-msgstr "私の販売"
+msgstr "私の売上"
 
 #. module: point_of_sale
 #: field:pos.order,pricelist_id:0
@@ -1026,7 +1026,7 @@ msgstr "キャンセル"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr "販売（合計）"
+msgstr "売上（合計）"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
@@ -1200,7 +1200,7 @@ msgstr "キャッシュレジスタを開きますか？"
 #: help:pos.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr "商品分類のリストを表示する時に並び順を与えて下さい。"
+msgstr "商品分類のリストを表示する時に並び順を与えます。"
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -1356,7 +1356,7 @@ msgstr "担当販売員"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all
 msgid "All Sales Orders"
-msgstr "全販売オーダー"
+msgstr "全受注オーダー"
 
 #. module: point_of_sale
 #: help:product.product,income_pdt:0
@@ -1534,7 +1534,7 @@ msgstr "販売レシート印刷"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
 msgid "Sales by User Daily margin"
-msgstr "ユーザの1日の利鞘別販売"
+msgstr "ユーザの1日の利鞘別売上"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -1579,7 +1579,7 @@ msgstr "支払済"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr "全販売行"
+msgstr "全売上行"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1739,7 +1739,7 @@ msgstr "1個当り正味利鞘"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr "月間ユーザ別販売"
+msgstr "月間ユーザ別売上"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
@@ -1828,7 +1828,7 @@ msgstr "オーダー日"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_user
 msgid "Sales lines by Users"
-msgstr "ユーザ別販売傾向"
+msgstr "ユーザ別売上傾向"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_2l_product_template
@@ -2260,7 +2260,7 @@ msgstr "現金取出"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 msgid "Sales Details"
-msgstr "販売詳細"
+msgstr "売上詳細"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:50
@@ -2352,7 +2352,7 @@ msgstr "アイスブルク モカ 2.5L"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr "販売オーダーの検索"
+msgstr "受注オーダーの検索"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
@@ -2365,7 +2365,7 @@ msgstr "支払方法はチェックされた支払方法項目を持つ会計仕
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
 msgid "Sales by user"
-msgstr "ユーザ別販売"
+msgstr "ユーザ別売上"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_hawaii_product_template
@@ -2506,7 +2506,7 @@ msgstr "現金仕訳帳"
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr "ユーザ別本日販売"
+msgstr "ユーザ別本日売上"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2532,7 +2532,7 @@ msgstr "5月"
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr "販売行"
+msgstr "売上行"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2627,7 +2627,7 @@ msgstr "エラー：再帰カテゴリーを作成することはできません
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 msgid "Sales User Today"
-msgstr "ユーザの本日販売"
+msgstr "ユーザの本日売上"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 670e10feec2..ab68e12ae41 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -16,24 +16,28 @@
             <field name="model">pos.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="PoS Orders" version="7.0">
                 <header>
                     <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
                     <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
+                    <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
+                    <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/>
                     <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
                 </header>
-                <sheet string="PoS Orders" layout="auto">
-                    <group col="7" colspan="4" class="oe_form_header">
-                        <field name="name"/>
-                        <field name="date_order"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
-                        <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                        </group><group>
+                            <field name="name"/>
+                            <field name="date_order"/>
+                        </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Sale Order">
-                            <field name="lines" colspan="4" nolabel="1">
+                            <field name="lines">
                                 <tree string="Order lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
                                     <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
@@ -42,60 +46,60 @@
                                     <field name="price_subtotal"/>
                                     <field name="price_subtotal_incl"/>
                                 </tree>
-                                <form string="Order lines">
-                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
-                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="price_subtotal" invisible="1"/>
-                                    <field name="price_subtotal_incl" invisible="1"/>
-                                    <field name="notice"/>
+                                <form string="Order lines" version="7.0">
+                                    <group col="4">
+                                        <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
+                                        <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                        <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                        <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                        <field name="price_subtotal" invisible="1"/>
+                                        <field name="price_subtotal_incl" invisible="1"/>
+                                        <field name="notice"/>
+                                    </group>
                                 </form>
                             </field>
-                            <group colspan="4" col="7">
+                            <group class="oe_form_subtotal_footer">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
-                                <button name="%(action_pos_discount)d" string="Discount" icon="gtk-remove" type="action" states="draft" />
                             </group>
                         </page>
                         <page string="Payment">
-                            <field name="statement_ids" colspan="4" nolabel="1">
+                            <field name="statement_ids">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="journal_id"/>
                                     <field name="statement_id" />
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines">
-                                    <field name="account_id"/>
-                                    <field name="amount"/>
-                                    <field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/>
+                                <form string="Statement lines" version="7.0">
+                                    <group col="4">
+                                        <field name="account_id"/>
+                                        <field name="amount"/>
+                                        <field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/>
+                                    </group>
                                 </form>
                             </field>
                         </page>
                         <page string="Extra Info">
-                            <group colspan="2" col="2">
-                                <separator string="General Information" colspan="2"/>
+                            <group string="General Information">
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"/>
                                 <field name="user_id"/>
                                 <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
                                 <field name="picking_id" readonly="1"/>
                             </group>
-                            <group colspan="2" col="3">
-                                <separator string="Accounting Information" colspan="3"/>
+                            <group string="Accounting Information">
                                 <field name="sale_journal" domain="[('type','=','sale')]"/>
-                                <button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/>
-                                <field name="invoice_id" colspan="2" readonly="1"
+                                <field name="invoice_id" readonly="1"
                                     attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
                                 <button name="%(pos_invoice_report)d" string="Re-Print"
                                     icon="gtk-print" type="action" attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
-                                <field name="account_move" colspan="3" readonly="1"
+                                <field name="account_move" readonly="1"
                                     attrs="{'invisible':[('state','&lt;&gt;','done')]}"/>
                             </group>
                         </page>
                         <page string="Notes" >
-                            <field colspan="4" name="note" nolabel="1"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </sheet>
@@ -200,12 +204,14 @@
             <field name="model">pos.order.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS Order line">
-                    <field name="product_id" />
-                    <field name="qty" />
-                    <field name="discount" />
-                    <field name="price_unit" />
-                    <field name="create_date" />
+                <form string="POS Order line" version="7.0">
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="qty" />
+                        <field name="discount" />
+                        <field name="price_unit" />
+                        <field name="create_date" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -247,14 +253,16 @@
             <field name="model">report.transaction.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
-                    <field name="user_id"/>
-                    <field name="journal_id"/>
-                    <field name="jl_id"/>
-                    <field name="date_create" widget="date"/>
-                    <field name="no_trans"/>
-                    <field name="amount"/>
-                    <field name="invoice_id"/>
+                <form string="POS " version="7.0">
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="journal_id"/>
+                        <field name="jl_id"/>
+                        <field name="date_create" widget="date"/>
+                        <field name="no_trans"/>
+                        <field name="amount"/>
+                        <field name="invoice_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -338,11 +346,13 @@
             <field name="model">report.sales.by.user.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="amount"/>
-                    <field name="user_id"/>
+                <form string="POS " version="7.0">
+                    <group col="4">
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="amount"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -404,11 +414,13 @@
             <field name="model">report.sales.by.user.pos.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="amount"/>
-                    <field name="user_id"/>
+                <form string="POS " version="7.0">
+                    <group col="4">
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="amount"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -470,13 +482,15 @@
             <field name="model">report.sales.by.margin.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
-                    <field name="user_id"/>
-                    <field name="product_name"/>
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="net_margin_per_qty"/>
-                    <field name="total"/>
+                <form string="POS " version="7.0">
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="product_name"/>
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="net_margin_per_qty"/>
+                        <field name="total"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -537,13 +551,15 @@
             <field name="model">report.sales.by.margin.pos.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS ">
-                    <field name="user_id"/>
-                    <field name="product_name"/>
-                    <field name="date_order" widget="date"/>
-                    <field name="qty"/>
-                    <field name="net_margin_per_qty"/>
-                    <field name="total"/>
+                <form string="POS " version="7.0">
+                    <group col="4">
+                        <field name="user_id"/>
+                        <field name="product_name"/>
+                        <field name="date_order" widget="date"/>
+                        <field name="qty"/>
+                        <field name="net_margin_per_qty"/>
+                        <field name="total"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -606,8 +622,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                   <group name="status" position="after">
-                      <group colspan="2" col="2" name="pos">
-                          <separator string="Point of Sale" colspan="2"/>
+                      <group name="pos" string="Point of Sale">
                           <field name="pos_categ_id"/>
                       </group>
                   </group>
@@ -635,8 +650,8 @@
             <field name="model">pos.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="PoS Categories">
-                    <group colspan="4" col="6">
+                <form string="PoS Categories" version="7.0">
+                    <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
                         <field name="sequence"/>
@@ -770,8 +785,8 @@
             <field name="domain">[('origin','like','POS')]</field>
         </record>
 
-		<menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" />
-		
+        <menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" />
+        
         <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
                 id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" />
 
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 2db10e36aa8..bf371ee37ae 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -8,20 +8,18 @@
             <field name="model">pos.box.entries</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Put Money">
-                    <separator string="Fill in this form if you put money in the cash register:" colspan="4"/>
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="journal_id"/>
-                    <field name="amount"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group col="2" colspan="2"/>
-                         <button icon="gtk-stop" special="cancel"
-                            string="Cancel" />
-                        <button name="get_in" string="Put Money"
-                            colspan="1" type="object" icon="gtk-apply" />
-                      </group>
+                <form string="Put Money" version="7.0">
+                    <header>
+                        <button name="get_in" string="Put Money" type="object" icon="gtk-apply" />
+                        <button icon="gtk-stop" special="cancel" string="Cancel" />
+                    </header>
+                    <separator string="Fill in this form if you put money in the cash register:"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="product_id"/>
+                        <field name="journal_id"/>
+                        <field name="amount"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 4f19a407a38..d9d2cf1e37b 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -8,20 +8,17 @@
             <field name="model">pos.box.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Output Operation">
-                        <separator string="Describe why you take money from the cash register:" colspan="4"/>
+                <form string="Output Operation" version="7.0">
+                    <header>
+                        <button name="get_out" string="Take Money" type="object" icon="gtk-apply" />
+                        <button icon="gtk-stop" special="cancel" string="Cancel" />
+                    </header>
+                    <group col="4" string="Describe why you take money from the cash register:">
                         <field name="name"/>
                         <field name="product_id"/>
                         <field name="journal_id"/>
                         <field name="amount"/>
-                        <separator colspan="4"/>
-                        <group colspan="4" col="4">
-                            <group col="2" colspan="2"/>
-                             <button icon="gtk-stop" special="cancel"
-                                string="Cancel" />
-                            <button name="get_out" string="Take Money"
-                                colspan="1" type="object" icon="gtk-apply" />
-                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_close_statement.xml b/addons/point_of_sale/wizard/pos_close_statement.xml
index 6d904b79113..0231427dc8c 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.xml
+++ b/addons/point_of_sale/wizard/pos_close_statement.xml
@@ -8,19 +8,17 @@
             <field name="model">pos.close.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Close Cash Registers">
-                    <separator colspan="4" string="Do you want to close your cash registers?"/>
-                    <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2"/>
+                <form string="Close Cash Registers" version="7.0">
+                    <header>
+                        <button name="close_statement" string="Yes"
+                             type="object" icon="gtk-ok"/>
                         <button icon='gtk-stop' special="cancel"
                             string="No" invisible="context.get('cancel_action')"/>
                         <button icon='gtk-stop' type="object" name="cancel_wizard"
                             string="No" invisible="not context.get('cancel_action')"/>
-                        <button name="close_statement" string="Yes"
-                             type="object" icon="gtk-ok"/>
-                   </group>
+                    </header>
+                    <separator string="Do you want to close your cash registers?"/>
+                    <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index 6a0819c06b0..1a63a8e9407 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -7,19 +7,13 @@
             <field name="model">pos.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Post All Orders">
-                <separator string="Generate Journal Entries" colspan="4"/>
-                <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement." colspan="4" align="0.0"/>
-                <newline/>
-                <separator colspan="4"/>
-                <group colspan="4" col="4">
-                    <group colspan="2" col="2">
-                    <button icon='gtk-cancel' special="cancel"
-                        string="Cancel" />
-                    <button name="action_confirm" string="Generate Entries"
-                        colspan="1" type="object" icon="gtk-ok"/>
-                    </group>
-                </group>
+                <form string="Post All Orders" version="7.0">
+                    <header>
+                        <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok"/>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <separator string="Generate Journal Entries"/>
+                    <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 0b70b3ae2eb..caf49000e45 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -3,27 +3,23 @@
     <data>
         <!--   pos.details -->
 
-		<record id="view_pos_details" model="ir.ui.view">
+        <record id="view_pos_details" model="ir.ui.view">
             <field name="name">POS Details</field>
             <field name="model">pos.details</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS Details">
-                    <group col="4" colspan="4">
-                        <separator string="Dates" colspan="4"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <separator string="User" colspan="4"/>
-                        <field name="user_ids" nolabel="1" colspan="4"/>
-                        <separator string="" colspan="4"/>
-                        <label string="" colspan="2"/>
-                        <group colspan="2" col="2">
+                <form string="POS Details" version="7.0">
+                    <header>
                             <button icon='gtk-cancel' special="cancel"
                                     string="Close" />
                             <button name="print_report" string="Print Report"
                                     colspan="1" type="object" icon="gtk-print" />
-                        </group>
+                    </header>
+                    <group col="4" string="Dates">
+                        <field name="date_start"/>
+                        <field name="date_end"/>
                     </group>
+                    <field name="user_ids"/>
                 </form>
             </field>
         </record>
@@ -39,5 +35,5 @@
         </record>
 
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index bb198e29acf..89ee1a8c08a 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -8,14 +8,12 @@
             <field name="model">pos.discount</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Apply Discount">
-                    <field name="discount" colspan="4"/>
-                    <separator colspan="4" string=""/>
-                    <group colspan="2"/>
-                    <button icon='gtk-cancel' special="cancel"
-                        string="Close" />
-                    <button name="apply_discount" string="Apply Discount"
-                        colspan="1" type="object" icon="gtk-ok" />
+                <form string="Apply Discount" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                        <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" />
+                    </header>
+                    <field name="discount"/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 0ce17237801..7ee9b206e0b 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -8,16 +8,14 @@
             <field name="model">pos.open.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Open Statements">
-                    <separator colspan="4" string="Do you want to open cash registers?"/>
-                    <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab." colspan="4" align="0.0"/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                         <group col="2" colspan="2"/>
-                         <button icon='gtk-stop' special="cancel" string="Cancel"/>
+                <form string="Open Statements" version="7.0">
+                    <header>
                          <button name="open_statement" string="Open Registers"
                              type="object" icon="gtk-ok"/>
-                    </group>
+                         <button icon='gtk-stop' special="cancel" string="Cancel"/>
+                    </header>
+                    <separator string="Do you want to open cash registers?"/>
+                    <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index b790d2bac0f..d7eaf23334b 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -7,20 +7,15 @@
             <field name="model">pos.make.payment</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Add payment :">
-                <group colspan="4" col="4" >
-                    <group colspan="4">
-                        <field name="journal"/>
-                        <field name="amount" />
-                        <field name="payment_name"/>
-                    </group>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group colspan="2"/>
-                    <group colspan="2">
-                        <button icon="gtk-stop" special="cancel" string="Cancel"/>
-                        <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
-                    </group>
+            <form string="Add payment :" version="7.0">
+                <header>
+                    <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
+                    <button icon="gtk-stop" special="cancel" string="Cancel"/>
+                </header>
+                <group col="4">
+                    <field name="journal"/>
+                    <field name="amount" />
+                    <field name="payment_name"/>
                 </group>
             </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index 0d925eb2ba9..9c202c8c3c6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -3,18 +3,14 @@
     <data>        
         <!--   pos.details -->
         
-		<record id="view_pos_payment_report" model="ir.ui.view">
+        <record id="view_pos_payment_report" model="ir.ui.view">
             <field name="name">Payment Report</field>
             <field name="model">pos.payment.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Report">
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
+                <form string="Payment Report" version="7.0">
+                    <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
+                    <button icon='gtk-cancel' special="cancel" string="Close" />
                 </form>
             </field>
         </record>
@@ -29,5 +25,5 @@
         </record>
 
         
-	</data>
-</openerp>	        
\ No newline at end of file
+    </data>
+</openerp>            
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index 07f978f7d8c..4421d5263b8 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -3,18 +3,16 @@
     <data>
         <!--   pos.details -->
 
-		<record id="view_pos_payment_report" model="ir.ui.view">
+        <record id="view_pos_payment_report" model="ir.ui.view">
             <field name="name">Pyament Report</field>
             <field name="model">pos.payment.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Pyament Report ">
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-print" />
-                	</group>
+                <form string="Pyament Report " version="7.0">
+                    <header>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
+                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                    </header>
                 </form>
             </field>
         </record>
@@ -29,5 +27,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index 9d6e925ebd7..07cafd997ed 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="pos_payment_report_user_form" model="ir.ui.view">
-		    <field name="name">pos.payment.report.user.form</field>
-		    <field name="model">pos.payment.report.user</field>
-		    <field name="type">form</field>
-		    <field name="arch" type="xml">
-				<form string="Sale by User">
-				 	<group col="2" colspan="4">
-					<field name="user_id"/>
-					<button icon='gtk-cancel' special="cancel" string="Close" />
-					<button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
- 					</group >				
-				</form>
-		    </field>
-		</record>
+    <data>
+        <record id="pos_payment_report_user_form" model="ir.ui.view">
+            <field name="name">pos.payment.report.user.form</field>
+            <field name="model">pos.payment.report.user</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sale by User" version="7.0">
+                    <header>
+                        <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
+                        <button icon='gtk-cancel' special="cancel" string="Close" />
+                    </header>
+                    <group>
+                        <field name="user_id"/>
+                    </group>
+                </form>
+            </field>
+        </record>
         <record id="action_report_pos_payment_report_user" model="ir.actions.act_window">
             <field name="name">Sales lines by Users</field>
             <field name="type">ir.actions.act_window</field>
@@ -23,5 +25,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-		</data>	        
+        </data>            
 </openerp>              
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 0b8acfd8197..8580890f594 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -4,20 +4,20 @@
 
     <!--   Pos Receipt -->
 
-		<record id="view_pos_receipt" model="ir.ui.view">
-		      <field name="name">Receipt</field>
-		      <field name="model">pos.receipt</field>
-		      <field name="type">form</field>
-		      <field name="arch" type="xml">
-		        <form string="Receipt :">
-            <separator string="Print the Receipt of the Sale" colspan="4"/>
-		          <button icon='gtk-cancel' special="cancel"
-		                  string="Cancel" />
-		          <button name="print_report" string="Print Receipt"
-		                  colspan="1" type="object" icon="gtk-print" />
-		        </form>
-		      </field>
-    	</record>
+        <record id="view_pos_receipt" model="ir.ui.view">
+              <field name="name">Receipt</field>
+              <field name="model">pos.receipt</field>
+              <field name="type">form</field>
+              <field name="arch" type="xml">
+                <form string="Receipt :" version="7.0">
+                    <header>
+                      <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                      <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" />
+                    </header>
+                    <label string="Print the Receipt of the Sale"/>
+                </form>
+              </field>
+        </record>
 
 
       <record id="action_report_pos_receipt" model="ir.actions.act_window">
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index d89eb8f8745..3d735f87fb7 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -6,9 +6,9 @@
             <field name="model">pos.return</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Return lines">
-                    <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                <form string="Return lines" version="7.0">
                     <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object"/>
+                    <button icon='gtk-cancel' special="cancel" string="Cancel" />
                  </form>
             </field>
         </record>
@@ -39,10 +39,12 @@
             <field name="model">pos.return.memory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="line_id" invisible="1"/>
+                <form version="7.0">
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="quantity" />
+                        <field name="line_id" invisible="1"/>
+                    </group>
                  </form>
             </field>
         </record>   
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index bece120d684..95a1a3d7e6f 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -3,21 +3,23 @@
     <data>
         <!--   pos sales user -->
 
-		<record id="view_pos_sale_user" model="ir.ui.view">
+        <record id="view_pos_sale_user" model="ir.ui.view">
             <field name="name">Sale By User</field>
             <field name="model">pos.sale.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sale By User">
-				    <group col="2" colspan="4">
-				    	<field name="date_start"/>
-				    	<field name="date_end"/>
-				    	<field name="user_id"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print Report"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                <form string="Sale By User" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Close" />
+                        <button name="print_report" string="Print Report"
+                            type="object" icon="gtk-ok" />
+                    </header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -32,5 +34,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/portal/i18n/ja.po b/addons/portal/i18n/ja.po
index 32590f36985..58bd5f3db4b 100644
--- a/addons/portal/i18n/ja.po
+++ b/addons/portal/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-01 23:22+0000\n"
+"PO-Revision-Date: 2012-06-08 02:58+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-06-02 05:35+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -60,7 +60,7 @@ msgstr "ポータルマネジャはポータル定義へアクセスして、ユ
 #. module: portal
 #: help:res.portal,override_menu:0
 msgid "Enable this option to override the Menu Action of portal users"
-msgstr "ポータルユーザのメニューアクションを無効にするためにはこのオプションを有効にして下さい。"
+msgstr "ポータルユーザのメニューアクションを無効にするためにはこのオプションを有効にします。"
 
 #. module: portal
 #: field:res.portal.wizard.user,user_email:0
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 7f36272720c..d35ce5e240b 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -16,22 +16,18 @@
             <field name="model">res.portal.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add Portal Access">
-                    <field name="portal_id" widget="selection"/>
-                    <newline/>
-                    <notebook colspan="4">
-                        <page string="Users">
-                            <field name="user_ids" nolabel="1" colspan="4"/>
-                        </page>
-                        <page string="Invitation message">
-                            <label string="The following text will be included in the welcome email sent to users."/>
-                            <field name="message" nolabel="1" colspan="4"/>
-                        </page>
-                    </notebook>
-                    <label colspan="2"/>
-                    <button string="Cancel" special="cancel" icon="gtk-cancel"/>
-                    <button string="Send Invitations"
-                        name="action_create" type="object" icon="gtk-ok"/>
+                <form string="Add Portal Access" version="7.0">
+                    <header>
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Send Invitations"
+                            name="action_create" type="object" icon="gtk-ok"/>
+                    </header>
+                    <group col="4">
+                        <field name="portal_id" widget="selection"/>
+                    </group>
+                    <field name="user_ids"/>
+                    <label string="The following text will be included in the welcome email sent to users."/>
+                    <field name="message"/>
                 </form>
             </field>
         </record>
@@ -58,7 +54,7 @@
             <field name="model">res.portal.wizard.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Portal User">
+                <form string="Portal User" version="7.0">
                     <group colspan="2" col="2">
                         <field name="name"/>
                         <field name="user_email"/>
diff --git a/addons/portal/wizard/share_wizard_view.xml b/addons/portal/wizard/share_wizard_view.xml
index efb8fbe54ce..2f9d55c1f0d 100644
--- a/addons/portal/wizard/share_wizard_view.xml
+++ b/addons/portal/wizard/share_wizard_view.xml
@@ -12,7 +12,7 @@
                     <attribute name='invisible'>0</attribute>
                     <attribute name='colspan'>4</attribute>
                 </xpath>
-                <xpath expr="/form/group[@name='emails_group']" position="after">
+                <xpath expr="//group[@name='emails_group']" position="after">
                     <group name="user_group" colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
                         <field colspan="4" nolabel="1" name="user_ids" mode="tree">
                             <tree string="Existing users">
@@ -37,13 +37,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="share.share_step2_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='result_line_ids']/tree/field[@name='login']" position="after">
+                <xpath expr="//field[@name='result_line_ids']//field[@name='login']" position="after">
                     <field name="share_url" groups="portal.group_portal_manager"/>
                 </xpath>
-                <xpath expr="/form/group/field[@name='result_line_ids']/form/field[@name='login']" position="after">
+                <xpath expr="//field[@name='result_line_ids']//field[@name='login']" position="after">
                     <field name="share_url" colspan="4" groups="portal.group_portal_manager"/>
                 </xpath>
-                <xpath expr="/form/group/field[@name='result_line_ids']" position="after">
+                <xpath expr="//field[@name='result_line_ids']" position="after">
                     <field colspan="4" name="share_root_url" groups="portal.group_portal_manager"/>
                 </xpath>
             </field>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index dd495757ec1..268820f92d3 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -13,8 +13,8 @@
         <field name="model">process.process</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process">
-                <group colspan="4" col="6">
+            <form string="Process" version="7.0">
+                <group col="4">
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="active"/>
@@ -24,59 +24,59 @@
                         <field name="node_ids" colspan="4" nolabel="1">
                             <tree string="Process Nodes">
                                 <field name="name"/>
-                                <field name="model_id" select="1"/>
-                                <field name="kind" select="1"/>
+                                <field name="model_id"/>
+                                <field name="kind"/>
                                 <field name="flow_start"/>
                             </tree>
-                            <form string="Process Node">
+                            <form string="Process Node" version="7.0">
                                 <group colspan="4" col="4">
                                     <field name="name"/>
                                     <field name="flow_start"/>
-                                    <field name="kind" select="1"/>
+                                    <field name="kind"/>
                                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
 
                                 </group>
                                 <notebook colspan="4">
-	                                <page string="Properties">
-		                                <group colspan="4" col="6">
-		                                    <field name="model_id" select="1"/>
-		                                    <field name="menu_id"/>
-		                                    <field name="help_url" widget="url"/>
-		                                </group>
-		                                <separator string="Conditions" colspan="4"/>
-		                                <field name="model_states"/>
-		                                <field name="condition_ids" nolabel="1" colspan="4">
-			                                <tree string="Other Conditions" editable="top">
-			                                    <field name="name"/>
-			                                    <field name="model_id"/>
-			                                    <field name="model_states"/>
-			                                </tree>
-		                                </field>
-		                            </page>
-                	                <page string="Transitions">
-		                                <group colspan="4" col="4">
-		                                    <group colspan="2" col="2">
-		                                        <field name="transition_in" nolabel="1" height="400">
-		                                            <tree string="Incoming Transitions">
-		                                                <field name="name"/>
-		                                                <field name="source_node_id"/>
-		                                            </tree>
-		                                        </field>
-		                                   </group>
-		                                   <group colspan="2" col="2">
-                		                        <field name="transition_out" nolabel="1" height="400">
-		                                            <tree string="Outgoing Transitions">
-		                                                <field name="name"/>
-		                                                <field name="target_node_id"/>
-		                                            </tree>
-		                                        </field>
-		                                   </group>
-		                                </group>
-		                            </page>
-                	                <page string="Notes">
-	                                   <field name="note" nolabel="1" colspan="4"/>
-	                                </page>
-	                            </notebook>
+                                    <page string="Properties">
+                                        <group colspan="4" col="6">
+                                            <field name="model_id"/>
+                                            <field name="menu_id"/>
+                                            <field name="help_url" widget="url"/>
+                                        </group>
+                                        <separator string="Conditions" colspan="4"/>
+                                        <field name="model_states"/>
+                                        <field name="condition_ids" nolabel="1" colspan="4">
+                                            <tree string="Other Conditions" editable="top">
+                                                <field name="name"/>
+                                                <field name="model_id"/>
+                                                <field name="model_states"/>
+                                            </tree>
+                                        </field>
+                                    </page>
+                                    <page string="Transitions">
+                                        <group colspan="4" col="4">
+                                            <group colspan="2" col="2">
+                                                <field name="transition_in" nolabel="1" height="400">
+                                                    <tree string="Incoming Transitions">
+                                                        <field name="name"/>
+                                                        <field name="source_node_id"/>
+                                                    </tree>
+                                                </field>
+                                           </group>
+                                           <group colspan="2" col="2">
+                                                <field name="transition_out" nolabel="1" height="400">
+                                                    <tree string="Outgoing Transitions">
+                                                        <field name="name"/>
+                                                        <field name="target_node_id"/>
+                                                    </tree>
+                                                </field>
+                                           </group>
+                                        </group>
+                                    </page>
+                                    <page string="Notes">
+                                       <field name="note" nolabel="1" colspan="4"/>
+                                    </page>
+                                </notebook>
                             </form>
                         </field>
                     </page>
@@ -95,7 +95,7 @@
         <field name="arch" type="xml">
             <tree string="Process">
                 <field name="name"/>
-                <field name="model_id" select="1"/>
+                <field name="model_id"/>
                 <field name="active"/>
             </tree>
         </field>
@@ -139,9 +139,9 @@
         <field name="arch" type="xml">
             <tree string="Process Nodes">
                 <field name="name"/>
-                <field name="process_id" select="1"/>
-                <field name="model_id" select="1"/>
-                <field name="kind" select="1"/>
+                <field name="process_id"/>
+                <field name="model_id"/>
+                <field name="kind"/>
                 <field name="flow_start"/>
             </tree>
         </field>
@@ -152,56 +152,48 @@
         <field name="model">process.node</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process Node">
+            <form string="Process Node" version="7.0">
                 <group colspan="4" col="6">
                     <field name="name"/>
                     <field name="process_id"/>
                     <field name="flow_start"/>
-                    <field name="kind" select="1"/>
+                    <field name="kind"/>
                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-
                 </group>
-                <notebook colspan="4">
-	                <page string="Properties">
-		                <group colspan="4" col="6">
-		                    <field name="model_id" select="1"/>
-		                    <field name="menu_id"/>
-		                    <field name="help_url" widget="url"/>
-		                </group>
-		                <separator string="Conditions" colspan="4"/>
-		                <field name="model_states"/>
-		                <field name="condition_ids" nolabel="1" colspan="4">
-			                <tree string="Other Conditions" editable="top">
-			                    <field name="name"/>
-			                    <field name="model_id"/>
-			                    <field name="model_states"/>
-			                </tree>
-		                </field>
-		            </page>
-	                <page string="Transitions">
-		                <group colspan="4" col="4">
-		                    <group colspan="2" col="2">
-		                        <field name="transition_in" nolabel="1" height="400">
-		                            <tree string="Incoming Transitions">
-		                                <field name="name"/>
-		                                <field name="source_node_id"/>
-		                            </tree>
-		                        </field>
-		                    </group>
-		                    <group colspan="2" col="2">
-		                        <field name="transition_out" nolabel="1" height="400">
-		                            <tree string="Outgoing Transitions">
-		                                <field name="name"/>
-		                                <field name="target_node_id"/>
-		                            </tree>
-		                        </field>
-		                    </group>
-		                </group>
-		            </page>
-	                <page string="Notes">
-	                   <field name="note" nolabel="1" colspan="4"/>
-	                </page>
-	            </notebook>
+                <notebook>
+                    <page string="Properties">
+                        <group col="4">
+                            <field name="model_id"/>
+                            <field name="menu_id"/>
+                            <field name="help_url" widget="url"/>
+                            <field name="model_states"/>
+                        </group>
+                        <field name="condition_ids">
+                            <tree string="Other Conditions" editable="bottom">
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <field name="model_states"/>
+                            </tree>
+                        </field>
+                    </page>
+                    <page string="Transitions">
+                        <field name="transition_in" nolabel="1" height="400">
+                            <tree string="Incoming Transitions">
+                                <field name="name"/>
+                                <field name="source_node_id"/>
+                            </tree>
+                        </field>
+                        <field name="transition_out" nolabel="1" height="400">
+                            <tree string="Outgoing Transitions">
+                                <field name="name"/>
+                                <field name="target_node_id"/>
+                            </tree>
+                        </field>
+                    </page>
+                    <page string="Notes">
+                       <field name="note"/>
+                    </page>
+                </notebook>
             </form>
         </field>
     </record>
@@ -259,36 +251,37 @@
         <field name="model">process.transition</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process Transition">
-                <group col="6" colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="source_node_id" select="1"/>
-                    <field name="target_node_id" select="1"/>
+            <form string="Process Transition" version="7.0">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="source_node_id"/>
+                    <field name="target_node_id"/>
                 </group>
-                <notebook colspan="4">
+                <notebook>
                     <page string="Actions">
-                        <field name="action_ids" nolabel="1" colspan="4">
+                        <field name="action_ids">
                             <tree string="Actions">
                                 <field name="name"/>
                                 <field name="state"/>
                                 <field name="action"/>
                             </tree>
-                            <form string="Actions">
-                                <field name="name" colspan="4"/>
-                                <newline/>
-                                <field name="state"/>
-                                <field name="action"/>
+                            <form string="Actions" version="7.0">
+                                <group col="4">
+                                    <field name="name" colspan="4"/>
+                                    <field name="state"/>
+                                    <field name="action"/>
+                                </group>
                             </form>
                         </field>
                     </page>
                     <page string="Workflow Transitions">
-                        <field name="transition_ids" colspan="4" nolabel="1"/>
+                        <field name="transition_ids"/>
                     </page>
                     <page string="Associated Groups">
-                        <field name="group_ids" colspan="4" nolabel="1"/>
+                        <field name="group_ids"/>
                     </page>
                     <page string="Notes">
-                        <field name="note" nolabel="1" colspan="4"/>
+                        <field name="note"/>
                     </page>
                 </notebook>
             </form>
diff --git a/addons/procurement/i18n/ja.po b/addons/procurement/i18n/ja.po
index c1a3125723e..7d638510c89 100644
--- a/addons/procurement/i18n/ja.po
+++ b/addons/procurement/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-02 05:39+0000\n"
+"PO-Revision-Date: 2012-06-08 03:00+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-06-03 04:47+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -345,8 +345,8 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
-"調達オーダーは特定の場所で特定の製品のためのニーズを記録するために使われます。調達オーダーは通常、仕入オーダー、プル型物流ルールまたは最小在庫ルールから自"
-"動的に作成されます。調達オーダーが確認された時、ニーズを埋めるために必要な操作を自動的に作成します：仕入オーダーの提案、製造オーダーなど。"
+"調達オーダーは特定の場所で特定の製品のためのニーズを記録するために使われます。調達オーダーは通常、受注オーダー、プル型物流ルールまたは最小在庫ルールから自"
+"動的に作成されます。調達オーダーが確認された時、ニーズを埋めるために必要な操作を自動的に作成します：発注オーダーの提案、製造オーダーなど。"
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -442,7 +442,7 @@ msgstr "例外"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr "生産または仕入オーダーから割り当てて下さい。"
+msgstr "製造または発注オーダーから割り当てます。"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -532,9 +532,9 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
-"このウィザードはそれらの設定に基づき実行されるべき全ての調達、生産や仕入オーダーを実行することができます。デフォルトでは、スケジューラはOpenERPによ"
-"って毎夜自動的に起動されます。このメニューを使うと強制的に今起動することができます。ただ、それはバックグラウンドで実行されるので、計算が終わるまで数分待た"
-"されるかもしれません。"
+"このウィザードはそれらの設定に基づき実行されるべき全ての調達、製造や発注オーダーを実行することができます。デフォルトでは、スケジューラはOpenERPによ"
+"って毎夜自動的に起動されます。このメニューを使えば、強制的に今、起動することができます。ただ、それはバックグラウンドで実行されるので、計算が終わるまで数分"
+"待たされるかもしれません。"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -638,7 +638,7 @@ msgstr "調達名"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "この製品に生産ロットを割り当てて下さい。"
+msgstr "この製品に製造ロットを割り当てる必要があります。"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -859,7 +859,7 @@ msgid ""
 "will generate a procurement request to increase the stock up to the maximum "
 "quantity."
 msgstr ""
-"最小在庫ルールを定義できます。それによってOpenERPは自動的に在庫レベルに応じて、ドラフトの製造オーダーまたは仕入見積を作成します。ひとたび、製品の実"
+"最小在庫ルールを定義できます。それによってOpenERPは自動的に在庫レベルに応じて、ドラフトの製造オーダーまたは発注見積を作成します。ひとたび、製品の実"
 "質上の在庫（全ての確認済オーダーと予約を在庫から差し引く）が最小在庫を下回ったなら、OpenERPは在庫を最大数量まで増加させるための調達要求を生成します"
 "。"
 
@@ -878,7 +878,7 @@ msgstr "調達方法は製品タイプに依存します。"
 msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
-msgstr "このウィザードはこの製品のための調達を計画します。この調達は生産オーダーまたは仕入オーダーのタスクを生成します。"
+msgstr "このウィザードはこの製品のための調達を計画します。この調達は製造オーダーまたは発注オーダーのタスクを生成します。"
 
 #. module: procurement
 #: view:res.company:0
@@ -939,10 +939,10 @@ msgid ""
 "others require manual intervention (those are identified by a specific error "
 "message)."
 msgstr ""
-"調達オーダーは与えられた時間と場所において製品の確かなすうりょおうのためのニーズを表しています。販売オーダーは調達オーダーのひとつの典型的な元（しかし、こ"
-"れらは別個のドキュメントです）となっています。調達パラメータ、製品の設定に依存して、調達エンジンは在庫から製品を予約する、仕入先に製品をオーダーする、製造"
-"オーダーを出すなどによりニーズを満たそうとします。システムが調達を満たす方法を見つけることができない場合、調達の例外が発生します。幾つかの例外は自動的に自"
-"分自身で解決します。しかし、他は手動による介入を要求します（それらは特定のエラーメッセージにより識別されます）。"
+"調達オーダーは与えられた時間と場所において製品の確かな数量のためのニーズを表しています。受注オーダーは調達オーダーのひとつの典型的な元（しかし、これらは別"
+"個のドキュメントです）となっています。調達パラメータ、製品の設定に依存して、調達エンジンは在庫から製品を予約する、仕入先に製品をオーダーする、製造オーダー"
+"を出すなどによりニーズを満たそうとします。システムが調達を満たす方法を見つけることができない場合、調達の例外が発生します。幾つかの例外は自動的に自分自身で"
+"解決します。しかし、他は手動による介入を要求します（それらは特定のエラーメッセージにより識別されます）。"
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 09bf0c6c24f..d94ac882cda 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -46,7 +46,7 @@
             <field name="model">procurement.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Procurement" version="7.0">
                     <header>
                         <button name="button_confirm" states="draft" string="Confirm"/>
                         <button name="button_check" states="confirmed" string="Run Procurement"/>
@@ -54,48 +54,48 @@
                         <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
                     </header>
-                <sheet string="Procurement" layout="auto">
-                    <group col="2" colspan="2" class="oe_form_header">
-                        <separator colspan="2" string="References"/>
-                        <field name="name" string="Procurement Reason"/>
-                        <field name="origin"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <sheet>
+                    <group>
+                        <group string="References">
+                            <field name="name"/>
+                            <field name="origin"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group string="Planification">
+                            <field name="date_planned"/>
+                            <field name="procure_method"/>
+                            <field name="priority"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Planification"/>
-                        <field name="date_planned"/>
-                        <field name="procure_method"/>
-                        <field name="priority"/>
-                    </group>
-                    <notebook colspan="4">
+                    <notebook>
                     <page string="Procurement Details">
-                        <separator colspan="4" string="Product &amp; Location"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="location_id" domain="[('usage','=','internal')]"/>
-                        <field name="product_qty"/>
-                        <field name="product_uom"/>
+                        <group string="Product &amp; Location" col="4">
+                            <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                            <field name="location_id" domain="[('usage','=','internal')]"/>
+                            <field name="product_qty"/>
+                            <field name="product_uom"/>
 
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos"  groups="product.group_uos"/>
-
-                        <separator colspan="4" string="Status"/>
-                        <field colspan="4" name="message" readonly="1"/>
+                            <field name="product_uos_qty" groups="product.group_uos"/>
+                            <field name="product_uos"  groups="product.group_uos"/>
+                        </group>
+                        <separator string="Status"/>
+                        <field name="message"/>
                     </page>
                     <page string="Extra Information">
-                        <separator colspan="4" string="Details"/>
-                        <field name="move_id"/>
-                        <field name="date_close"/>
-                        <field name="close_move"/>
+                        <group string="Details" col="4">
+                            <field name="move_id"/>
+                            <field name="date_close"/>
+                            <field name="close_move"/>
+                        </group>
                     </page>
                     <page string="Notes">
-                        <separator colspan="4" string="Note" />
-                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="note"/>
                     </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -206,7 +206,7 @@
             <field name="model">stock.warehouse.orderpoint</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reordering Rules">
+                <form string="Reordering Rules" version="7.0">
                     <group col="2" colspan="2">
                         <separator string="General Information" colspan="2" />
                         <field name="name" />
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 5bbfa01266b..74007305ab7 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -9,20 +9,17 @@
             <field name="model">make.procurement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Procurement Request">
-                    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
-                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                    <field name="qty"/>
-                    <field name="uom_id"/>
-                    <field name="date_planned"/>
-                    <field name="warehouse_id" colspan="4"/>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
-                        <button name="make_procurement" string="Ask New Products"
-                            colspan="1" type="object" icon="gtk-ok" />
+                <form string="Procurement Request" version="7.0">
+                    <header>
+                        <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <field name="qty"/>
+                        <field name="uom_id"/>
+                        <field name="date_planned"/>
+                        <field name="warehouse_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 1d071ea300f..dd75f916f6e 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -9,15 +9,13 @@
             <field name="model">procurement.order.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Parameters">
-                    <label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
-                    <newline/>
-                    <group col="2" colspan="4">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
+                <form string="Parameters" version="7.0">
+                    <header>
                         <button name="procure_calculation" string="Compute Procurements"
-                            colspan="1" type="object" icon="gtk-ok" />
-                    </group>
+                            type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <label string="This wizard will schedule procurements."/>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index c8d0d30d1de..051abea849d 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -4,33 +4,31 @@
 
         <!--  Compute Stock Minimum Rules Only -->
 
-		<record id="view_procurement_compute_wizard" model="ir.ui.view">
+        <record id="view_procurement_compute_wizard" model="ir.ui.view">
             <field name="name">Compute Stock Minimum Rules Only</field>
             <field name="model">procurement.orderpoint.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Parameters">
-                <label string="Wizard checks all the stock minimum rules and generate procurement order." colspan="4"/>
-				    <separator colspan="4"/>
-				    <field name="automatic"/>
-				    <separator colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="procure_calculation" string="Compute Stock"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                <form string="Parameters" version="7.0">
+                    <header>
+                        <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
+                    <group col="2">
+                        <field name="automatic"/>
+                    </group>
                 </form>
             </field>
         </record>
 
         <act_window name="Compute Stock Minimum Rules Only"
-		    res_model="procurement.orderpoint.compute"
-		    src_model="procurement.order"
-		    view_mode="form"
-		    target="new"
+            res_model="procurement.orderpoint.compute"
+            src_model="procurement.order"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
-		    id="action_procurement_compute"/>
+            id="action_procurement_compute"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 00b6225101e..cdd7be0de1f 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -4,33 +4,30 @@
 
         <!--  Compute Schedulers -->
 
-		<record id="view_compute_schedulers_wizard" model="ir.ui.view">
+        <record id="view_compute_schedulers_wizard" model="ir.ui.view">
             <field name="name">Compute Schedulers</field>
             <field name="model">procurement.order.compute.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scheduler Parameters">
-                <label string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing." colspan="4"/>
-				    <separator colspan="4"/>
-				    <field name="automatic"/>
-				    <separator colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="procure_calculation" string="Compute Schedulers"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                <form string="Scheduler Parameters" version="7.0">
+                    <header>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
+                        <field name="automatic"/>
+                    </group>
                 </form>
             </field>
         </record>
 
          <act_window name="Compute Schedulers"
-		    res_model="procurement.order.compute.all"
-		    src_model="procurement.order"
-		    view_mode="form"
-		    target="new"
+            res_model="procurement.order.compute.all"
+            src_model="procurement.order"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
-		    id="action_compute_schedulers"/>
+            id="action_compute_schedulers"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/product/i18n/ja.po b/addons/product/i18n/ja.po
index 326bcce9365..759e7f310b6 100644
--- a/addons/product/i18n/ja.po
+++ b/addons/product/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-02 06:21+0000\n"
+"PO-Revision-Date: 2012-06-08 06:44+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-06-03 04:47+0000\n"
-"X-Generator: Launchpad (build 15342)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
 msgid "DDR 512MB PC400"
-msgstr ""
+msgstr "DDRメモリ 512MB PC400"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -54,11 +54,11 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
-"予測数量（手作業による数量の計算 - 出て行く + 入ってくる）\n"
-"単数の在庫場所：商品がこの場所または子の何れかの場所に格納されるものが含まれます。\n"
-"単数の倉庫：商品がこの倉庫の在庫場所または子の何れかの場所に格納されるものが含まれます。\n"
-"単数の店：商品がこの店の倉庫の在庫場所または子の何れかの場所に格納されるものが含まれます。\n"
-"他：商品が在庫場所タイプが内部となっている何れかの場所に格納されるものが含まれます。"
+"予測数量（在庫数量 - 出て行く + 入ってくる）\n"
+"文脈で単数の在庫場所の場合、この場所または子の何れかの場所に格納されている商品が含まれます。\n"
+"文脈で単数の倉庫の場合、この倉庫の在庫場所または子の何れかの場所に格納されている商品が含まれます。\n"
+"文脈で単数の店の場合、この店の倉庫の在庫場所または子の何れかの場所に格納されている商品が含まれます。\n"
+"そうでない場合、在庫場所タイプが内部となっている全ての場所に格納されている商品が含まれます。"
 
 #. module: product
 #: model:product.category,name:product.cat1
@@ -68,12 +68,12 @@ msgstr "販売可能"
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr ""
+msgstr "マザーボード ASUStek A7V8X-X"
 
 #. module: product
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
-msgstr ""
+msgstr "これは主仕入先から仕入れる最小数量です。"
 
 #. module: product
 #: model:product.uom,name:product.uom_day
@@ -88,7 +88,7 @@ msgstr "単位"
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "ベーシック＋ PC（注文生産）"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -149,17 +149,17 @@ msgstr "参照"
 msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier UoM if "
 "any or in the default UoM of the product otherrwise."
-msgstr ""
+msgstr "このルールを適用するための最小限の数量です。仕入先が明示した数量、そうでなければ製品のデフォルト数量となります。"
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Keyboard"
-msgstr ""
+msgstr "キーボード"
 
 #. module: product
 #: model:ir.model,name:product.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: product
 #: code:addons/product/product.py:143
@@ -167,109 +167,109 @@ msgstr ""
 msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
-msgstr ""
+msgstr "それらは両方が異なった分類に属しているので、製品の単位 %s からデフォルト単位 %s への変換はできません。"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "ダース"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均価格"
 
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "この価格リスト"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
 msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "プロセッサ AMD Athlon XP 1800+"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr ""
+msgstr "HDDオンデマンド"
 
 #. module: product
 #: field:product.price_list,price_list:0
 msgid "PriceList"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: product
 #: view:product.template:0
 msgid "UOM"
-msgstr ""
+msgstr "単位"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr ""
+msgstr "パーセント"
 
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "その他"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "作業員"
 
 #. module: product
 #: help:product.template,sale_ok:0
 msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
-msgstr ""
+msgstr "製品は販売オーダー行から選択された範囲内の製品リストの中に表示できるかどうかを判断します。"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "デフォルト公開価格リスト"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Standard Price"
-msgstr ""
+msgstr "標準価格"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "販売価格リスト"
 
 #. module: product
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr ""
+msgstr "製品タイプ"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
-msgstr ""
+msgstr "仕入または販売する全ての製品フォームを作成して下さい。製品を仕入れることができる場合、仕入先を指定して下さい。"
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  例： 1 * （このユニット） = レシオ * （基準ユニット）"
 
 #. module: product
 #: code:addons/product/product.py:418
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "製品： "
 
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "親分類"
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -277,12 +277,12 @@ msgid ""
 "'Make to Stock': When needed, take from the stock or wait until re-"
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
-msgstr ""
+msgstr "在庫する：必要な時に在庫から取り出すか再供給まで待ちます。オーダーする：必要な時に調達要求のために発注するか製造するかします。"
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "仕入先名、価格、製品コードなど"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -297,7 +297,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "主仕入先"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -307,92 +307,92 @@ msgstr ""
 #: view:product.product:0
 #: view:product.ul:0
 msgid "Packaging"
-msgstr ""
+msgstr "梱包"
 
 #. module: product
 #: view:product.product:0
 #: field:product.template,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
-msgstr ""
+msgstr "パートナがこの数量よりも多く購入 / 販売した時にこのルールのみが適用されます。"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "木材 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "数量-1"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "層別パッケージの数"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr ""
+msgstr "パッケージの数量"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "状態"
 
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "現在の製品のために分類を選択して下さい。"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
 msgid "Outgoing"
-msgstr ""
+msgstr "外に出て行く"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "この分類のための基準単位"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
 #: field:product.product,lst_price:0
 msgid "Public Price"
-msgstr ""
+msgstr "公表価格"
 
 #. module: product
 #: field:product.price_list,qty5:0
 msgid "Quantity-5"
-msgstr ""
+msgstr "数量-5"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr ""
+msgstr "ITコンポーネント"
 
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr ""
+msgstr "製品マネジャ"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "仕入先製品名"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr ""
+msgstr "ミディアム PC"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -402,6 +402,8 @@ msgid ""
 "information about your products related to procurement logistics, sales "
 "price, product category, suppliers and so on."
 msgstr ""
+"製品は仕入れて販売されます。それらは原材料、在庫可能製品、売り切り品、またはサービスです。製品フォームは調達の物流、販売価格、製品分類、仕入先などに製品に"
+"関連する詳細な情報を含んでいます。"
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -416,60 +418,65 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"製品の現在数量\n"
+"文脈で単数の在庫場所の場合、この場所または子の何れかの場所に格納されている商品が含まれます。\n"
+"文脈で単数の倉庫の場合、この倉庫の在庫場所または子の何れかの場所に格納されている商品が含まれます。\n"
+"文脈で単数の店の場合、この店の倉庫の在庫場所または子の何れかの場所に格納されている商品が含まれます。\n"
+"そうでない場合、在庫場所タイプが内部となっている全ての場所に格納されている商品が含まれます。"
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "製品価格検索"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "販売説明"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr ""
+msgstr "貯蔵のローカル化"
 
 #. module: product
 #: help:product.packaging,length:0
 msgid "The length of the package"
-msgstr ""
+msgstr "パッケージの長さ"
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr ""
+msgstr "正味重量kg"
 
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr ""
+msgstr "彼が製品を使うことができるか否かをユーザに述べて下さい。"
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
 #: field:product.supplierinfo,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: product
 #: field:product.packaging,height:0
 msgid "Height"
-msgstr ""
+msgstr "高さ"
 
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "この価格リストのバージョンを有効にするための終了日"
 
 #. module: product
 #: model:product.category,name:product.cat0
 msgid "All products"
-msgstr ""
+msgstr "全製品"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -479,32 +486,32 @@ msgstr ""
 #. module: product
 #: field:product.price_list,qty2:0
 msgid "Quantity-2"
-msgstr ""
+msgstr "数量-2"
 
 #. module: product
 #: field:product.price_list,qty3:0
 msgid "Quantity-3"
-msgstr ""
+msgstr "数量-3"
 
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "コード"
 
 #. module: product
 #: field:product.price_list,qty4:0
 msgid "Quantity-4"
-msgstr ""
+msgstr "数量-4"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "受注と発注"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "作業時間"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -516,107 +523,110 @@ msgid ""
 "each version has several rules. Example: the customer price of a product "
 "category will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"価格リストは価格リストに割り当てられた全てのパートナのための仕入または販売価格の計算を評価するためのルールが含まれています。価格リストは幾つかのバージョン"
+"を持ちます（2010、2011、2010年2月の販売促進など）。そして各バージョンは幾つかのルールを持ちます。例えば、ある製品分類の顧客価格は仕入れ価格の"
+"1.8倍を基本としています。"
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "金属止め具"
 
 #. module: product
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "%s の既存単位の分類は変更できません。"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr ""
+msgstr "製品単位分類"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "箱 20x20x40"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Price Computation"
-msgstr ""
+msgstr "価格計算"
 
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr ""
+msgstr "製品販売単位ビュー"
 
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "発注可能"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
 msgid "High speed processor config"
-msgstr ""
+msgstr "高速プロセッサ設定"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
 msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
-msgstr ""
+msgstr "１つまたは複数の仕入先は製品と結びついています。全ての情報は製品フォームの中にあります。"
 
 #. module: product
 #: help:product.uom,category_id:0
 msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
-msgstr ""
+msgstr "数量変換はそれぞれの比率に応じて同じ分類の単位の間で自動的に行われます。"
 
 #. module: product
 #: help:product.packaging,width:0
 msgid "The width of the package"
-msgstr ""
+msgstr "パッケージの幅"
 
 #. module: product
 #: selection:product.category,type:0
 msgid "View"
-msgstr ""
+msgstr "ビュー"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr ""
+msgstr "製品テンプレート"
 
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "左親"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "レストラン経費"
 
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "パレットまたは箱に置くことのできる製品の合計数"
 
 #. module: product
 #: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "エラー：無効な商品識別番号です。"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr ""
+msgstr "最小数量"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
 msgid "Price Type"
-msgstr ""
+msgstr "価格タイプ"
 
 #. module: product
 #: code:addons/product/product.py:363
@@ -626,31 +636,33 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
+"新しい単位 %s は同じ単位分類 %s に属する必要があります（古い単位 %s "
+"のように）。単位を変更する必要がある場合は、調達と場所タブからこの製品を無効化して新しい物を作成することができます。"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
-msgstr ""
+msgstr "最大利鞘"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr ""
+msgstr "基本価格"
 
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "タイムシート上のサービス"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr ""
+msgstr "静音ファン"
 
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr ""
+msgstr "この製品の仕入先"
 
 #. module: product
 #: help:product.pricelist.version,active:0
@@ -659,36 +671,38 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"バージョンが重複している時は、それは非アクティブにセットされています。日付はオリジナルのバージョンと重複できません。日付を変更して価格リストを再アクティブ"
+"化する必要があります。"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "キット棚 100cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Supplier"
-msgstr ""
+msgstr "仕入先"
 
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "在庫数量"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr ""
+msgstr "キーボードとマウスキット"
 
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr ""
+msgstr "価格名"
 
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "キャビネット"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -703,16 +717,21 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"到着予定の製品数量\n"
+"文脈で単数の在庫場所の場合、この場所または子の何れかの場所に到着する商品が含まれます。\n"
+"文脈で単数の倉庫の場合、この倉庫の在庫場所または子の何れかの場所に到着する商品が含まれます。\n"
+"文脈で単数の店の場合、この店の倉庫の在庫場所または子の何れかの場所に到着する商品が含まれます。\n"
+"そうでない場合、在庫場所タイプが内部となっている全ての場所に到着する商品が含まれます。"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "木製テーブル"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
-msgstr ""
+msgstr "プロセッサ AMD Athlon XP 2200+"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -721,18 +740,18 @@ msgstr ""
 #: report:product.pricelist:0
 #: field:product.pricelist.version,pricelist_id:0
 msgid "Price List"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Suppliers"
-msgstr ""
+msgstr "仕入先"
 
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "仕入"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -740,34 +759,34 @@ msgid ""
 "The minimal quantity to purchase to this supplier, expressed in the supplier "
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
-msgstr ""
+msgstr "この仕入先に仕入れるための最小数量が空の場合は仕入先製品単位で、その他の場合はデフォルトの製品単位で表されます。"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "New Price ="
-msgstr ""
+msgstr "新価格＝"
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
 msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
-msgstr ""
+msgstr "この価格は仕入先単位のための価格とみなされます。そうでない場合は製品のデフォルト単位の価格です。"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
 msgid "Accessories"
-msgstr ""
+msgstr "アクセサリ"
 
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "顧客リードタイム"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Mouse"
-msgstr ""
+msgstr "マウス"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -776,32 +795,34 @@ msgid ""
 "management. For example, in food industries, you will manage a stock of ham "
 "but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
+"請求と在庫管理の２つの単位を管理する会社によって使用されます。例えば、食品産業ではハムの在庫を管理しますが、請求はkgです。デフォルト単位を使用するには空"
+"のままとします。"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr ""
+msgstr "最小利鞘"
 
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr ""
+msgstr "子分類"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
-msgstr ""
+msgstr "印刷"
 
 #. module: product
 #: view:product.product:0
 #: field:product.ul,type:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action2
@@ -809,71 +830,71 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_main
 msgid "Pricelists"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr ""
+msgstr "顧客参照"
 
 #. module: product
 #: view:product.product:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "その他"
 
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr ""
+msgstr "キー"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rules Test Match"
-msgstr ""
+msgstr "適合テストルール"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
 msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
-msgstr ""
+msgstr "このルールがひとつの製品に適用されるのみである場合は製品をセットして下さい。全ての製品のためであれば空のままとして下さい。"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr ""
+msgstr "調達と場所"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "台所設計プロジェクト"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "時"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr ""
+msgstr "開発で"
 
 #. module: product
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "単位の分類が合致しません。"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "棚 200cm"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "比率と精度"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
@@ -883,43 +904,43 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr ""
+msgstr "ITコンポーネントキット"
 
 #. module: product
 #: selection:product.category,type:0
 #: selection:product.template,state:0
 msgid "Normal"
-msgstr ""
+msgstr "通常"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr ""
+msgstr "仕入先情報"
 
 #. module: product
 #: field:product.price.type,currency_id:0
 #: report:product.pricelist:0
 #: field:product.pricelist,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "通貨"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
 msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "DDRメモリ 256MB PC400"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 #: view:product.category:0
 msgid "Product Categories"
-msgstr ""
+msgstr "製品分類"
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  例： 1 * （基準ユニット） ＝  比率 * （このユニット）"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -927,61 +948,61 @@ msgid ""
 "Create and manage the units of measure you want to be used in your system. "
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
-msgstr ""
+msgstr "システムで利用する管理したい単位を作成し管理します。同じ分類内の幾つかの単位間の変換比率を定義することができます。"
 
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
-msgstr ""
+msgstr "合計パッケージ重量"
 
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "不明"
 
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr ""
+msgstr "転送ユニットのコード"
 
 #. module: product
 #: help:product.template,standard_price:0
 msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
-msgstr ""
+msgstr "会計上の在庫評価のための製品コスト。これは仕入価格のための基本価格です。"
 
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr ""
+msgstr "製品価格タイプ"
 
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr ""
+msgstr "変形割増価格"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "標準ケースファン 80mm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "製品仕入先についての情報"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "仕入説明"
 
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "重複した２つの価格リストのバージョンを持つことはできません。"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -989,7 +1010,7 @@ msgid ""
 "Lead time in days between the confirmation of the purchase order and the "
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
-msgstr ""
+msgstr "倉庫での仕入オーダーの確認から製品の受入の間の日数のリードタイム。仕入オーダー計算の自動計算のためにスケジューラによって使用されます。"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action
@@ -998,63 +1019,65 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"価格リストはひとつ以上存在することがあります。ここで価格リストの新バージョンを作成し管理することができます。バージョンのいくつかの例：2010年、2011"
+"年、夏季販売促進など"
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr ""
+msgstr "在庫可能製品"
 
 #. module: product
 #: field:product.packaging,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr ""
+msgstr "順序"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Calculate Product Price per Unit Based on Pricelist Version."
-msgstr ""
+msgstr "価格リストバージョンに基づく単位当りの製品価格の計算"
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr ""
+msgstr "出荷単位"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr ""
+msgstr "パートナ情報"
 
 #. module: product
 #: selection:product.ul,type:0
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
-msgstr ""
+msgstr "単位"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Information"
-msgstr ""
+msgstr "情報"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Products Listprices Items"
-msgstr ""
+msgstr "製品価格リスト項目"
 
 #. module: product
 #: view:product.packaging:0
 msgid "Other Info"
-msgstr ""
+msgstr "他の情報"
 
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr ""
+msgstr "価格リスト項目"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1064,21 +1087,23 @@ msgid ""
 "be converted to each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
 msgstr ""
+"システムで使用したい分類の単位を作成し管理します。同じ分類に幾つかの単位がある場合、それらは相互に変換できます。例えば、時間の単位には時間数や日数を持つこ"
+"とができます。"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "基準単位より大きい"
 
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "右親"
 
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "販売"
 
 #. module: product
 #: help:product.product,outgoing_qty:0
@@ -1093,26 +1118,31 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"出発予定の製品数量\n"
+"文脈で単数の在庫場所の場合、この場所または子の何れかの場所に出発する商品が含まれます。\n"
+"文脈で単数の倉庫の場合、この倉庫の在庫場所または子の何れかの場所に出発する商品が含まれます。\n"
+"文脈で単数の店の場合、この店の倉庫の在庫場所または子の何れかの場所に出発する商品が含まれます。\n"
+"そうでない場合、在庫場所タイプが内部となっている全ての場所に出発する商品が含まれます。"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "市場性のあるサービス"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr ""
+msgstr "追加料金の価格"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr ""
+msgstr "マザーボード ASUStek A7N8X"
 
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr ""
+msgstr "物流ユニット"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1126,12 +1156,12 @@ msgstr ""
 #: field:product.uom,name:0
 #: field:product.uom.categ,name:0
 msgid "Name"
-msgstr ""
+msgstr "名前"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "木材横木 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1142,6 +1172,8 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"購入または販売する全ての製品を定義する必要があります。製品は原材料、在庫可能製品、売り切り品、またはサービスです。製品フォームはその製品が関連する調達の物"
+"流、販売価格、商品分類、仕入先などについての詳細な情報を含みます。"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
@@ -1156,7 +1188,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,state:0
 msgid "Obsolete"
-msgstr ""
+msgstr "旧式"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_km
@@ -1169,61 +1201,61 @@ msgid ""
 "Standard Price: the cost price is fixed and recomputed periodically (usually "
 "at the end of the year), Average Price: the cost price is recomputed at each "
 "reception of products."
-msgstr ""
+msgstr "標準価格：コスト価格は固定されており、定期的に再計算されます（通常は年末）。平均価格：コスト価格は製品の到着毎に再計算されます。"
 
 #. module: product
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "製品分類のリストを表示する時に並び順を与えます。"
 
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
 msgid "Ratio"
-msgstr ""
+msgstr "比率"
 
 #. module: product
 #: help:product.template,purchase_ok:0
 msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
-msgstr ""
+msgstr "製品を発注オーダー行からの選択範囲内の製品のリストの中に見せるかどうかを決めて下さい。"
 
 #. module: product
 #: field:product.template,weight_net:0
 msgid "Net Weight"
-msgstr ""
+msgstr "正味重量"
 
 #. module: product
 #: field:product.packaging,width:0
 msgid "Width"
-msgstr ""
+msgstr "幅"
 
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr ""
+msgstr "製品フォームの中の関係項目"
 
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "調達方法"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Printing Date"
-msgstr ""
+msgstr "印刷日"
 
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr ""
+msgstr "販売単位"
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1232,27 +1264,29 @@ msgid ""
 "and the reception of goods for this product and for the default supplier. It "
 "is used by the scheduler to order requests based on reordering delays."
 msgstr ""
+"これはこの製品とデフォルト仕入先のための発注オーダーの確認から製品を受け取るまでの平均遅延日数です。これは再オーダーの遅延を元にしたオーダー要求のためにス"
+"ケジューラによって使用されます。"
 
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "仕入先リストの中で最も優先度を持つ主要仕入先"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
 #: view:product.product:0
 msgid "Services"
-msgstr ""
+msgstr "サービス"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "製品を作成またはインポート"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "他の価格リストであれば"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -1263,34 +1297,34 @@ msgstr ""
 #: model:ir.ui.menu,name:product.prod_config_main
 #: view:product.product:0
 msgid "Products"
-msgstr ""
+msgstr "製品"
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "パレットや箱の層の数"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "このルールによる価格計算のためのモード"
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr ""
+msgstr "パレットの寸法"
 
 #. module: product
 #: code:addons/product/product.py:668
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " （コピー）"
 
 #. module: product
 #: field:product.template,seller_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "パートナ"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1298,19 +1332,19 @@ msgid ""
 "This is the average delay in days between the confirmation of the customer "
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
-msgstr ""
+msgstr "これは顧客オーダーの確認から完成された製品の配達までの平均遅延日数です。これは顧客に約束する時間です。"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr ""
+msgstr "第２の単位"
 
 #. module: product
 #: code:addons/product/product.py:143
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1318,12 +1352,12 @@ msgstr ""
 #: model:ir.ui.menu,name:product.next_id_16
 #: view:product.uom:0
 msgid "Units of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr ""
+msgstr "最小数量"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
@@ -1335,22 +1369,22 @@ msgstr ""
 msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
-msgstr ""
+msgstr "この仕入先の製品コードは見積要求を印刷する時に使用されます。内部で使用するには空のままとします。"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "在庫の作成"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
-msgstr ""
+msgstr "価格リストバージョン"
 
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "利用可能数量"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1358,59 +1392,59 @@ msgid ""
 "Gives the order in which the pricelist items will be checked. The evaluation "
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
-msgstr ""
+msgstr "価格リスト項目がチェックされる順序を与えます。その評価は低い順序に最も高い優先度を与えます。そして、一致する項目が見つかると停止します。"
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr ""
+msgstr "売り切り品"
 
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "項目を表現する通貨"
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "総重量kg"
 
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr ""
+msgstr "横パネル"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr ""
+msgstr "調達"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Weights"
-msgstr ""
+msgstr "重量"
 
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "単位分類"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "ラック"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "支払単位"
 
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply Method"
-msgstr ""
+msgstr "供給方法"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1419,28 +1453,30 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"これは分類によって分類されたあなたの全ての製品のリストです。この分類またはこの分類の子にリンクした全ての製品のリストを得るために分類をクリックすることがで"
+"きます。"
 
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "グル―プ化…"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "定期的な処理の設定"
 
 #. module: product
 #: help:product.template,type:0
 msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
-msgstr ""
+msgstr "調達を処理する方法を変更します。売り切り品は在庫を管理しない製品です。"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: product
 #: help:product.template,produce_delay:0
@@ -1450,18 +1486,20 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"この製品の製造のための平均遅延日数。これは製造オーダーのためだけであり、もし複数レベルの部品表である場合は、その製品のレベルのためだけである。リードタイム"
+"は全てのレベルそして発注オーダーを合計したものである。"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr ""
+msgstr "ベーシック PC"
 
 #. module: product
 #: help:product.pricelist,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
-msgstr ""
+msgstr "アクティブ項目がFalseにセットされた場合は、価格リストを削除することなく非表示にできます。"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1471,53 +1509,53 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "製品単位"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "エラー：デフォルトの単位と仕入単位は同じ分類でなければいけません。"
 
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr ""
+msgstr "丸め精度"
 
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "単位属性"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "ラック 200cm"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Buy"
-msgstr ""
+msgstr "購入"
 
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr ""
+msgstr "単位の分類"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr ""
+msgstr "空のULの重量"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "木材 10mm"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "基準単位より小さい"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1526,42 +1564,42 @@ msgstr ""
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr ""
+msgstr "アクティブ"
 
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr ""
+msgstr "変化する利鞘"
 
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "単位の変換比率は0にできません。"
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "パッケージ単位のEANコード"
 
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "これは製品フォームから来ています。"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr ""
+msgstr "空のパッケージ重量"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr ""
+msgstr "製品項目"
 
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr ""
+msgstr "測定タイプ"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1569,80 +1607,82 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"この単位はこの分類の基準単位より何倍くらい小さいか：\n"
+"1 * （基準単位）  = 比率 * （この単位）"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 #: model:ir.ui.menu,name:product.menu_product_price_type
 msgid "Price Types"
-msgstr ""
+msgstr "価格タイプ"
 
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "全在庫操作のために使用されるデフォルト単位"
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "その他"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
 msgid "Customizable PC"
-msgstr ""
+msgstr "カスタマイズ可能 PC"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "単価"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
 msgid "Onsite Intervention"
-msgstr ""
+msgstr "現場調停"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr ""
+msgstr "公開価格リスト"
 
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "市場性のある製品"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "仕入先製品コード"
 
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr ""
+msgstr "デフォルト単位"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr ""
+msgstr "パレット"
 
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr ""
+msgstr "層別パッケージ"
 
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr ""
+msgstr "保証（月）"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his children. Keep empty for all products"
-msgstr ""
+msgstr "このルールが分類またはその子の製品にのみ適用される場合、製品の分類をセットして下さい。全ての製品に適用する場合は空のままとします。"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1654,90 +1694,90 @@ msgstr ""
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr ""
+msgstr "製品"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr ""
+msgstr "製造"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "オーダーの作成"
 
 #. module: product
 #: help:product.template,supply_method:0
 msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Buy will trigger purchase orders when requested."
-msgstr ""
+msgstr "製造は製品タイプによって製造オーダーまたはタスクを生成します。購入は発注オーダーが要求された時に行われます。"
 
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "変形"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr ""
+msgstr "分類別製品"
 
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr ""
+msgstr "単位 -> 販売単位係数"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "製品仕入先のリストに優先度を割り当てます。"
 
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit of Measure"
-msgstr ""
+msgstr "デフォルト単位"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
 msgid "ATX Mid-size Tower"
-msgstr ""
+msgstr "ATX ミッドサイズタワー"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rounding Method"
-msgstr ""
+msgstr "丸め方法"
 
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "組立サービス"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr ""
+msgstr "製品ラベル"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
 msgid "Box 30x40x60"
-msgstr ""
+msgstr "箱 30x40x60"
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Service"
-msgstr ""
+msgstr "サービス"
 
 #. module: product
 #: help:product.packaging,height:0
 msgid "The height of the package"
-msgstr ""
+msgstr "パッケージの高さ"
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr ""
+msgstr "製品価格リスト"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1747,109 +1787,109 @@ msgstr ""
 #: field:product.supplierinfo,company_id:0
 #: field:product.template,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: product
 #: help:product.template,list_price:0
 msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
-msgstr ""
+msgstr "顧客価格計算のための基本価格です。時々はカタログ価格と呼ばれます。"
 
 #. module: product
 #: code:addons/product/pricelist.py:376
 #, python-format
 msgid "Partner section of the product form"
-msgstr ""
+msgstr "製品フォームのパートナセクション"
 
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr ""
+msgstr "価格のこの種類の名前"
 
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "仕入単位"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "この価格リストバージョンを有効にするための開始日"
 
 #. module: product
 #: help:product.template,uom_po_id:0
 msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
-msgstr ""
+msgstr "発注オーダーに使われるデフォルト単位、それはデフォルト単位と同じ分類の中にある必要があります。"
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "この製品はプッシュ / プルフローの例とともに設定されます。"
 
 #. module: product
 #: field:product.packaging,length:0
 msgid "Length"
-msgstr ""
+msgstr "長さ"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "長さ / 距離"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr ""
+msgstr "現場で上級者の調停"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
 #: field:product.pricelist,type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "価格リストタイプ"
 
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "その他の製品"
 
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "カラーインデックス"
 
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "特性"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "販売可能"
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "製造リードタイム"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
 msgid "Supplier Pricelist"
-msgstr ""
+msgstr "仕入先価格リスト"
 
 #. module: product
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: product
 #: field:product.pricelist.item,base:0
 msgid "Based on"
-msgstr ""
+msgstr "基準"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
@@ -1859,24 +1899,24 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "原材料"
 
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "これは責任タスクとして使用されます。"
 
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "価格リスト名"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
 #: view:product.pricelist.version:0
 msgid "Pricelist Version"
-msgstr ""
+msgstr "価格リストバージョン"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1886,7 +1926,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "パッケージ、パレット、箱を含む全重量"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
@@ -1896,75 +1936,75 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
 msgid "Employee"
-msgstr ""
+msgstr "従業員"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "棚 100cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "製品分類"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "価格リスト名"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "配達リードタイム"
 
 #. module: product
 #: help:product.uom,active:0
 msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
-msgstr ""
+msgstr "アクティブ項目のチェックを外すことで、単位を削除することなく非表示にできます。"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "単位の分類"
 
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "仕入先ロードタイム"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
-msgstr ""
+msgstr "箱"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_ul_form_action
 msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
-msgstr ""
+msgstr "システムで維持管理したいパッケージの寸法とタイプを作成し管理します。"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "リアパネル SHE200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
 msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
-msgstr ""
+msgstr "コンテキストを基本にした特別価格を選択するためのコードに使用されます。変更しないで下さい。"
 
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "コンテキスト..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -1974,87 +2014,87 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "これはデフォルト単位に変換される数量です。"
 
 #. module: product
 #: field:product.packaging,ul:0
 msgid "Type of Package"
-msgstr ""
+msgstr "パッケージのタイプ"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr ""
+msgstr "梱包"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr ""
+msgstr "Dello コンピュータ"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
 msgid "Weight"
-msgstr ""
+msgstr "重量"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr ""
+msgstr "プロセッサオンデマンド"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "製品の仕入先"
 
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "画像"
 
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "単位タイプ"
 
 #. module: product
 #: help:product.product,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
-msgstr ""
+msgstr "アクティブ項目にFalseをセットすると、製品を削除することなく非表示にできます。"
 
 #. module: product
 #: help:product.uom,rounding:0
 msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
-msgstr ""
+msgstr "計算された数量はこの値の倍数のとなります。部分として分割できない単位は1.0を使用します。"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "説明"
 
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "行"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "リアパネル SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr ""
+msgstr "周辺装置と一緒の完全なPC"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "ホテル費用"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2062,21 +2102,23 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"この単位はこの分類の基準単位より何倍くらい大きいか：\n"
+"1 * （この単位）  = 比率 * （基準単位）"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "ラック 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
-msgstr ""
+msgstr "パッケージのリストを表示する時の並び順を与えます。"
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
 msgid "Price Rounding"
-msgstr ""
+msgstr "価格の丸め"
 
 #. module: product
 #: code:addons/product/pricelist.py:178
@@ -2085,59 +2127,61 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"価格表には１つも有効なものがありません。\n"
+"作成するか有効化して下さい。"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "最大利鞘"
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
 msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
-msgstr ""
+msgstr "見積要求を印刷する時には、この仕入先の製品名が使用されます。内部利用の時は空のままとします。"
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Variable"
-msgstr ""
+msgstr "可変"
 
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "レンタル可能"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
 #: field:product.template,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "原価"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr ""
+msgstr "最小利鞘"
 
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross Weight"
-msgstr ""
+msgstr "総重量"
 
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "組立セクション"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr ""
+msgstr "コンピュータスタッフ"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr ""
+msgstr "電話ヘルプ"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2145,48 +2189,48 @@ msgstr ""
 #: field:product.pricelist.item,sequence:0
 #: field:product.supplierinfo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "組立サービスコスト"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr ""
+msgstr "価格リスト項目"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr ""
+msgstr "RAMオンデマンド"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "売上属性"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr ""
+msgstr "遅延"
 
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "在庫品と売り切り品の両方"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "製品の創作"
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2196,7 +2240,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description:0
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: product
 #: field:product.packaging,ean:0
@@ -2206,7 +2250,7 @@ msgstr ""
 #. module: product
 #: view:product.template:0
 msgid "Product Description"
-msgstr ""
+msgstr "製品の詳細"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -2216,29 +2260,29 @@ msgstr ""
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "容量"
 
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "ケース"
 
 #. module: product
 #: view:product.product:0
 #: model:res.groups,name:product.group_product_variant
 msgid "Product Variant"
-msgstr ""
+msgstr "変形製品"
 
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "棚"
 
 #. module: product
 #: code:addons/product/pricelist.py:375
 #, python-format
 msgid "Other Pricelist"
-msgstr ""
+msgstr "その他の価格リスト"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -2246,28 +2290,28 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr ""
+msgstr "製品テンプレート"
 
 #. module: product
 #: field:product.template,cost_method:0
 msgid "Costing Method"
-msgstr ""
+msgstr "原価計算法"
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr ""
+msgstr "パレット輸送法"
 
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr ""
+msgstr "立方mの容量"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
-msgstr ""
+msgstr "ライフサイクルの終わり"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -2275,18 +2319,19 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"同じ製品を梱包するための異なる方法を提供します。これは集荷オーダーには影響を及ぼしません。また、EDIモジュールを使用する時に主に使用されます。"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action
 #: field:product.pricelist,version_id:0
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "価格リストバージョン"
 
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "棚パネル"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2295,26 +2340,29 @@ msgid ""
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
 msgstr ""
+"この値の倍数となる価格を設定します。\n"
+"丸めは割引後で追加料金の前に適用します。\n"
+"最終価格を9.99にするには、丸めを10に追加料金を-0.01とします。"
 
 #. module: product
 #: field:product.template,list_price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "販売価格"
 
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "エラー：再帰カテゴリーを作成することはできません。"
 
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "分類タイプ"
 
 #. module: product
 #: model:product.category,name:product.cat2
 msgid "Private"
-msgstr ""
+msgstr "非公開"
 
 #. module: product
 #: help:product.template,uos_coeff:0
@@ -2322,13 +2370,15 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"単位から販売単位に変換する係数\n"
+"　販売単位 = 単位 * 係数"
 
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
-msgstr ""
+msgstr "価格割引"
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index c401c4b1e88..f8a3e9ef5f9 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -12,14 +12,16 @@
             <field name="model">product.pricelist.version</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Pricelist Version">
-                    <field name="name" select="1"/>
-                    <field name="active"/>
-                    <field colspan="4" name="pricelist_id" select="1"/>
-                    <field name="date_start" select="1"/>
-                    <field name="date_end" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
+                <form string="Pricelist Version" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="active"/>
+                        <field colspan="4" name="pricelist_id"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <field name="items_id"/>
                 </form>
             </field>
         </record>
@@ -56,10 +58,10 @@
             <field name="arch" type="xml">
                 <tree string="Products Listprices Items">
                     <field name="sequence"/>
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name"/>
                     <field name="product_id"/>
-                    <field name="product_tmpl_id" select="1" groups="product.group_product_variant"/>
-                    <field name="categ_id" select="1"/>
+                    <field name="product_tmpl_id" groups="product.group_product_variant"/>
+                    <field name="categ_id"/>
                     <field name="min_quantity"/>
                     <field name="base"/>
                 </tree>
@@ -71,20 +73,22 @@
             <field name="model">product.pricelist.item</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Products Listprices Items">
-                    <separator colspan="4" string="Rules Test Match"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
-                    <field name="product_tmpl_id" select="1" groups="product.group_product_variant"/>
-                    <field name="categ_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="min_quantity"/>
-                    <field name="sequence"/>
-                    <separator colspan="4" string="Price Computation"/>
+                <form string="Products Listprices Items" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field colspan="4" name="name"/></h1>
 
-                    <field name="base"/>
-                    <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
+                    <group col="4">
+                        <field name="product_id" on_change="product_id_change(product_id)"/>
+                        <field name="product_tmpl_id" groups="product.group_product_variant"/>
+                        <field name="categ_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="min_quantity"/>
+                        <field name="sequence"/>
+                    </group>
+                    <group col="4" string="Price Computation">
+                        <field name="base"/>
+                        <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
+                    </group>
                     <group col="6" colspan="5">
                         <label string="New Price ="/>
                         <label string="Base Price"/>
@@ -135,19 +139,26 @@
             <field name="model">product.pricelist</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Products Price List">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="type" select="1"/>
-                    <field name="currency_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field colspan="4" name="version_id" nolabel="1">
-                        <form string="Pricelist Version">
-                            <field name="name" select="1"/>
-                            <field name="active"/>
-                            <field name="date_start" select="1"/>
-                            <field name="date_end" select="1"/>
-                            <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
+                <form string="Products Price List" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <group col="4">
+                        <field name="active"/>
+                        <field name="type"/>
+                        <field name="currency_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <field name="version_id">
+                        <form string="Pricelist Version" version="7.0">
+                            <group col="4">
+                                <field name="name"/>
+                                <field name="active"/>
+                                <field name="date_start"/>
+                                <field name="date_end"/>
+                            </group>
+                            <field name="items_id"/>
                         </form>
                         <tree string="Pricelist Version">
                             <field name="name"/>
@@ -188,11 +199,13 @@
             <field name="model">product.price.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Products Price Type">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="field"/>
-                    <field name="currency_id" select="1"/>
+                <form string="Products Price Type" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="active"/>
+                        <field name="field"/>
+                        <field name="currency_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -209,29 +222,5 @@
             action="product_price_type_action" id="menu_product_price_type"
             parent="product.menu_product_pricelist_main" sequence="4" groups="base.group_no_one"/>
 
-        <!-- Moved to extra module 'sale_pricelist_type_menu':
-        <record id="product_pricelist_type_view" model="ir.ui.view">
-            <field name="name">product.pricelist.type.form</field>
-            <field name="model">product.pricelist.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Pricelist Type">
-                    <field name="name" select="1"/>
-                    <field name="key"/>
-                </form>
-            </field>
-        </record>
-        <record id="product_pricelist_type_action" model="ir.actions.act_window">
-            <field name="name">Pricelists Types</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.pricelist.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-	<menuitem
-	    action="product_pricelist_type_action" id="menu_product_pricelist_type_action2"
-	    parent="product.menu_product_pricelist_main" sequence="2"/>-->
-
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6072aac86e6..c2b6663bdb0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -68,131 +68,119 @@
             <field name="type">form</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Product" layout="auto">
-                    <group colspan="4" col="8">
-                        <group colspan="4" col="2">
-                            <separator string="Name" colspan="2"/>
-                            <field name="name"/>
-                            <field groups="product.group_product_variant" name="variants" />
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Codes" colspan="2"/>
-                            <field name="default_code"/>
-                            <field name="ean13" placeholder="5901234123457" />
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Characteristics" colspan="2"/>
-                            <field name="sale_ok"/>
-                            <field name="purchase_ok"/>
-                        </group>
-                        <group colspan="1" col="1">
-                            <field name="product_image" widget='image' nolabel="1"/>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
+                <form string="Product" layout="auto" version="7.0">
+                    <field name="product_image" widget='image' class="oe_form_avatar oe_right"/>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="categ_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="categ_id"/></h2>
+
+                    <notebook>
                         <page string="Information">
-                            <group colspan="2" col="2">
-                                <separator string="Procurement" colspan="2"/>
-                                <field name="type"/>
-                                <field name="procure_method"/>
-                                <field name="supply_method"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Base Prices" colspan="2"/>
-                                <field name="list_price"/>
-                                <field name="cost_method"/>
-                                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                                <newline/>
-                                <field name="price_margin" groups="product.group_product_variant"/>
-                                <field name="price_extra" groups="product.group_product_variant"/>
-                            </group>
+                            <group>
+                                <group>
+                                    <field name="default_code"/>
+                                    <field name="ean13" placeholder="5901234123457" />
+                                    <field groups="product.group_product_variant" name="variants" />
+                                </group>
+                                <group>
+                                    <field name="sale_ok"/>
+                                    <field name="purchase_ok"/>
+                                </group>
+                                <group string="Procurement">
+                                    <field name="type"/>
+                                    <field name="procure_method"/>
+                                    <field name="supply_method"/>
+                                </group>
+                                <group string="Base Prices">
+                                    <field name="list_price"/>
+                                    <field name="cost_method"/>
+                                    <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                    <field name="price_margin" groups="product.group_product_variant"/>
+                                    <field name="price_extra" groups="product.group_product_variant"/>
+                                </group>
 
-                            <group colspan="2" col="2" groups="product.group_stock_packaging">
-                                <separator string="Weights" colspan="2"/>
-                                <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                                <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                                <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                            </group>
+                                <group groups="product.group_stock_packaging" string="Weights">
+                                    <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                    <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                    <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                                </group>
 
-                            <group colspan="2" col="2" name="status">
-                                <separator string="Status" colspan="2"/>
-                                <field name="categ_id"/>
-                                <field name="state"/>
-                                <field name="product_manager"/>
-                            </group>
+                                <group name="status" string="Status">
+                                    <field name="state"/>
+                                    <field name="product_manager"/>
+                                </group>
 
-                            <group colspan="2" col="2" name="uom" groups="product.group_uom">
-                                <separator string="Unit of Measure" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                <field name="uom_po_id"/>
-                            </group>
+                                <group name="uom" groups="product.group_uom" string="Unit of Measure">
+                                    <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                    <field name="uom_po_id"/>
+                                </group>
 
-                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
-                                <separator string="Second Unit of Measure" colspan="2"/>
-                                <field name="uos_id"/>
-                                <field name="uos_coeff"/>
-                                <field name="mes_type"/>
+                                <group name="uos" groups="product.group_uos" string="Second Unit of Measure">
+                                    <field name="uos_id"/>
+                                    <field name="uos_coeff"/>
+                                    <field name="mes_type"/>
+                                </group>
                             </group>
-
                         </page>
                         <page string="Procurement &amp; Locations">
-                            <group colspan="2" col="2" name="delay">
-                                <separator string="Delays" colspan="2"/>
-                                <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                <field name="warranty"/>
-                            </group>
-                            <group colspan="2" col="2" name="store">
-                                <separator string="Storage Localisation" colspan="2"/>
-                                <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
-                                <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                            </group>
-
-                            <group colspan="2" col="2" name="misc">
-                                <separator string="Miscellaneous" colspan="2"/>
-                                <field name="active"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group>
+                                <group name="delay" string="Delays">
+                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                    <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                    <field name="warranty"/>
+                                </group>
+                                <group name="store" string="Storage Localisation">
+                                    <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                    <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                    <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                </group>
+                                <group name="misc" string="Miscellaneous">
+                                    <field name="active"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                </group>
                             </group>
 
                         </page>
                         <page string="Suppliers">
-                            <field colspan="4" name="seller_ids" nolabel="1" context="{'uom_id': uom_id}"/>
+                            <field name="seller_ids" context="{'uom_id': uom_id}"/>
                         </page>
                         <page string="Descriptions">
                             <separator string="Description"/>
-                            <field colspan="4" name="description" nolabel="1"/>
+                            <field name="description"/>
                             <separator string="Sale Description"/>
-                            <field colspan="4" name="description_sale" nolabel="1" placeholder="This note will be displayed on quotations..."/>
+                            <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
                             <separator string="Purchase Description"/>
-                            <field colspan="4" name="description_purchase" nolabel="1" placeholder="This note will be displayed on requests for quotation..."/>
+                            <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
                         </page>
                         <page groups="product.group_stock_packaging" string="Packaging">
-                            <field colspan="4" name="packaging" nolabel="1">
-                                <form string="Packaging">
-                                    <field name="ean"/>
-                                    <field name="sequence" invisible="1"/>
-                                    <newline/>
-                                    <field name="qty"/>
-                                    <field name="ul"/>
-                                    <field name="weight_ul"/>
-                                    <separator colspan="4" string="Palletization"/>
-                                    <field name="ul_qty"/>
-                                    <field name="rows"/>
-                                    <field name="weight"/>
-                                    <separator colspan="4" string="Pallet Dimension"/>
-                                    <field name="height"/>
-                                    <field name="width"/>
-                                    <field name="length"/>
+                            <field name="packaging">
+                                <form string="Packaging" version="7.0">
+                                    <group col="4">
+                                        <field name="ean"/>
+                                        <field name="sequence" invisible="1"/>
+                                        <newline/>
+                                        <field name="qty"/>
+                                        <field name="ul"/>
+                                        <field name="weight_ul"/>
+                                        <separator colspan="4" string="Palletization"/>
+                                        <field name="ul_qty"/>
+                                        <field name="rows"/>
+                                        <field name="weight"/>
+                                        <separator colspan="4" string="Pallet Dimension"/>
+                                        <field name="height"/>
+                                        <field name="width"/>
+                                        <field name="length"/>
+                                    </group>
                                     <separator colspan="4" string="Description"/>
-                                    <field colspan="4" name="name" nolabel="1"/>
+                                    <field name="name"/>
                                 </form>
                             </field>
                         </page>
                     </notebook>
-                <div class="oe_form_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -316,12 +304,13 @@
             <field name="model">product.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product Categories">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="sequence" invisible="1"/>
-                    <field name="type"/>
-                    <newline/>
+                <form string="Product Categories" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="parent_id"/>
+                        <field name="sequence" invisible="1"/>
+                        <field name="type"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -360,7 +349,7 @@
             action="product_category_action"
             id="product.menu_products_category"
             parent="base.menu_product"
-            sequence="0"/>
+            sequence="0" groups="base.group_no_one"/>
         <record id="product_category_action_form" model="ir.actions.act_window">
             <field name="name">Product Categories</field>
             <field name="type">ir.actions.act_window</field>
@@ -411,30 +400,20 @@
             <field name="model">product.uom</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Units of Measure">
-                    <group col="6" colspan="4">
-                        <group col="2"  colspan="2">
-                            <separator string="Unit of Measure Properties" colspan="4"/>
-                            <field name="name" select="1"/>
-                            <field name="category_id" select="1" widget="selection"/>
+                <form string="Units of Measure" version="7.0">
+                    <group>
+                        <group string="Unit of Measure Properties">
+                            <field name="name"/>
+                            <field name="category_id"/>
                             <field name="active"/>
                         </group>
-                        <group col="4"  colspan="4">
-                            <separator string="Ratio &amp; Precision" colspan="4"/>
-                            <group colspan="2" col="2">
-                                 <field name="uom_type" on_change="onchange_type(uom_type)"/>
-                                 <field name="rounding"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                  <group col="2" colspan="2" attrs="{'invisible':[('uom_type','!=','smaller')]}">
-                                        <field name="factor"/>
-                                        <label colspan="2" string="  e.g: 1 * (reference unit) = ratio * (this unit)"/>
-                                   </group>
-                                   <group col="2" colspan="2" attrs="{'invisible':[('uom_type','!=','bigger')]}">
-                                        <field name="factor_inv"/>
-                                        <label colspan="2"  string="  e.g: 1 * (this unit) = ratio * (reference unit)"/>
-                                   </group>
-                            </group>
+                        <group string="Ratio &amp; Precision">
+                            <field name="uom_type" on_change="onchange_type(uom_type)"/>
+                            <field name="rounding"/>
+                            <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>
@@ -456,8 +435,10 @@
             <field name="model">product.uom.categ</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Units of Measure categories">
-                    <field colspan="4" name="name" select="1"/>
+                <form string="Units of Measure categories" version="7.0">
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -469,16 +450,18 @@
             <field name="view_mode">tree,form</field>
             <field name="help">Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category "Time", you will have the following UoM: Hours, Days.</field>
         </record>
-        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="product.group_uom"/>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="base.group_no_one"/>
 
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>
             <field name="model">product.ul</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packaging">
-                    <field name="name" select="1" />
-                    <field name="type" select="1" />
+                <form string="Packaging" version="7.0">
+                    <group>
+                        <field name="name" />
+                        <field name="type" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -488,8 +471,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
-                    <field name="name" select="1"/>
-                    <field name="type" select="1"/>
+                    <field name="name"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -523,25 +506,27 @@
             <field name="model">product.packaging</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packaging">
-                    <field name="product_id" select="1"/>
-                    <newline/>
-                    <field name="ean" select="1"/>
-                    <field name="sequence" invisible="1"/>
-                    <newline/>
-                    <field name="qty" select="1"/>
-                    <field name="ul"/>
-                    <field name="weight_ul"/>
-                    <separator colspan="4" string="Palletization"/>
-                    <field name="ul_qty"/>
-                    <field name="rows"/>
-                    <field name="weight"/>
-                    <separator colspan="4" string="Pallet Dimension"/>
-                    <field name="height"/>
-                    <field name="width"/>
-                    <field name="length"/>
-                    <separator colspan="4" string="Other Info"/>
-                    <field colspan="4" name="name" select="1"/>
+                <form string="Packaging" version="7.0">
+                    <group col="4">
+                        <field name="product_id"/>
+                        <newline/>
+                        <field name="ean"/>
+                        <field name="sequence" invisible="1"/>
+                        <newline/>
+                        <field name="qty"/>
+                        <field name="ul"/>
+                        <field name="weight_ul"/>
+                        <separator colspan="4" string="Palletization"/>
+                        <field name="ul_qty"/>
+                        <field name="rows"/>
+                        <field name="weight"/>
+                        <separator colspan="4" string="Pallet Dimension"/>
+                        <field name="height"/>
+                        <field name="width"/>
+                        <field name="length"/>
+                        <separator colspan="4" string="Other Info"/>
+                        <field colspan="4" name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -551,23 +536,27 @@
             <field name="model">product.supplierinfo</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Supplier Information">
-                    <field name="name" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}'/>
-                    <field name="sequence"/>
-                    <field name="product_name"/>
-                    <field name="product_code"/>
-                    <field name="min_qty"/>
-                    <field name="product_uom"/>
-                    <field name="delay"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field colspan="4" groups="product.group_sale_pricelist" name="pricelist_ids" nolabel="1" widget="one2many_list">
+                <form string="Supplier Information" version="7.0">
+                    <group col="4">
+                        <field name="name" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}'/>
+                        <field name="sequence"/>
+                        <field name="product_name"/>
+                        <field name="product_code"/>
+                        <field name="min_qty"/>
+                        <field name="product_uom"/>
+                        <field name="delay"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <field groups="product.group_sale_pricelist" name="pricelist_ids">
                         <tree editable="bottom" string="Pricelist">
                             <field name="min_quantity"/>
                             <field name="price"/>
                         </tree>
-                        <form>
-                            <field name="min_quantity"/>
-                            <field name="price"/>
+                        <form version="7.0">
+                            <group>
+                                <field name="min_quantity"/>
+                                <field name="price"/>
+                            </group>
                         </form>
                     </field>
                 </form>
@@ -593,13 +582,15 @@
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product Variant">
-                     <field name="product_tmpl_id" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="variants" select="1"/>
-                    <field name="default_code" select="1"/>
-                    <field name="price_margin" select="1"/>
-                    <field name="price_extra" select="1"/>
+                <form string="Product Variant" version="7.0">
+                    <group col="4">
+                        <field name="product_tmpl_id"/>
+                        <field name="active"/>
+                        <field name="variants"/>
+                        <field name="default_code"/>
+                        <field name="price_margin"/>
+                        <field name="price_extra"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -639,88 +630,79 @@
             <field name="model">product.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product Template">
-                    <group colspan="2" col="4">
-                        <separator string="Product Description" colspan="4"/>
-                        <field name="name" select="1"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Product Type" colspan="2"/>
-                        <field name="sale_ok"/>
-                        <field name="purchase_ok"/>
-                    </group>
-                    <notebook colspan="4">
+                <form string="Product Template" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="categ_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="categ_id"/></h2>
+                    <notebook>
                         <page string="Information">
-                            <group colspan="2" col="2">
-                                <separator string="Procurement" colspan="2"/>
+                        <group>
+                            <group string="Product Type">
+                                <field name="sale_ok"/>
+                                <field name="purchase_ok"/>
+                            </group>
+                            <group string="Procurement">
                                 <field name="type"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
                             </group>
 
-                            <group colspan="2" col="2">
-                                <separator string="Base Prices" colspan="2"/>
+                            <group string="Base Prices">
                                 <field name="list_price"/>
                                 <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                 <field name="cost_method"/>
                             </group>
 
-                            <group colspan="2" col="2">
-                                <separator string="Weights" colspan="2"/>
+                            <group string="Weights">
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                             </group>
 
-                            <group colspan="2" col="2" name="status">
-                                <separator string="Status" colspan="2"/>
-                                <field name="categ_id" select="1"/>
+                            <group name="status" string="Status">
+                                <field name="categ_id"/>
                                 <field name="state"/>
                                 <field name="product_manager"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uom">
-                                <separator string="Unit of Measure" colspan="2"/>
+                            <group name="uom" string="Unit of Measure">
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
                                 <field name="uom_po_id"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uos" groups="product.group_uom">
-                                <separator string="Second Unit of Measure" colspan="2"/>
+                            <group name="uos" groups="product.group_uom" string="Second Unit of Measure">
                                 <field name="uos_id"/>
                                 <field name="uos_coeff"/>
                                 <field name="mes_type"/>
                             </group>
-
+                        </group>
                         </page>
                         <page string="Procurement &amp; Locations">
-                            <group colspan="2" col="2" name="delay">
-                                <separator string="Delays" colspan="2"/>
-                                <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                <field name="produce_delay"/>
-                                <field name="warranty"/>
-                            </group>
-                            <group colspan="2" col="2" name="store">
-                                <separator string="Storage Localisation" colspan="2"/>
-                                <field name="loc_rack"/>
-                                <field name="loc_row"/>
-                                <field name="loc_case"/>
-                            </group>
-                            <group colspan="2" col="2" name="misc">
-                                <separator string="Miscelleanous" colspan="2"/>
+                            <group>
+                                <group name="delay" string="Delays">
+                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                    <field name="produce_delay"/>
+                                    <field name="warranty"/>
+                                </group>
+                                <group name="store" string="Storage Localisation">
+                                    <field name="loc_rack"/>
+                                    <field name="loc_row"/>
+                                    <field name="loc_case"/>
+                                </group>
                             </group>
 
                         </page>
                         <page string="Suppliers">
-                            <field colspan="4" name="seller_ids" nolabel="1"/>
+                            <field name="seller_ids"/>
                         </page>
                         <page string="Descriptions">
                             <separator string="Description"/>
-                            <field colspan="4" name="description" nolabel="1"/>
+                            <field name="description"/>
                             <separator string="Sale Description"/>
-                            <field colspan="4" name="description_sale" nolabel="1"/>
+                            <field name="description_sale"/>
                             <separator string="Purchase Description"/>
-                            <field colspan="4" name="description_purchase" nolabel="1"/>
+                            <field name="description_purchase"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 4620c8c4a2c..5b966c6ca2c 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -4,35 +4,35 @@
 
     <!--   Product Price List -->
 
-		<record id="view_product_price_list" model="ir.ui.view">
-		      <field name="name">Price per unit</field>
-		      <field name="model">product.price_list</field>
-		      <field name="type">form</field>
-		      <field name="arch" type="xml">
-				<form string="Price List">
-                    <separator colspan="4" string="Calculate Product Price per Unit Based on Pricelist Version."/>
-				    <field name="price_list" widget="selection"/>
-				    <field name="qty1" colspan="2" />
-				    <field name="qty2" colspan="2" />
-				    <field name="qty3" colspan="2" />
-				    <field name="qty4" colspan="2" />
-				    <field name="qty5" colspan="2" />
-					<separator colspan="4"/>
-                    <group col="2" colspan="4">
-                         <button icon="gtk-cancel" special="cancel" string="Close"/>
-                         <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
+        <record id="view_product_price_list" model="ir.ui.view">
+              <field name="name">Price per unit</field>
+              <field name="model">product.price_list</field>
+              <field name="type">form</field>
+              <field name="arch" type="xml">
+                <form string="Price List" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button name="print_report" string="Print"  type="object"  icon="gtk-print"/>
+                    </header>
+                    <group string="Calculate Product Price per Unit Based on Pricelist Version.">
+                        <field name="price_list" widget="selection"/>
+                        <field name="qty1"/>
+                        <field name="qty2"/>
+                        <field name="qty3"/>
+                        <field name="qty4"/>
+                        <field name="qty5"/>
                     </group>
-				</form>
-		      </field>
-    	</record>
+                </form>
+              </field>
+        </record>
 
         <act_window id="action_product_price_list"
-    		key2="client_print_multi"
+            key2="client_print_multi"
             name="Price List"
-    		res_model="product.price_list"
+            res_model="product.price_list"
             src_model="product.product"
             groups="product.group_sale_pricelist"
-    		view_mode="form" target="new" view_type="form" />
+            view_mode="form" target="new" view_type="form" />
 
 </data>
 </openerp>
diff --git a/addons/product_expiry/i18n/ja.po b/addons/product_expiry/i18n/ja.po
new file mode 100644
index 00000000000..96d82658d2e
--- /dev/null
+++ b/addons/product_expiry/i18n/ja.po
@@ -0,0 +1,160 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-08 17:09+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-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_stock_production_lot
+msgid "Production lot"
+msgstr "製造ロット"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "ハム"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "牛乳"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product Life Time"
+msgstr "製品有効時間"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"The date on which the lot starts deteriorating without becoming dangerous."
+msgstr "危険に陥ることなくロットの悪化が始まる日付"
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product Use Time"
+msgstr "製品使用時間"
+
+#. module: product_expiry
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr "シリアル番号と内部参照番号は固有である必要があります。"
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date on which the lot should be removed."
+msgstr "ロットが削除されるべき日"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_product_product
+msgid "Product"
+msgstr "製品"
+
+#. module: product_expiry
+#: help:product.product,alert_time:0
+msgid ""
+"The number of days after which an alert should be notified about the "
+"production lot."
+msgstr "製造ロットについて警告が知らされるべきまでの日数"
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product Removal Time"
+msgstr "製品の撤去時間"
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "撤去日"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"The date on which the lot may become dangerous and should not be consumed."
+msgstr "ロットが危険になり消費されるべきでなくなる日付"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "パン"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "日付"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "消費期限"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "賞味期限"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "フランスのカマンベールチーズ"
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr "製造ロットが撤去されるまでの日数"
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "警告日"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr "製造ロットが危険にならず悪化を開始するまでの日数"
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr "製品ロットが危険になり消費されるべきでなくなる日数"
+
+#. module: product_expiry
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"The date on which an alert should be notified about the production lot."
+msgstr "製造ロットについて警告が知らされるべき日付"
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product Alert Time"
+msgstr "製品警告時間"
diff --git a/addons/product_manufacturer/i18n/ja.po b/addons/product_manufacturer/i18n/ja.po
new file mode 100644
index 00000000000..34afd8b8c3a
--- /dev/null
+++ b/addons/product_manufacturer/i18n/ja.po
@@ -0,0 +1,77 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-08 17:13+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-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "製造者製品コード"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "製品テンプレート名"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "製品属性"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "製品属性"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "属性"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "値"
+
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "属性"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "製造者製品名"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "製造者"
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 0f901173caa..4a19996af66 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -44,9 +44,11 @@
             <field name="model">product.manufacturer.attribute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Product Template Name">
-                    <field name="name"/>
-                    <field name="value"/>
+                <form string="Product Template Name" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="value"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/product_margin/i18n/ja.po b/addons/product_margin/i18n/ja.po
new file mode 100644
index 00000000000..f19f3c439b2
--- /dev/null
+++ b/addons/product_margin/i18n/ja.po
@@ -0,0 +1,279 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-08 17:54+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-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "取引高"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr "期待される利鞘（%）"
+
+#. module: product_margin
+#: field:product.margin,from_date:0
+msgid "From"
+msgstr "開始"
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr "顧客請求書の販売カタログ価格と数量の乗算合計"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnorder - Standard price"
+msgstr "売上高 - 標準価格"
+
+#. module: product_margin
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "終了"
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "To Date"
+msgstr "終了日"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "From Date"
+msgstr "開始日"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "ドラフトと開始と支払済"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "平均単価"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "製品"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "カタログ価格"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "支払済"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Expected Sale - Turn Over"
+msgstr "予想販売 - 売上高"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "予想販売"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "標準価格"
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr "仕入先請求書の数量合計"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
+msgstr "仕入先請求書のコスト価格と数量の乗算合計"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr "予想販売 - 通常コスト"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
+msgstr "請求済数"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "合計コスト"
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "予想利鞘"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr "仕入済数"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Customer Invoices"
+msgstr "顧客請求書の請求書価格と数量の乗算合計"
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr "予想利鞘 * 100 / 予想販売"
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices)"
+msgstr "顧客請求書の平均価格）"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
+msgstr "仕入先請求書の請求書価格と数量の乗算合計 "
+
+#. module: product_margin
+#: field:product.margin,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr "請求書の状態"
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr "通常コスト - 合計コスト"
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "合計利鞘"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "販売ギャップ"
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "通常コスト"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "仕入"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "仕入先請求書の平均価格 "
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Properties categories"
+msgstr "属性の分類"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr "合計利鞘 * 100 / 売上高"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "分析基準"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "開始と支払済"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "売上"
+
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "製品利鞘"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "一般情報"
+
+#. module: product_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "仕入ギャップ"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin (%)"
+msgstr "合計利鞘（%）"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr "利鞘を開く"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "利鞘"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr "顧客請求書の数量合計"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "製品利鞘"
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 6c083bca6b0..c3dc2526e63 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -21,40 +21,41 @@
             <field name="type">form</field>
             <field name="priority">50</field>
             <field name="arch" type="xml">
-                 <form string="Product Margins">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="default_code" select="1"/>
+                 <form string="Product Margins" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="default_code"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                     <page string="Margins">
-                        <separator string="Analysis Criteria" colspan="4"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <newline/>
-                        <field name="invoice_state" />
+                        <group string="Analysis Criteria">
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                            <newline/>
+                            <field name="invoice_state" />
 
-                        <separator string="Sales" colspan="4"/>
-                        <field name="sale_avg_price"/>
-                        <field name="list_price" string="Catalog Price" readonly="1"/>
-                        <field name="sale_num_invoiced" />
-                        <field name="sales_gap" />
-                        <field name="turnover" />
-                        <field name="sale_expected" />
+                            <separator string="Sales" colspan="4"/>
+                            <field name="sale_avg_price"/>
+                            <field name="list_price" string="Catalog Price" readonly="1"/>
+                            <field name="sale_num_invoiced" />
+                            <field name="sales_gap" />
+                            <field name="turnover" />
+                            <field name="sale_expected" />
 
-                        <separator string="Purchases" colspan="4"/>
-                        <field name="purchase_avg_price"/>
-                        <field name="standard_price" string="Standard Price" readonly="1"/>
-                        <field name="purchase_num_invoiced" />
-                        <field name="purchase_gap" />
-                        <field name="total_cost" />
-                        <field name="normal_cost" />
+                            <separator string="Purchases" colspan="4"/>
+                            <field name="purchase_avg_price"/>
+                            <field name="standard_price" string="Standard Price" readonly="1"/>
+                            <field name="purchase_num_invoiced" />
+                            <field name="purchase_gap" />
+                            <field name="total_cost" />
+                            <field name="normal_cost" />
 
-                        <separator string="Margins" colspan="4"/>
-                        <field name="total_margin"/>
-                        <field name="expected_margin"/>
-                        <field name="total_margin_rate" widget="progressbar"/>
-                        <field name="expected_margin_rate" widget="progressbar"/>
+                            <separator string="Margins" colspan="4"/>
+                            <field name="total_margin"/>
+                            <field name="expected_margin"/>
+                            <field name="total_margin_rate" widget="progressbar"/>
+                            <field name="expected_margin_rate" widget="progressbar"/>
+                         </group>
                     </page>
                     </notebook>
                 </form>
@@ -68,8 +69,8 @@
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <tree string="Product Margins">
-                    <field name="name" select="1"/>
-                    <field name="default_code" select="1"/>
+                    <field name="name"/>
+                    <field name="default_code"/>
                     <field name="sale_avg_price"/>
                     <field name="sale_num_invoiced"/>
                     <field name="turnover" sum="Turnover"/>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 20a38148d3d..69ff481ce95 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-     	<record id="product_margin_form_view" model="ir.ui.view">
+         <record id="product_margin_form_view" model="ir.ui.view">
             <field name="name">product.margin.form</field>
             <field name="model">product.margin</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Properties categories">
-                    <separator colspan="4" string="General Information"/>
-					<field name="from_date" />
-					<field name="to_date" />
-					<field name="invoice_state" />
-					<separator colspan="4" string=""/>						
-					<group col="4" colspan="2">
-                		<button icon='gtk-cancel' special="cancel" string="Cancel" />
-				    	<button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
-					</group>
+                <form string="Properties categories" version="7.0">
+                    <header>
+                        <button name="action_open_window" string="Open Margins" type="object" icon="gtk-execute"/>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                    </header>
+                    <group col="4" string="General Information">
+                        <field name="from_date" />
+                        <field name="to_date" />
+                        <field name="invoice_state" />
+                    </group>
                 </form>
             </field>
         </record>
-  		        
-		<act_window name="Product Margins"
-			res_model="product.margin"
-			src_model="product.product"
-			view_mode="form"
-			target="new"
-			key2="client_action_multi"    
-			id="product_margin_act_window"/>	
-			       
+
+        <act_window name="Product Margins"
+            res_model="product.margin"
+            src_model="product.product"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="product_margin_act_window"/>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/product_visible_discount/i18n/ja.po b/addons/product_visible_discount/i18n/ja.po
new file mode 100644
index 00000000000..2576dec0ae3
--- /dev/null
+++ b/addons/product_visible_discount/i18n/ja.po
@@ -0,0 +1,62 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-08 17:59+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-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:153
+#, python-format
+msgid "No Sale Pricelist Found!"
+msgstr "販売価格リストが見つかりません。"
+
+#. module: product_visible_discount
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "明示的割引"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:145
+#, python-format
+msgid "No Purchase Pricelist Found!"
+msgstr "仕入価格リストが見つかりません。"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "請求書行"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "価格リスト"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:145
+#, python-format
+msgid "You must first define a pricelist on the supplier form!"
+msgstr "最初に仕入先フォーム上で価格リストを定義する必要があります。"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:153
+#, python-format
+msgid "You must first define a pricelist on the customer form!"
+msgstr "最初に顧客フォーム上で価格リストを定義する必要があります。"
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index a4b302f33f2..f9f9841c0dc 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -75,7 +75,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board" layout="manual">
+                <form string="My Board" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
new file mode 100644
index 00000000000..831e07030f0
--- /dev/null
+++ b/addons/project/i18n/ja.po
@@ -0,0 +1,1968 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-09 21:05+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "New tasks"
+msgstr "新規タスク"
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr "ユーザのタスクの中にタスクの説明を再登録"
+
+#. module: project
+#: code:addons/project/project.py:951
+#, python-format
+msgid "The task '%s' has been delegated to %s."
+msgstr "タスク %s は %s に委任されています。"
+
+#. module: project
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Previous Month"
+msgstr "前月"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My tasks"
+msgstr "私のタスク"
+
+#. module: project
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
+msgstr "パートナに警告"
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr "タスクを閉じるために必要な残り時間数を入力して下さい。"
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr "締切"
+
+#. module: project
+#: code:addons/project/project.py:155
+#, python-format
+msgid "Operation Not Permitted !"
+msgstr "操作は許されていません。"
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:69
+#: code:addons/project/wizard/project_task_delegate.py:70
+#: code:addons/project/wizard/project_task_delegate.py:77
+#: code:addons/project/wizard/project_task_delegate.py:78
+#, python-format
+msgid "CHECK: "
+msgstr "確認： "
+
+#. module: project
+#: field:project.task,user_email:0
+msgid "User Email"
+msgstr "ユーザのEメール"
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr "行う作業"
+
+#. module: project
+#: code:addons/project/project.py:358 code:addons/project/project.py:789
+#: code:addons/project/project.py:1148
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr "タスクの委任"
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr "検証時間数"
+
+#. module: project
+#: view:project.project:0
+msgid "Pending Projects"
+msgstr "保留中プロジェクト"
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr "合計残り時間は定期的にタスクの割当者によって再評価されます。"
+
+#. module: project
+#: view:project.project:0
+msgid "Re-open project"
+msgstr "プロジェクトの再開"
+
+#. module: project
+#: help:project.project,priority:0
+msgid "Gives the sequence order when displaying the list of projects"
+msgstr "プロジェクトのリストを表示する時に並び順を与えます。"
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr "再評価タスク"
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr "プロジェクトメンバー"
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr "委任によるタスク"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr "委任されたタスク"
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "委任されたタスク"
+
+#. module: project
+#: help:project.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr "タスクが閉じられた時に顧客に送信される警告メッセージのためのEメールの最初にヘッダーを追加しました。"
+
+#. module: project
+#: view:project.task:0 view:project.task.history.cumulative:0
+msgid "My Tasks"
+msgstr "私のタスク"
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project
+#: field:project.task,company_id:0 field:project.task.work,company_id:0
+#: view:report.project.task.user:0 field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Pending tasks"
+msgstr "保留中タスク"
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr "タスクタイトル"
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr "工程名"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr "保留中をセット"
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Important"
+msgstr "重要"
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr "要求を定義し計画時間数をセットします。"
+
+#. module: project
+#: view:project.task:0
+msgid "Change Stage"
+msgstr "工程変更"
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr "テンプレートを基本とした新プロジェクト"
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr "非常に緊急"
+
+#. module: project
+#: help:project.task.delegate,project_id:0
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr "このタスクを委任したいユーザ"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr "私のタスク"
+
+#. module: project
+#: view:report.project.task.user:0 field:report.project.task.user,day:0
+#: field:task.by.days,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_project_config_project
+msgid "Projects and Stages"
+msgstr "プロジェクトと工程"
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr "テンプレートとしてセット"
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr "ドラフトタスク"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: field:project.task.history,task_id:0
+#: field:project.task.history.cumulative,task_id:0
+#: field:project.task.work,task_id:0 view:report.project.task.user:0
+msgid "Task"
+msgstr "タスク"
+
+#. module: project
+#: view:project.project:0
+msgid "Members"
+msgstr "メンバー"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.my_open_tasks_action
+msgid "My Open Tasks"
+msgstr "実行中の私のタスク"
+
+#. module: project
+#: code:addons/project/wizard/mail_compose_message.py:43
+#, python-format
+msgid ""
+"Please specify the Project Manager or email address of Project Manager."
+msgstr "プロジェクトマネジャまたはプロジェクトマネジャのEメールアドレスを指定して下さい。"
+
+#. module: project
+#: view:project.task:0
+msgid "For cancelling the task"
+msgstr "タスクキャンセルのため"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr "プロジェクトタスク作業"
+
+#. module: project
+#: view:project.project:0 view:project.task:0 field:project.task,notes:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs remaining hours"
+msgstr "プロジェクト対残り時間数"
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "平均計画実行"
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+"この項目は自動的に計算され、ブール値のアクティブ項目と同じ振る舞いをします：タスクがテンプレートまたは非アクティブプロジェクトとリンクされると、特に尋ねら"
+"寝ない場合はそれは非表示になります。"
+
+#. module: project
+#: field:project.task,name:0 field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr "タスク概要"
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr "非テンプレートタスク"
+
+#. module: project
+#: view:project.task:0 view:res.partner:0
+msgid "Start Task"
+msgstr "タスク開始"
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr "タスクは完了しました。"
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Automatic variables for headers and footer. Use exactly the same notation."
+msgstr "ヘッダーとフッターの自動変数。完全に同じ記述法を使います。"
+
+#. module: project
+#: view:project.task:0
+msgid "Show only tasks having a deadline"
+msgstr "締切を持つタスクのみ表示"
+
+#. module: project
+#: selection:project.task,state:0 selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.vs.hours,state:0
+#: selection:report.project.task.user,state:0 selection:task.by.days,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: project
+#: field:project.task,date_end:0 field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr "終了日"
+
+#. module: project
+#: view:project.project:0 field:project.project,warn_header:0
+msgid "Mail Header"
+msgstr "メールヘッダー"
+
+#. module: project
+#: view:project.task:0
+msgid "Change to Next Stage"
+msgstr "次の工程へ変更"
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr "完了タスク"
+
+#. module: project
+#: field:project.task,color:0
+msgid "Color Index"
+msgstr "カラーインデックス"
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
+msgid "Configuration"
+msgstr "設定"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Current Month"
+msgstr "今月"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr "他ユーザへの委任タスク"
+
+#. module: project
+#: view:project.project:0 view:project.task:0 view:report.project.task.user:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr "実施者"
+
+#. module: project
+#: help:project.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr "これをチェックすると、顧客へEメールにより送信されるメッセージを提案するタスクを閉じる時に、ユーザはポップアップを持ちます。"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr "テスト"
+
+#. module: project
+#: code:addons/project/project.py:829
+#, python-format
+msgid "Task '%s' closed"
+msgstr "タスク %s を閉じられました。"
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+#: field:project.project,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "タスク作業完了の合計を使用して計算されます。"
+
+#. module: project
+#: view:project.task:0
+msgid "Planning"
+msgstr "計画"
+
+#. module: project
+#: view:project.task:0 field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr "締切"
+
+#. module: project
+#: view:project.task.delegate:0 view:project.task.reevaluate:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Ready"
+msgstr "準備完了"
+
+#. module: project
+#: view:project.task:0
+msgid "Change Color"
+msgstr "色の変更"
+
+#. module: project
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "エラー。再帰的な分析アカウントを作ることはできません。"
+
+#. module: project
+#: code:addons/project/project.py:264 code:addons/project/project.py:303
+#, python-format
+msgid " (copy)"
+msgstr " （コピー）"
+
+#. module: project
+#: view:project.task:0
+msgid "New Tasks"
+msgstr "新規タスク"
+
+#. module: project
+#: view:report.project.task.user:0 field:report.project.task.user,nbr:0
+msgid "# of tasks"
+msgstr "タスク数"
+
+#. module: project
+#: view:project.task:0
+msgid "Previous"
+msgstr "前へ"
+
+#. module: project
+#: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr "割当先"
+
+#. module: project
+#: view:project.project:0
+msgid "Date Stop: %(date)s"
+msgstr "停止日：%(date)s"
+
+#. module: project
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは２つのユーザを持てません。"
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr "プロジェクトとしてリセット"
+
+#. module: project
+#: view:project.project:0 selection:project.vs.hours,state:0
+msgid "Template"
+msgstr "テンプレート"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_project
+msgid "My projects"
+msgstr "私のプロジェクト"
+
+#. module: project
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: project
+#: view:project.task:0
+msgid "Next"
+msgstr "次へ"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr "ドラフト状態から開いた状態になります。"
+
+#. module: project
+#: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr "日数"
+
+#. module: project
+#: view:project.project:0
+msgid "Open Projects"
+msgstr "プロジェクトを開く"
+
+#. module: project
+#: code:addons/project/project.py:358
+#, python-format
+msgid "You must assign members on the project '%s' !"
+msgstr "プロジェクト %s にメンバーを割り当てる必要があります。"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress tasks"
+msgstr "進行中のタスク"
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr "タスクのパーセントはToDoタスクの合計に応じて決められます。"
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr "新規タスク詳細"
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr "プロジェクトタスク"
+
+#. module: project
+#: view:project.task:0 selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: view:report.project.task.user:0
+msgid "New"
+msgstr "新規"
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr "計算式：消費時間 + 残り時間"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
+#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
+msgid "Cumulative Flow"
+msgstr "累積フロー"
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "有効時間数"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr "検証タスクタイトル"
+
+#. module: project
+#: view:project.task:0
+msgid "Reevaluate"
+msgstr "再評価"
+
+#. module: project
+#: code:addons/project/project.py:597
+#, python-format
+msgid "%s (copy)"
+msgstr "%s（コピー）"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr "期限超過遅延"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr "中程度"
+
+#. module: project
+#: view:project.task:0 view:project.task.history.cumulative:0
+msgid "Pending Tasks"
+msgstr "保留中タスク"
+
+#. module: project
+#: view:project.task:0 field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: field:project.vs.hours,remaining_hours:0 view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "残り時間数"
+
+#. module: project
+#: model:ir.model,name:project.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr "Eメール作成ウィザード"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: project
+#: view:project.task:0 field:project.task.history,remaining_hours:0
+#: field:project.task.history.cumulative,remaining_hours:0
+msgid "Remaining Time"
+msgstr "残り時間"
+
+#. module: project
+#: field:project.project,planned_hours:0
+#: field:project.task.history,planned_hours:0
+#: field:project.task.history.cumulative,planned_hours:0
+msgid "Planned Time"
+msgstr "計画時間"
+
+#. module: project
+#: view:project.task:0
+msgid "Information"
+msgstr "情報"
+
+#. module: project
+#: view:project.task:0 view:project.task.history.cumulative:0
+msgid "Unassigned Tasks"
+msgstr "未割当タスク"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr "ユーザに未割当のタスク"
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr "このプロジェクトとその子のプロジェクトに関連した全てのタスクの計画時間数合計です。"
+
+#. module: project
+#: view:project.project:0 view:project.task:0 selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: view:project.task.history.cumulative:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.vs.hours,state:0 view:report.project.task.user:0
+#: selection:report.project.task.user,state:0 selection:task.by.days,state:0
+msgid "Pending"
+msgstr "保留中"
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr "委任されたタイトル"
+
+#. module: project
+#: view:project.task:0 view:project.task.history.cumulative:0
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr "私のプロジェクト"
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: project
+#: view:project.task.history.burndown:0
+msgid "Burndown Chart of Tasks"
+msgstr "タスクのバーンダウンチャート"
+
+#. module: project
+#: field:project.task,date_start:0 field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr "開始日"
+
+#. module: project
+#: code:addons/project/project.py:324
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_open_view_project_all
+#: view:project.project:0 field:project.task.type,project_ids:0
+#, python-format
+msgid "Projects"
+msgstr "プロジェクト"
+
+#. module: project
+#: view:project.task:0 field:project.task,type_id:0
+#: field:project.task.history,type_id:0
+#: field:project.task.history.cumulative,type_id:0
+#: view:report.project.task.user:0 field:report.project.task.user,type_id:0
+msgid "Stage"
+msgstr "工程"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"Define the steps that will be used in the project from the creation of the "
+"task, up to the closing of the task or issue. You will use these stages in "
+"order to track the progress in solving a task or an issue."
+msgstr ""
+"タスクの生成からタスクや問題を閉じるまでのプロジェクトの中で使用される工程を定義します。これらの行程はタスクや問題を解決する経過を追跡するために使われます"
+"。"
+
+#. module: project
+#: code:addons/project/project.py:903
+#, python-format
+msgid "The task '%s' is opened."
+msgstr "タスク %s は開かれています。"
+
+#. module: project
+#: view:project.task:0
+msgid "Dates"
+msgstr "日付"
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr "ユーザに委任されたタスクの新規タイトル"
+
+#. module: project
+#: code:addons/project/project.py:155
+#, python-format
+msgid ""
+"You cannot delete a project containing tasks. I suggest you to desactivate "
+"it."
+msgstr "タスクを含むプロジェクトは削除できません。それを無効化することを推奨します。"
+
+#. module: project
+#: view:project.vs.hours:0
+msgid "Project vs Planned and Total Hours"
+msgstr "プロジェクト対計画、合計時間数"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr "タスクを開くのドラフト"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr "遅延時間数"
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr "非常に重要"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr "タスク分析"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr "委任"
+
+#. module: project
+#: help:project.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive an email each time "
+"a task is completed by his team."
+msgstr "この項目をチェックすると、プロジェクトマネジャは彼のチームによるタスクの完了を、その都度Eメールで受け取ります。"
+
+#. module: project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0 view:project.task:0 field:project.task,project_id:0
+#: field:project.task.delegate,project_id:0
+#: field:project.task.history.cumulative,project_id:0
+#: field:project.vs.hours,project:0 view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+#: field:res.users,context_project_id:0 field:task.by.days,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr "評価"
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr "私のボード"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+#: model:ir.ui.menu,name:project.menu_task_types_view
+msgid "Stages"
+msgstr "工程"
+
+#. module: project
+#: view:project.task:0
+msgid "Change to Previous Stage"
+msgstr "前工程へ変更"
+
+#. module: project
+#: model:ir.actions.todo.category,name:project.category_project_config
+#: view:res.company:0
+msgid "Project Management"
+msgstr "プロジェクト管理"
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr "プロジェクト時間単位"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress"
+msgstr "進行中"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr "プロジェクトタスクの委任"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:ir.ui.menu,name:project.menu_tasks_config
+#: model:ir.ui.menu,name:project.project_report_task
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.task:0 view:res.partner:0 field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr "タスク"
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr "親"
+
+#. module: project
+#: view:project.task:0
+msgid "Mark as Blocked"
+msgstr "ブロックとマーク"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"A task represents a work that has to be done. Each user works in his own "
+"list of tasks where he can record his task work in hours. He can work and "
+"close the task itself or delegate it to another user. If you delegate a task "
+"to another user, you get a new task in pending state, which will be reopened "
+"when you have to review the work achieved. If you install the "
+"project_timesheet module, task work can be invoiced based on the project "
+"configuration. With the project_mrp module, sales orders can create tasks "
+"automatically when they are confirmed."
+msgstr ""
+"タスクとは終わらせるべき作業を表します。各ユーザはタスク作業を時間で記録したタスクの自身のリストの中で作業します。自身で作業を行いタスクを閉じることもでき"
+"ますし、他のユーザに委任することもできます。他のユーザにタスクを委任した場合、あなたは作業達成のレビューを行う時に再度開かれる保留中状態の新規タスクを取得"
+"します。プロジェクトタイムシートモジュールをインストールしたなら、タスク作業はプロジェクト設定を元として請求がなされます。プロジェクトMRPモジュールがと"
+"もにある場合、彼らが確認した時に受注オーダーは自動的にタスクを生成します。"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr "進捗（%）"
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"If the task is created the state is 'Draft'.\n"
+" If the task is started, the state becomes 'In Progress'.\n"
+" If review is needed the task is in 'Pending' state.                         "
+"         \n"
+" If the task is over, the states is set to 'Done'."
+msgstr ""
+"タスクは作成されると、ドラフト状態になります。\n"
+"　タスクが開始されると、進行中状態になります。\n"
+"　レビューが必要とされると、保留中状態になります。\n"
+"　タスクが完了すると、完了状態にセットされます。"
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluate Task"
+msgstr "再評価タスク"
+
+#. module: project
+#: view:project.task.history.cumulative:0 view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+#: view:project.task.type:0
+msgid "Task Stage"
+msgstr "タスク工程"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Design"
+msgstr "デザイン"
+
+#. module: project
+#: field:project.task,planned_hours:0
+#: field:project.task.delegate,planned_hours:0
+#: field:project.vs.hours,planned_hours:0 view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr "計画時間数"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_review_task_stage
+msgid "Review Task Stages"
+msgstr "タスク工程のレビュー"
+
+#. module: project
+#: view:project.project:0
+msgid "Status: %(state)s"
+msgstr "状態：%(state)s"
+
+#. module: project
+#: help:project.task,sequence:0
+msgid "Gives the sequence order when displaying a list of tasks."
+msgstr "タスクリストを表示する時に並び順を与えます。"
+
+#. module: project
+#: view:project.project:0 view:project.task:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: project
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Ready To Pull"
+msgstr "引上準備完了"
+
+#. module: project
+#: view:project.task:0 field:project.task,parent_ids:0
+msgid "Parent Tasks"
+msgstr "親タスク"
+
+#. module: project
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: view:project.task.history.cumulative:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Blocked"
+msgstr "ブロック"
+
+#. module: project
+#: help:project.task,progress:0
+msgid ""
+"If the task has a progress of 99.99% you should close the task if it's "
+"finished or reevaluate the time"
+msgstr "タスクが99.99%の進捗である時に、それが終了しているかまたは時間の再評価中であればそのタスクを閉じるべきです。"
+
+#. module: project
+#: view:project.project:0
+msgid "Contact Address"
+msgstr "コンタクト先住所"
+
+#. module: project
+#: help:project.task,kanban_state:0
+msgid ""
+"A task's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this task\n"
+" * Ready To Pull indicates the task is ready to be pulled to the next stage"
+msgstr ""
+"タスクのかんばん状態はそれに影響する特殊な状況を示します：\n"
+"　* 通常：デフォルト状況です。\n"
+"　* プロック： このタスクの進行を妨げている何かを示します。\n"
+"　* 引上準備完了：タスクは次の工程へ引き上げられる準備ができたことを示します。"
+
+#. module: project
+#: view:project.project:0
+msgid "User: %(user_id)s"
+msgstr "ユーザ：%(user_id)s"
+
+#. module: project
+#: view:project.project:0
+msgid "Billing"
+msgstr "請求"
+
+#. module: project
+#: view:project.task:0
+msgid "For changing to delegate state"
+msgstr "委任状態への変更"
+
+#. module: project
+#: field:project.task,priority:0 field:report.project.task.user,priority:0
+msgid "Priority"
+msgstr "優先度"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+#: view:project.project:0
+msgid "Templates of Projects"
+msgstr "プロジェクトのテンプレート"
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr "アドミニストレーション"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:81
+#, python-format
+msgid "CHECK: %s"
+msgstr "チェック：%s"
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr "メンバー"
+
+#. module: project
+#: view:project.task:0 view:project.task.history.cumulative:0
+msgid "Project Tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr "委任されたユーザによるこのタスクを閉じるための予想時間"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: view:project.task:0 selection:project.vs.hours,state:0
+#: selection:report.project.task.user,state:0 selection:task.by.days,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr "低い"
+
+#. module: project
+#: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
+#: field:project.task.history.cumulative,kanban_state:0
+msgid "Kanban State"
+msgstr "かんばん状態"
+
+#. module: project
+#: view:project.project:0
+msgid "Performance"
+msgstr "成績"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+"このレポートはあなたのプロジェクトとユーザの成績を分析することができます。タスクの数、計画時間数と消費時間数の比較、タスクを開いて、閉じた平均日数などの分"
+"析ができます。"
+
+#. module: project
+#: view:project.task:0
+msgid "Change Type"
+msgstr "タイプの変更"
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's members are users who can have an access to the tasks related to "
+"this project."
+msgstr "プロジェクトのメンバーはこのプロジェクトに関係したタスクにアクセスを持つユーザです。"
+
+#. module: project
+#: view:project.project:0 field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr "プロジェクトマネジャ"
+
+#. module: project
+#: view:project.task:0 view:res.partner:0
+msgid "For changing to done state"
+msgstr "完了状態への変更"
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "ユーザとプロジェクト毎のタスク"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: project
+#: view:project.task:0 selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Normal"
+msgstr "通常"
+
+#. module: project
+#: view:project.project:0 field:project.project,complete_name:0
+msgid "Project Name"
+msgstr "プロジェクト名"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_history
+#: model:ir.model,name:project.model_project_task_history_cumulative
+msgid "History of Tasks"
+msgstr "タスクの履歴"
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr "自身のタスクの新しい状態。保留中は、委任されたタスクが閉じられた時に自動的に再度開かれます。"
+
+#. module: project
+#: code:addons/project/wizard/mail_compose_message.py:45
+#, python-format
+msgid "Please specify the Customer or email address of Customer."
+msgstr "顧客または顧客のEメールアドレスを指定して下さい。"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr "合計時間"
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr "終了日"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr "プロジェクトダッシュボード"
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "再アクティブ化"
+
+#. module: project
+#: model:res.groups,name:project.group_project_user
+msgid "User"
+msgstr "ユーザ"
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr "開始日"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
+msgid "Create your Firsts Projects"
+msgstr "最初の製品の作成"
+
+#. module: project
+#: code:addons/project/project.py:229
+#, python-format
+msgid "The project '%s' has been closed."
+msgstr "プロジェクト %s は閉じられました。"
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Tasks's Cumulative Flow"
+msgstr "タスクの累積フロー"
+
+#. module: project
+#: view:project.task:0
+msgid "Task edition"
+msgstr "タスク版"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: project
+#: view:project.task:0
+msgid "Validate planned time and open task"
+msgstr "計画時間とタスクを開くを検証"
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference between planned hours by the project manager and the "
+"total hours of the task."
+msgstr "プロジェクトマネジャによる計画時間数とタスクの合計時間数の間の差を計算します。"
+
+#. module: project
+#: view:project.task:0
+msgid "Delegations History"
+msgstr "委任の履歴"
+
+#. module: project
+#: model:ir.model,name:project.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr "アクティブ項目がFalseにセットされると、プロジェクトを削除することなく非表示にできます。"
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr "ユーザ"
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a member."
+msgstr "私がメンバーであるプロジェクト"
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr "プロジェクトの検索"
+
+#. module: project
+#: code:addons/project/project.py:251
+#, python-format
+msgid "The project '%s' has been opened."
+msgstr "プロジェクト %s は開かれました。"
+
+#. module: project
+#: field:project.task.history,date:0
+#: field:project.task.history.cumulative,date:0 field:project.task.work,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_86
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+"これはプロジェクトとタスクの中で使われる単位をセットします。\n"
+"プロジェクトにリンクする勤務表（プロジェクトタイムシートモジュール）を使用する場合は、従業員の中に正しい単位を設定することを忘れないで下さい。"
+
+#. module: project
+#: code:addons/project/wizard/mail_compose_message.py:43
+#: code:addons/project/wizard/mail_compose_message.py:45
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_project
+msgid "User's projects"
+msgstr "ユーザのプロジェクト"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr "委任"
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr "タスクを開くための日数"
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "委任先"
+
+#. module: project
+#: view:res.partner:0
+msgid "History"
+msgstr "履歴"
+
+#. module: project
+#: field:project.task,user_id:0 view:report.project.task.user:0
+msgid "Assigned to"
+msgstr "割当先"
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr "タスクを行う予想時間。タスクがドラフト状態の時に通常はプロジェクトマネジャによりセットされます。"
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr "検証タスクのためのタイトル"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: project
+#: code:addons/project/project.py:1148
+#, python-format
+msgid "Please delete the project linked with this account first."
+msgstr "最初にこのアカウントにリンクしているプロジェクトを削除して下さい。"
+
+#. module: project
+#: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr "合計時間数"
+
+#. module: project
+#: view:project.task:0 field:project.task,state:0
+#: field:project.task.history,state:0
+#: field:project.task.history.cumulative,state:0
+#: field:project.vs.hours,state:0 view:report.project.task.user:0
+#: field:report.project.task.user,state:0 field:task.by.days,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: project
+#: code:addons/project/project.py:925
+#, python-format
+msgid "Delegated User should be specified"
+msgstr "委任したユーザを指定する必要があります。"
+
+#. module: project
+#: code:addons/project/project.py:862
+#, python-format
+msgid "Task '%s' set in progress"
+msgstr "タスク %s は進行中にセットしました。"
+
+#. module: project
+#: view:project.project:0
+msgid "Date Start: %(date_start)s"
+msgstr "開始日：%(date_start)s"
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+"プロジェクトの財務管理を必要とする場合は、このプロジェクトをリンクします。すると、予算、計画、費用収益分析、プロジェクトの勤務表などとプロジェクトを接続す"
+"ることが可能になります。"
+
+#. module: project
+#: view:project.project:0 view:project.task:0 selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: view:report.project.task.user:0 selection:report.project.task.user,state:0
+#: view:res.partner:0 selection:task.by.days,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: project
+#: view:report.project.task.user:0 field:report.project.task.user,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.project:0 view:project.task:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: project
+#: selection:project.vs.hours,state:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr "タスクを開く"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: view:project.project:0 selection:project.vs.hours,state:0
+msgid "Open"
+msgstr "開く"
+
+#. module: project
+#: view:project.project:0
+msgid "ID: %(task_id)s"
+msgstr "ID：%(task_id)s"
+
+#. module: project
+#: view:project.task:0 selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: view:project.task.history.cumulative:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:report.project.task.user,state:0 selection:task.by.days,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Task's Analysis"
+msgstr "タスクの分析"
+
+#. module: project
+#: code:addons/project/project.py:789
+#, python-format
+msgid ""
+"Child task still open.\n"
+"Please cancel or complete child task first."
+msgstr ""
+"子タスクがまだ開いています。\n"
+"最初に子タスクをキャンセルするか終わらせて下さい。"
+
+#. module: project
+#: view:project.task.type:0
+msgid "Stages common to all projects"
+msgstr "全てのプロジェクトに共通の工程"
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラーです。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project
+#: field:project.task.history,user_id:0
+#: field:project.task.history.cumulative,user_id:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: project
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "作業時間"
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a manager"
+msgstr "私がマネジャであるプロジェクト"
+
+#. module: project
+#: code:addons/project/project.py:959
+#, python-format
+msgid "The task '%s' is pending."
+msgstr "タスク %s は保留中です。"
+
+#. module: project
+#: model:ir.model,name:project.model_project_vs_hours
+msgid " Project vs  hours"
+msgstr " プロジェクト対時間数"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr "委任されたタスク"
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr "このプロジェクトと子のプロジェクトに関連する全タスクの消費時間数の合計です。"
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr "非常に低い"
+
+#. module: project
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "ガントチャートレポートを調整するための時刻表労働時間数"
+
+#. module: project
+#: field:project.project,warn_manager:0
+msgid "Warn Manager"
+msgstr "マネジャに警告"
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr "締切超過"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "私のタスクの締切"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr "再評価タスク"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr "開発"
+
+#. module: project
+#: view:board.board:0
+msgid "My Remaining Hours by Project"
+msgstr "プロジェクト毎の私の残り時間数"
+
+#. module: project
+#: field:project.task,description:0 view:project.task.type:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr "緊急"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr "検証タスク"
+
+#. module: project
+#: field:task.by.days,total_task:0
+msgid "Total tasks"
+msgstr "タスク合計"
+
+#. module: project
+#: help:project.task.type,project_default:0
+msgid ""
+"If you check this field, this stage will be proposed by default on each new "
+"project. It will not assign this stage to existing projects."
+msgstr ""
+"この項目をチェックすると、この工程は各新規プロジェクトにおいてデフォルトで提案されます。既存のプロジェクトにはこの工程は割り当てられません。"
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
+#: view:project.task:0
+msgid "My Delegated Tasks"
+msgstr "私の委任タスク"
+
+#. module: project
+#: view:project.project:0
+msgid "Task: %(name)s"
+msgstr "タスク：%(name)s"
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr "割当先"
+
+#. module: project
+#: field:project.project,progress_rate:0 view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr "進捗"
+
+#. module: project
+#: field:project.project,effective_hours:0 field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr "消費時間"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr "私の請求書のアカウント"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Deployment"
+msgstr "配置"
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Project tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: project
+#: code:addons/project/project.py:851
+#, python-format
+msgid "The task '%s' is done"
+msgstr "タスク %s は完了です。"
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr "このプロジェクトと子のプロジェクトに関連する全タスクの合計時間数の合計です。"
+
+#. module: project
+#: field:project.task.type,project_default:0
+msgid "Common to All Projects"
+msgstr "全製品共通"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr "タスクが完了した時、完了状態になります。"
+
+#. module: project
+#: view:project.project:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: project
+#: view:project.project:0 view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_task_by_days_graph
+#: model:ir.model,name:project.model_task_by_days view:task.by.days:0
+msgid "Task By Days"
+msgstr "日毎のタスク"
+
+#. module: project
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: project
+#: view:project.task:0
+msgid "Edit"
+msgstr "編集"
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr "作業時間数をエンコード"
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr "作業の概要"
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Month-2"
+msgstr "月-2"
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr "タスクを閉じるための日数"
+
+#. module: project
+#: view:project.task.history.cumulative:0 view:report.project.task.user:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr "消費時間数"
+
+#. module: project
+#: view:project.project:0 view:project.task:0
+msgid "Miscelleanous"
+msgstr "その他"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr "完了タスクを開く"
+
+#. module: project
+#: view:project.task.type:0
+msgid "Common"
+msgstr "共通"
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr "消費時間数"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_review_task_stage
+msgid ""
+"The stages can be common to all project or specific to one project. Each "
+"task will follow the different stages in order to be closed."
+msgstr "工程は全てのプロジェクトで共有されるかひとつのプロジェクトに特定されます。各タスクは閉じられることにより異なった工程に進行します。"
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr "プロジェクトのリストを表示する時に並び順を与えます。"
+
+#. module: project
+#: code:addons/project/wizard/mail_compose_message.py:64
+#, python-format
+msgid "Task '%s' Closed"
+msgstr "タスク %s は閉じられました。"
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_history_burndown
+#: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
+msgid "Burndown Chart"
+msgstr "バーンダウンチャート"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned Tasks"
+msgstr "タスクの割当"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr "期限超過タスク"
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Current Year"
+msgstr "今年"
+
+#. module: project
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー：再帰的なメンバーを作ることはできません。"
+
+#. module: project
+#: field:project.project,priority:0 field:project.project,sequence:0
+#: field:project.task,sequence:0 field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
+#: view:project.vs.hours:0
+msgid "Remaining Hours Per Project"
+msgstr "プロジェクト毎の残り時間数"
+
+#. module: project
+#: help:project.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr "タスクが閉じられるときに顧客に送信される警告メッセージのためのEメールの先頭にフッターを追加しました。"
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"A project contains a set of tasks or issues that will be performed by your "
+"resources assigned to it. A project can be hierarchically structured, as a "
+"child of a Parent Project. This allows you to design large project "
+"structures with different phases spread over the project duration cycle. "
+"Each user can set his default project in his own preferences to "
+"automatically filter the tasks or issues he usually works on. If you choose "
+"to invoice the time spent on a project task, you can find project tasks to "
+"be invoiced in the billing section."
+msgstr ""
+"プロジェクトはリソースを割り当てることによって実行されるタスクや問題のセットを含んでいます。プロジェクトは尾やプロジェクトの子として階層的に構造化できます"
+"。これはプロジェクト期間のサイクルに広がるさまざまな段階で、大きなプロジェクト構造を設計できます。各ユーザは通常作業するタスクや問題を自動的に振り分けるた"
+"めに、各自の好みによるデフォルトプロジェクトをセットできます。プロジェクトのタスクで消費した時間を請求することを選択したら、請求セクションで請求するプロジ"
+"ェクトのタスクを見つけることができます。"
+
+#. module: project
+#: view:project.task:0 view:project.task.work:0
+msgid "Task Work"
+msgstr "タスク作業"
+
+#. module: project
+#: field:project.task.delegate,state:0
+msgid "Validation State"
+msgstr "検証状態"
+
+#. module: project
+#: code:addons/project/project.py:882
+#, python-format
+msgid "Task '%s' cancelled"
+msgstr "タスク %s はキャンセルされました。"
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr "あなたが委任したこのタスクの、ユーザによる作業完了をあなたが検証するための予想時間"
+
+#. module: project
+#: view:project.project:0 model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: project
+#: code:addons/project/project.py:890
+#, python-format
+msgid "The task '%s' is cancelled."
+msgstr "タスク %s はキャンセル済です。"
+
+#. module: project
+#: view:project.task:0 view:res.partner:0
+msgid "For changing to open state"
+msgstr "状態を開くと目の変更"
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner view:project.project:0
+#: field:project.task,partner_id:0 view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: project
+#: code:addons/project/project.py:804
+#, python-format
+msgid "Send Email after close task"
+msgstr "タスクを閉じた後にEメールを送信"
+
+#. module: project
+#: view:project.project:0 field:project.project,type_ids:0
+#: view:project.task.type:0
+msgid "Tasks Stages"
+msgstr "タスク工程"
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr "他のユーザへタスクを委任"
+
+#. module: project
+#: view:project.project:0 field:project.project,warn_footer:0
+msgid "Mail Footer"
+msgstr "メールフッター"
+
+#. module: project
+#: view:project.task:0 view:project.task.history.cumulative:0
+msgid "In Progress Tasks"
+msgstr "進行中タスク"
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 96f740540d6..6303a4ee635 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-09 13:34+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+"PO-Revision-Date: 2012-06-08 20:35+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:38+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Новые задачи"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -41,12 +41,12 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Предыдущий месяц"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Мои задачи"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -81,7 +81,7 @@ msgstr "ПРОВЕРКА: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email пользователя"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -93,12 +93,12 @@ msgstr "Работа выполнена"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Задача поручена"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -108,7 +108,7 @@ msgstr "Часов на проверку"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Проекты в ожидании"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -122,12 +122,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Возобновить проект"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Устанавливает очередность при отображении списка проектов"
 
 #. module: project
 #: constraint:project.project:0
@@ -138,7 +138,7 @@ msgstr ""
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Переоценка задачи"
 
 #. module: project
 #: field:project.project,members:0
@@ -193,7 +193,7 @@ msgstr "Организация"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Задачи в ожидании"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -213,7 +213,7 @@ msgstr "Поставить в ожидание"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Важное"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -249,7 +249,7 @@ msgstr "Пользователь, которому вы хотите поруч
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Мои задачи"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
@@ -260,7 +260,7 @@ msgstr "День"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Проекты и стадии"
 
 #. module: project
 #: view:project.project:0
@@ -289,24 +289,24 @@ msgstr "Участники"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Мои открытые задачи"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Пожалуйста, укажите руководителя проекта или его email"
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Для отмены задачи"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Работа по заданию"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -322,7 +322,7 @@ msgstr "Проект по оставщемуся времени"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Ср. эфф. план."
 
 #. module: project
 #: help:project.task,active:0
@@ -363,7 +363,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Показывать только срочные задания"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -376,7 +376,7 @@ msgstr "Отменено"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
@@ -386,7 +386,7 @@ msgstr "Заголовок письма"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Перейти к следующему этапу"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -396,7 +396,7 @@ msgstr "Выполненное задание"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -406,7 +406,7 @@ msgstr "Конфигурация"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Текущий месяц"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -416,7 +416,7 @@ msgstr "Поручить задания другому пользователю"
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -436,7 +436,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Тестирование"
 
 #. module: project
 #: code:addons/project/project.py:829
@@ -469,58 +469,58 @@ msgstr "Срок"
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Готов"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Изменить цвет"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные аналитические счета."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " копия"
 
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Новые Задачи"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "№ задачи"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Предыдущий"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Назначено"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Дата окончания: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Вы не можете создать двух пользователей с одним логином!"
 
 #. module: project
 #: view:project.project:0
@@ -540,12 +540,12 @@ msgstr "Мои проекты"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные компании."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Следующий"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -556,28 +556,28 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# дней"
 
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Открытые проекты"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Вы должны назначить участников проекту '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Задачи в работе"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
+msgstr "Процент закрытых заданий в соответствии с общем количеством заданий."
 
 #. module: project
 #: view:project.task.delegate:0
@@ -596,7 +596,7 @@ msgstr "Задание проекта"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Создать"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -613,23 +613,23 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Эффективных часов"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Название проверочного задания"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Пересмотреть"
 
 #. module: project
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (копия)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr "Средний"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Задачи в ожидании"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -658,18 +658,18 @@ msgstr "Оставшееся время"
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Мастер создания электронной почты"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Оставшееся время"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -691,7 +691,7 @@ msgstr "Неназначенные задания"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Не назначенные пользователям задачи"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -699,6 +699,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Сумма планируемых часов на все задачи, связанные с этим проектом и его "
+"подпроектами."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -730,7 +732,7 @@ msgstr "Доп. информация"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: project
 #: view:project.task.history.burndown:0
@@ -757,7 +759,7 @@ msgstr "Проекты"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Стадия"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -771,7 +773,7 @@ msgstr ""
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Задача %s открыта."
 
 #. module: project
 #: view:project.task:0
@@ -814,7 +816,7 @@ msgstr "Время отсрочки"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Очень важно"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -835,6 +837,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Если вы отметите это поле, менеджер проекта будет получать email каждый раз "
+"как задача будет завершена его командой."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -857,13 +861,13 @@ msgstr ""
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Моя панель"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr ""
+msgstr "Стадии"
 
 #. module: project
 #: view:project.task:0
@@ -884,7 +888,7 @@ msgstr "Единица времени в проекте"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -911,7 +915,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Отметить как заблокированный"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -925,6 +929,16 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"Задача представляет работу которая должна быть выполнена. Каждый "
+"пользователь работает с его собственным списком задач, где он может "
+"записывать свою работу над задачей в часах. Он может работать и закрывать "
+"задачу самостоятельно или делегировать ее другому пользователю. Если вы "
+"делегируете задачу другому пользователю, вы получаете новую задачу в стадии "
+"ожидания, которая будет открыта заново, когда вы должны пересмотреть "
+"достигнутую работу. Если вы устанавливаете модуль project_timesheet, по "
+"работе над задачей может быть выставлен счет, основанный на конфигурации "
+"проекта. С модулем project_mrp, заказы на продажу могут создавать задачи "
+"автоматически, когда они подтверждены."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -954,13 +968,13 @@ msgstr ""
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Пересмотреть Задачу"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -971,7 +985,7 @@ msgstr "Задания проекта"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Стадия Задачи"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -989,7 +1003,7 @@ msgstr "Запланированные часы"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Пересмотр Стадий Задачи"
 
 #. module: project
 #: view:project.project:0
@@ -1032,11 +1046,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Если задача имеет прогресс 99.99% вы должны закрыть задачу если она "
+"закончена, или пересмотреть время"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Адрес контакта"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1065,13 +1081,13 @@ msgstr ""
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Важность"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Шаблоны Проектов"
 
 #. module: project
 #: view:project.project:0
@@ -1087,12 +1103,12 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "ПРОВЕРЬ: %s"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Участник"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1103,6 +1119,8 @@ msgstr "Задания проекта"
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
+"Предполагаемое время на выполнение этой задачи пользователем, которому она "
+"поручена"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1139,7 +1157,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Изменить Тип"
 
 #. module: project
 #: help:project.project,members:0
@@ -1147,6 +1165,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Участники проекта это пользователи, которые имеют доступ к задачам, "
+"связанным с этим проектом."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1156,12 +1176,12 @@ msgstr "Руководитель проекта"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Для изменения в стадию готовности"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Задачи по пользователю и проекту"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1184,7 +1204,7 @@ msgstr "Наименование проекта"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "История Задач"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1197,7 +1217,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Пожалуйста укажите Заказчика или email адрес Заказчика"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1213,13 +1233,13 @@ msgstr "Всего времени"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Дней до закрытия"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Панель Проекта"
 
 #. module: project
 #: view:project.task:0
@@ -1250,13 +1270,13 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Создайте свои первые проекты"
 
 #. module: project
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Проект %s только что был закрыт."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1276,7 +1296,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Проверьте планируемое время и откройте задачу"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1288,7 +1308,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "История Делегирования"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1301,6 +1321,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Если активное поле установлено в False, это позволяет вам скрыть проект без "
+"его удаления."
 
 #. module: project
 #: view:project.task:0
@@ -1315,18 +1337,18 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Проекты с моим участием."
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Поиск Проекта"
 
 #. module: project
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Проект %s только что был открыт."
 
 #. module: project
 #: field:project.task.history,date:0
@@ -1346,6 +1368,9 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Это установит единицу измерения, используемую в проектах и задачах. Если вы "
+"используете расписание, ссылающееся на проекты (модуль project_timesheet), "
+"не забудьте установить правильную единицу измерения для ваших сотрудников."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1367,7 +1392,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Количество Дней для Открытия задачи"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1402,13 +1427,13 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: project
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Пожалуйста, сначала удалите проект, ссылающийся на этот счет."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1430,7 +1455,7 @@ msgstr "Состояние"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Делегированный Пользователь должен быть определен"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1523,18 +1548,19 @@ msgstr ""
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Стадии, общие для всех проектов"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Ошибка! Дата завершения задачи должна быть позднее чем дата начала задачи"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ответственный"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1544,7 +1570,7 @@ msgstr "Рабочее время"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Проекты, в которых я менеджер"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1568,6 +1594,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Сумма затраченного времени на все задачи, связанные с этим проектом и его "
+"подпроектами."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1608,7 +1636,7 @@ msgstr ""
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Мои оставшиеся часы по проекту"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1634,7 +1662,7 @@ msgstr "Проверка задания"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Всего задач"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1642,13 +1670,16 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Если вы отметили это поле, эта стадия будет предложена по умолчанию для "
+"каждого нового проекта. В существующих проектах эта стадия затронута не "
+"будет."
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Мои делегированные задачи"
 
 #. module: project
 #: view:project.project:0
@@ -1674,7 +1705,7 @@ msgstr "Затраченное время"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "Мои счета для выставления"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 31af9a9bc44..57ff8d1a208 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,7 +18,7 @@
             <field name="model">project.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project" layout="manual">
+                <form string="Project" layout="manual" version="7.0">
                 <header>
                     <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
@@ -30,57 +30,68 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" string="Project Name" select="1"/>
-                        <field name="analytic_account_id" invisible="1" required="0"/>
-                        <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="progress_rate" widget="progressbar"/>
+                    <field name="analytic_account_id" invisible="1" required="0"/>
+                    <label for="name" class="oe_form_readonly_hidden" string="Project Name"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <label for="parent_id" class="oe_form_readonly_hidden" string="Parent Project"/>
+                    <h2>
+                        <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                        </group><group>
+                            <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <field name="progress_rate" widget="progressbar"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
-                        <page string="Administration">
-                            <group col="2" colspan="2" name="kanban">
-                                <separator colspan="2" string="Project Management"/>
-                                    <field name="use_tasks"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Performance"/>
-                                <field name="planned_hours" widget="float_time"/>
-                                <field name="effective_hours" widget="float_time" />
-                                <field name="resource_calendar_id"/>
-                            </group>
-                            <newline/>
-                            <group col="2" colspan="2" name="misc">
-                                <separator colspan="4" string="Miscellaneous"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="warn_manager"/>
-                                <field name="priority"/>
-                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                            </group>
-                        </page>
                         <page string="Members">
-                            <field colspan="4" name="members" nolabel="1">
+                            <field name="members">
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
                                 </tree>
                             </field>
                         </page>
+                        <page string="Administration">
+                            <group>
+                                <group name="kanban" string="Project Management">
+                                    <field name="use_tasks"/>
+                                </group>
+                                <group string="Performance">
+                                    <field name="planned_hours" widget="float_time"/>
+                                    <field name="effective_hours" widget="float_time" />
+                                    <field name="resource_calendar_id"/>
+                                </group>
+                                <newline/>
+                                <group name="misc" string="Miscellaneous">
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="warn_manager"/>
+                                    <field name="priority"/>
+                                    <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                </group>
+                            </group>
+                        </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
-                            <field name="warn_customer"/>
-                            <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
-                            <newline/>
-                            <group colspan="4" col="4">
+                            <group col="4">
+                                <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" string="Customer"/>
+                                <field name="warn_customer"/>
+                                <field name="currency_id" groups="base.group_multi_company" required="1"/>
+                            </group>
+                            <group col="4">
                                 <separator colspan="2" string="Mail Header"/>
                                 <separator colspan="2" string="Mail Footer"/>
                                 <field name="warn_header" nolabel="1" colspan="2"/>
                                 <field name="warn_footer" nolabel="1" colspan="2"/>
                             </group>
-                            <group col="3" colspan="4">
-                                <separator string="Automatic variables for headers and footer. Use exactly the same notation." colspan="4"/>
+                            <group col="3">
+                                <b>
+                                    <label string="Variables you can use for headers and footer." colspan="3"/>
+                                </b>
                                 <label string="Task: %%(name)s"/>
                                 <label string="User: %%(user_id)s"/>
                                 <label string="ID: %%(task_id)s"/>
@@ -90,17 +101,16 @@
                             </group>
                         </page>
                         <page string="Tasks Stages">
-                           <field nolabel="1" name="type_ids" colspan="4"/>
+                             <field name="type_ids"/>
                         </page>
                         <page string="Notes">
-                            <field colspan="4" name="description" nolabel="1"/>
+                            <field name="description"/>
                         </page>
                     </notebook>
-                    <newline/>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -185,7 +195,7 @@
                     <field name="task_count"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
                                 <a class="oe_kanban_menuaction oe_i">B</a>
                                 <ul class="oe_kanban_menu">
                                     <li><a type="edit">Edit...</a></li>
@@ -269,12 +279,14 @@
             <field name="model">project.task.work</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Task Work">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="hours" select="1" widget="float_time"/>
-                    <field name="date" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                <form string="Task Work" version="7.0">
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                        <field name="hours" widget="float_time"/>
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -300,7 +312,7 @@
             <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Project" layout="manual">
+                <form string="Project" version="7.0">
                     <header>
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending"/>
@@ -322,35 +334,44 @@
                                 states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         <field name="stage_id" widget="statusbar"/>
                     </header>
-                    <sheet string="Task edition" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" select="1"/>
-                        <field name="project_id" select="1"  on_change="onchange_project(project_id)"/>
-                        <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks"/>
-                        <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                        <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                        <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Information">
-                            <group col="2" colspan="2">
-                                <field
-                                    name="planned_hours"
-                                    widget="float_time"
-                                    attrs="{'readonly':[('state','!=','draft')]}"
-                                    groups="project.group_time_work_estimation_tasks"									
-                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field
-                                    name="effective_hours"
-                                    widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
-                            </group>
-                            <group col="3" colspan="2">
-                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2" groups="project.group_time_work_estimation_tasks"/>
-                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
-                            </group>
+                    <sheet string="Task">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name"/>
+                    </h1>
+                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="project_id"  on_change="onchange_project(project_id)"/>
+                    </h2>
+                    <group>
+                        <group>
+                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="partner_id" />
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
+                                groups="project.group_time_work_estimation_tasks"
+                                on_change="onchange_planned(planned_hours, effective_hours)"/>
 
-                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
-                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
+                            <field name="effective_hours"
+                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
+                            <label for="remaining_hours" string="+ Remaining"/>
+                            <div>
+                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
+                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
+                            </div>
+                            <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks"
+                                string="= Total"/>
+
+                            <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Information">
+                            <field name="description" attrs="{'readonly':[('state','=','done')]}"/>
+                            <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
@@ -360,10 +381,10 @@
                             </field>
                         </page>
                         <page string="Delegations History">
-                            <separator string="Parent Tasks" colspan="4"/>
-                            <field colspan="4" height="150" name="parent_ids" nolabel="1"/>
-                            <separator string="Delegated tasks" colspan="4"/>
-                            <field colspan="4" height="150" name="child_ids" nolabel="1">
+                            <separator string="Parent Tasks"/>
+                            <field name="parent_ids"/>
+                            <separator string="Delegated tasks"/>
+                            <field name="child_ids">
                                 <tree string="Delegated tasks">
                                     <field name="name"/>
                                     <field name="user_id"/>
@@ -376,27 +397,20 @@
                                 </tree>
                             </field>
                         </page>
-
                         <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
-                            <group colspan="2" col="2">
-                                <separator string="Planning" colspan="2"/>
+                            <group col="4">
                                 <field name="priority"/>
                                 <field name="sequence"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
-
-                            <separator string="Miscellaneous" colspan="4"/>
-                            <field name="partner_id" />
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                            <field name="state" groups="base.group_no_one"/>
-                            <separator colspan="4" string="Notes"/>
-                            <field colspan="4" name="notes" nolabel="1"/>
+                            <separator string="Notes"/>
+                            <field name="notes"/>
                         </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_form_bottom">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -479,9 +493,9 @@
                                             <a name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                                         </div>
                                         <div class="oe_kanban_right">
-                                            <a name="set_kanban_state_blocked" string="Mark as Blocked" kanban_states="normal,done" type="object" icon="kanban-stop"/>
-                                            <a name="set_kanban_state_normal" string="Normal" kanban_states="blocked,done" type="object" icon="gtk-media-play"/>
-                                            <a name="set_kanban_state_done" string="Done" kanban_states="blocked,normal" type="object" icon="kanban-apply"/>
+                                            <a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
+                                            <a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
+                                            <a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
                                         </div>
                                         <div class="oe_kanban_clear"/>
                                     </div>
@@ -668,18 +682,20 @@
             <field name="model">project.task.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Task Stage">
-                    <group colspan="2" col="2">
-                        <field name="name"/>
-                        <field name="state"/>
+                <form string="Task Stage" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="state"/>
+                        </group>
+                        <group>
+                            <field name="case_default"/>
+                            <field name="sequence"/>
+                            <field name="fold"/>
+                        </group>
                     </group>
-                    <group colspan="2" col="4">
-                        <field name="case_default"/>
-                        <field name="sequence"/>
-                        <field name="fold"/>
-                    </group>
-                    <separator string="Description" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 4914ff26e88..cf371a39672 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,26 +7,28 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Project" layout="manual">
+                <form string="Configure Project" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Project" colspan="4"/>
-                        <field name="module_project_mrp"/>
-                        <field name="module_project_timesheet"/>
-                        <field name="module_pad"/>
-                        <field name="group_tasks_work_on_tasks"/>
-                        <field name="group_time_work_estimation_tasks"/>
+                    <sheet>
+                        <group col="4">
+                            <separator string="Project" colspan="4"/>
+                            <field name="module_project_mrp"/>
+                            <field name="module_project_timesheet"/>
+                            <field name="module_pad"/>
+                            <field name="group_tasks_work_on_tasks"/>
+                            <field name="group_time_work_estimation_tasks"/>
 
-                        <separator string="Planning" colspan="4"/>
-                        <field name="module_project_long_term"/>
+                            <separator string="Planning" colspan="4"/>
+                            <field name="module_project_long_term"/>
 
-                        <separator string="Helpdesk and Support" colspan="4"/>
-                        <field name="module_project_issue"/>
-                        <field name="module_project_issue_sheet"/>
-                        <group name="support" colspan="4"/>
+                            <separator string="Helpdesk and Support" colspan="4"/>
+                            <field name="module_project_issue"/>
+                            <field name="module_project_issue_sheet"/>
+                            <group name="support" colspan="4"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 2b8ad646a8c..9ed920eb534 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -7,28 +7,27 @@
             <field name="model">project.task.delegate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Task Delegate">
-                    <field name="project_id" on_change="onchange_project_id(project_id)"/>
-                    <field name="user_id"/>
-                    <group colspan="2" col="2">
-                        <separator string="Delegated Task" colspan="2"/>
-                        <field name="name"/>
-                        <field name="planned_hours"/>
-                        <separator string="New Task Description" colspan="2"/>
-                        <field name="new_task_description" colspan="2" nolabel="1"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Validation Task" colspan="2"/>
-                        <field name="prefix" string="Validation Task Title"/>
-                        <field name="planned_hours_me"/>
-                        <field name="state"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="2" col="2">
-                    </group>
-                    <group colspan="2" col="2">
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                <form string="Project Task Delegate" version="7.0">
+                    <header>
                         <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    </header>
+                    <group>
+                        <group>
+                            <field name="project_id" on_change="onchange_project_id(project_id)"/>
+                            <separator string="Delegated Task" colspan="2"/>
+                            <field name="name"/>
+                            <field name="planned_hours"/>
+                            <separator string="New Task Description" colspan="2"/>
+                            <field name="new_task_description" colspan="2" nolabel="1"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <separator string="Validation Task" colspan="2"/>
+                            <field name="prefix" string="Validation Task Title"/>
+                            <field name="planned_hours_me"/>
+                            <field name="state"/>
+                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index f0158631f51..4a452bca3ab 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -7,15 +7,14 @@
             <field name="model">project.task.reevaluate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reevaluate Task">
-                    <separator colspan="4" string="Reevaluation Task"/>
-                    <field name="remaining_hours" widget="float_time"/>
-                    <separator string="" colspan="4"/>
-                    <group col="2" colspan="2">
-                    </group>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                <form string="Reevaluate Task" version="7.0">
+                    <header>
                         <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    </header>
+                    <separator string="Reevaluation Task"/>
+                    <group>
+                        <field name="remaining_hours" widget="float_time"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/project_gtd/i18n/ja.po b/addons/project_gtd/i18n/ja.po
new file mode 100644
index 00000000000..2fb20d75bf8
--- /dev/null
+++ b/addons/project_gtd/i18n/ja.po
@@ -0,0 +1,304 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-10 02:57+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show only tasks having a deadline"
+msgstr "締切を持つタスクのみ表示"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "再アクティブ化"
+
+#. module: project_gtd
+#: help:project.task,timebox_id:0
+msgid "Time-laps during which task has to be treated"
+msgstr "処理すべきタスクの間の時間周期"
+
+#. module: project_gtd
+#: help:project.gtd.timebox,sequence:0
+msgid "Gives the sequence order when displaying a list of timebox."
+msgstr "タイムボックスのリストを表示するときに並べ順を与えます。"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "旅行"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr "タイムボックスが空のプロセスは成功に終了しました。"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Pending Tasks"
+msgstr "保留中タスク"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Next"
+msgstr "次へ"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox "
+"defines a period of time in order to categorize your tasks: today, this "
+"week, this month, long term."
+msgstr ""
+"タイムボックスは物事を行う方法論として定義されます。タイムボックスはタスクを分類することにより時間の期間を定義します：本日、今週、今月、長期。"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "本日"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "長期"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "プロジェクトのタイムボックスを空に"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Pending"
+msgstr "保留中"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0 field:project.gtd.timebox,name:0
+#: view:project.task:0 field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "タイムボックス"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "タイムボックスに設定"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_task
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_timebox_tree
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "私のタスク"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "今週"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "空のタイムボックス"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Tasks having no timebox assigned yet"
+msgstr "タスクにはタイムボックスがまだ割り当てられていません。"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project_gtd
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "アイコン"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
+msgid "Project Timebox Fill"
+msgstr "プロジェクトのタイムボックスの充填"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "タイムボックスに追加"
+
+#. module: project_gtd
+#: field:project.timebox.empty,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
+msgid "Contexts"
+msgstr "コンテキスト"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "車"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show Context"
+msgstr "コンテキストを表示"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Plannifyのタイムボックス"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr ""
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "タイムボックス"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "In Progress and draft tasks"
+msgstr "進行中とドラフトのタスク"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_context
+#: view:project.gtd.context:0 field:project.gtd.context,name:0
+#: field:project.task,context_id:0
+msgid "Context"
+msgstr "コンテキスト"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "No timebox child of this one !"
+msgstr "この子にタイムボックスがありません。"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "OK"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "会社"
+
+#. module: project_gtd
+#: field:project.gtd.context,sequence:0 field:project.gtd.timebox,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show the context field"
+msgstr "コンテキスト項目を表示"
+
+#. module: project_gtd
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
+msgstr "コンテキストのリストを表示するときに並び順を与えます。"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show Deadlines"
+msgstr "締切の表示"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "タイムボックスの定義"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "タスクの選択"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Inbox"
+msgstr "受信箱"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_id:0
+msgid "Get from Timebox"
+msgstr "タイムボックスを取得"
+
+#. module: project_gtd
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "ユーザがタスクを実行すべきコンテキストの場所"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "自宅"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"you to categorize your tasks according to the context in which they have to "
+"be done: at the office, at home, when I take my car, etc."
+msgstr ""
+"コンテキストは物事を行う方法論として定義されます。実行しなければならないコンテキストに応じてタスクを分類することができます：会社で、自宅で、車に乗った時な"
+"ど。"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "For reopening the tasks"
+msgstr "タスクの再開"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "前へ"
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 9dfcb8db156..c8e87093c0e 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -8,7 +8,7 @@
         <field name="arch" type="xml">
             <tree string="Context">
                 <field name="sequence" invisible="1"/>
-                <field name="name" select="1"/>
+                <field name="name"/>
             </tree>
         </field>
     </record>
@@ -18,9 +18,11 @@
         <field name="model">project.gtd.context</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Context">
-                <field name="name" select="1"/>
-                <field name="sequence"/>
+            <form string="Context" version="7.0">
+                <group col="4">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                </group>
             </form>
         </field>
     </record>
@@ -52,11 +54,12 @@
         <field name="model">project.gtd.timebox</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Timeboxes">
-                <separator string="Timebox Definition" colspan="4"/>
-                <field name="name" select="1"/>
-                <field name="sequence"/>
-                <field name="icon"/>
+            <form string="Timeboxes" version="7.0">
+                <group col="4" string="Timebox Definition">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="icon"/>
+                </group>
             </form>
         </field>
     </record>
@@ -96,7 +99,7 @@
         <field name="arch" type="xml">
             <field name="progress" position="after">
                 <field name="context_id" widget="selection"/>
-                <field name="timebox_id" widget="selection" select="1"/>
+                <field name="timebox_id" widget="selection"/>
             </field>
         </field>
     </record>
diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index e66161b798f..9beb118cdcc 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -2,34 +2,32 @@
 <openerp>
     <data>
 
-    	<record id="view_project_gtd_empty" model="ir.ui.view">
+        <record id="view_project_gtd_empty" model="ir.ui.view">
             <field name="name">Empty Timebox</field>
             <field name="model">project.timebox.empty</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Empty Timebox">
-              		<group width="345" height="70">
-              			<label string="Timebox Empty Process Completed Successfully." />
-              			    <newline/>
-              			    <separator colspan="4"/>
-		            		<button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
-		          	</group>
-			  	</form>
+                <form string="Empty Timebox" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/>
+                    </header>
+                    <label string="Timebox Empty Process Completed Successfully." />
+                </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_project_gtd_empty" model="ir.actions.act_window">
-	           <field name="name">Empty Timebox</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">project.timebox.empty</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-	           <field name="view_id" ref="view_project_gtd_empty"/>
-		       <field name="context">{'record_id' : active_id}</field>
-	           <field name="target">new</field>
-    	</record>
+        <record id="action_project_gtd_empty" model="ir.actions.act_window">
+               <field name="name">Empty Timebox</field>
+               <field name="type">ir.actions.act_window</field>
+               <field name="res_model">project.timebox.empty</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">form</field>
+               <field name="view_id" ref="view_project_gtd_empty"/>
+               <field name="context">{'record_id' : active_id}</field>
+               <field name="target">new</field>
+        </record>
 
-    	<record model="ir.values" id="project_gtd_empty_values">
+        <record model="ir.values" id="project_gtd_empty_values">
             <field name="model_id" ref="model_project_gtd_timebox" />
             <field name="name">Empty Timebox</field>
             <field name="key2">client_action_multi</field>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 9f9e080fc4e..6a38ccdb6a6 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -2,36 +2,37 @@
 <openerp>
     <data>
 
-    	<record id="view_project_gtd_fill" model="ir.ui.view">
+        <record id="view_project_gtd_fill" model="ir.ui.view">
             <field name="name">Plannify Timebox</field>
             <field name="model">project.timebox.fill.plan</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Plannify Timebox">
-              		  <field name="timebox_id" widget="selection"/>
-              		  <field name="timebox_to_id" widget="selection"/>
-              		  <field colspan="4" name="task_ids" nolabel="1" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
-              		  <separator colspan="4"/>
-		              <group colspan="4" col="6">
-				            <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		              		<button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />
-		              </group>
-			  	</form>
+                <form string="Plannify Timebox" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />
+                    </header>
+                      <group col="4">
+                          <field name="timebox_id" widget="selection"/>
+                          <field name="timebox_to_id" widget="selection"/>
+                      </group>
+                      <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+                </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_project_gtd_fill" model="ir.actions.act_window">
-	           <field name="name">Plannify Timebox</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">project.timebox.fill.plan</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-	           <field name="view_id" ref="view_project_gtd_fill"/>
-		       <field name="context">{'record_id' : active_id}</field>
-	           <field name="target">new</field>
-    	</record>
+        <record id="action_project_gtd_fill" model="ir.actions.act_window">
+               <field name="name">Plannify Timebox</field>
+               <field name="type">ir.actions.act_window</field>
+               <field name="res_model">project.timebox.fill.plan</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">form</field>
+               <field name="view_id" ref="view_project_gtd_fill"/>
+               <field name="context">{'record_id' : active_id}</field>
+               <field name="target">new</field>
+        </record>
 
-    	<record model="ir.values" id="project_gtd_fill_values">
+        <record model="ir.values" id="project_gtd_fill_values">
             <field name="model_id" ref="model_project_gtd_timebox" />
             <field name="name">Plannify Timebox</field>
             <field name="key2">client_action_multi</field>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index b6e1f8a5d99..4bd3854e0c9 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,7 +56,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issues Dashboard" layout="manual">
+                <form string="Issues Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
new file mode 100644
index 00000000000..23d5be997a3
--- /dev/null
+++ b/addons/project_issue/i18n/ja.po
@@ -0,0 +1,964 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-09 20:46+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Previous Month"
+msgstr "前月"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "開くための平均遅延"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr "問題を開くための作業時間数"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "開始済"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "開始日"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "進捗（%）"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:406
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: project_issue
+#: field:project.issue,company_id:0 view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "傍観者のEメール"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today's features"
+msgstr "本日の機能"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "開始日"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:406
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"この問題の拡大はできません。\n"
+"関連するプロジェクトでは拡大プロジェクトを設定していません。"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: project_issue
+#: help:project.issue,inactivity_days:0
+msgid "Difference in days between last action and current date"
+msgstr "最終アクションと現在の日付の間の日数差"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: project_issue
+#: field:project.issue,days_since_creation:0
+msgid "Days since creation date"
+msgstr "作成日からの日数"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "内部注記を追加"
+
+#. module: project_issue
+#: field:project.issue,task_id:0 view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "工程ごとの問題"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "メッセージ"
+
+#. module: project_issue
+#: field:project.issue,inactivity_days:0
+msgid "Days since last action"
+msgstr "最終アクションからの日数"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0 field:project.issue,project_id:0
+#: view:project.issue.report:0 field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "私の開いているプロジェクト問題"
+
+#. module: project_issue
+#: selection:project.issue,state:0 selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change to Next Stage"
+msgstr "次の工程へ変更"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "終了日"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "問題トラッカーの検索"
+
+#. module: project_issue
+#: field:project.issue,color:0
+msgid "Color Index"
+msgstr "カラーインデックス"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue / Partner"
+msgstr "問題 / パートナ"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "開くための平均作業時間数"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "次のアクション"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr "現在のプロジェクトから問題が拡大した場合は、ここで選択したプロジェクトの下にリストされます。"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+"プロジェクトの問題に関するこのレポートは、あなたのサポートやアフターサービスの品質を分析することができます。年齢ごとに問題を追跡可能です。問題を開くまたは"
+"閉じるために要した時間、問題ごとに交換したEメールの数や消費時間の平均を分析できます。"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change Color"
+msgstr "色の変更"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:482
+#, python-format
+msgid " (copy)"
+msgstr " （コピー）"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "低い"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "統計"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "タスクに変換"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "メンテナンス"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "問題分析"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "次へ"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,priority:0
+#: view:project.issue.report:0 field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "優先度"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "新規Eメール送信"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,version_id:0
+#: view:project.issue.report:0 field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "バージョン"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "New"
+msgstr "新規"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "問題分類"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "Eメール"
+
+#. module: project_issue
+#: field:project.issue,channel_id:0 field:project.issue.report,channel_id:0
+msgid "Channel"
+msgstr "チャネル"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Unassigned Issues"
+msgstr "未割当の問題"
+
+#. module: project_issue
+#: field:project.issue,create_date:0 view:project.issue.report:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "バージョン"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "To Do Issues"
+msgstr "ToDoの問題"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "ドラフトに再設定"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "本日"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "プロジェクトの問題ダッシュボード"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "完了"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "分類"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "工程"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "履歴情報"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "プロジェクトの問題"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "コミュニケーションと履歴"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "私の開いているプロジェクトの問題"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "私のプロジェクトの問題"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "連絡先"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,partner_id:0
+#: view:project.issue.report:0 field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "私の問題"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change to Previous Stage"
+msgstr "前工程へ変更"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+"ソフトウェア開発プロジェクトの中でバグを処理するため、アフターサービス二おけるクレーム処理などにOpenERPの問題トラッカーを使用することができます。あ"
+"なたが問題に取り組む製品の異なるバージョンをここで定義します。"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:330
+#, python-format
+msgid "Tasks"
+msgstr "タスク"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "問題の数"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "問題トラッカーツリー"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:408 view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "拡大"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "機能要求"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "変更日"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Open Features"
+msgstr "機能を開く"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "前へ"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,categ_id:0
+#: view:project.issue.report:0 field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: project_issue
+#: field:project.issue,user_email:0
+msgid "User Email"
+msgstr "ユーザのEメール"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "プロジェクトの問題の数"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to New"
+msgstr "新規に再設定"
+
+#. module: project_issue
+#: help:project.issue,channel_id:0
+msgid "Communication channel."
+msgstr "コミュニケーション・チャネル"
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "これらのEメールアドレスは送受信するEメールの CC 欄に追加されます。複数のEメールアドレスの間をコンマで区切って下さい。"
+
+#. module: project_issue
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact Information"
+msgstr "連絡先情報"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0 selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "閉じた"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr "返信"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "閉じるための平均遅延"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0 selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "保留中"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "状態"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "プロジェクトの問題の数"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "現在の問題"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "通常"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "グローバルCC"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+msgid "To Do"
+msgstr "ToDo"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "New Issues"
+msgstr "新規問題"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "終了日"
+
+#. module: project_issue
+#: field:project.issue,active:0 field:project.issue.version,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "検索"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues Dashboard"
+msgstr "問題ダッシュボード"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,type_id:0
+msgid "Stages"
+msgstr "工程"
+
+#. module: project_issue
+#: help:project.issue,days_since_creation:0
+msgid "Difference in days between creation date and current date"
+msgstr "作成日と本日の間の日数差"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "機能トラッカーツリー"
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "これらの人がEメールを受け取ります。"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "工程別問題"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "履歴"
+
+#. module: project_issue
+#: field:project.issue,user_id:0 view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Assigned to"
+msgstr "割当先"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "返信先Eメールアドレス"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "パートナ連絡先"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "問題トラッカーフォーム"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,state:0
+#: view:project.issue.report:0 field:project.issue.report,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "一般"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Current Features"
+msgstr "現在の機能"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr "問題のバージョン"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "バージョン番号"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue.report,state:0
+msgid "Open"
+msgstr "開く"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr "問題"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr "プロジェクトの問題"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Creation Month"
+msgstr "作成月"
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "計算式：消費時間 / 合計時間"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+"システムのバグ、顧客の苦情、製品の破損といった問題はここで集められます。プロジェクトの問題が解決される時、割り当てられた工程を定義できます（分析、開発、完"
+"了）。メールゲートウェイモジュールを用いて、問題はEメールアドレスを通して統合することができます（例：support@mycompany.com）。"
+
+#. module: project_issue
+#: view:board.board:0 view:project.issue:0
+msgid "Pending Issues"
+msgstr "保留中の問題"
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr "問題"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr "機能トラッカーの検索"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "販売チーム"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,email:0
+msgid "# Emails"
+msgstr "Eメールの数"
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"事象が作成されると、状態はドラフトにセットされます。\n"
+"事象が進行中になると、状態は開くにセットされます。\n"
+"事業が終了すると、状態は完了にセットされます。\n"
+"事象がレビューが必要な場合、状態は保留中にセットされます。"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:70
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr "問題 %s は既に開かれています。"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr "機能詳細"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Edit"
+msgstr "編集"
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr "プロジェクトの拡大"
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr "このケースに属する販売チーム。メールゲートウェイのために担当ユーザとEメールを定義します。"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:85
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr "問題 %s は閉じられました。"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr "参照"
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr "問題を閉じるための作業時間数"
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Current Year"
+msgstr "今年"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:415
+#, python-format
+msgid "No Title"
+msgstr "タイトルなし"
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "プロジェクトの問題を閉じるための日数"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr "販売チーム"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr "閉じるための平均作業時間数"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr "高い"
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "締切"
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr "最終アクション"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr "期間"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr "作成日順の私の開いている問題"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 895b4594185..b7089cac129 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -20,9 +20,11 @@
             <field name="model">project.issue.version</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issue Version">
-                    <field name="name"/>
-                    <field name="active"/>
+                <form string="Issue Version" version="7.0">
+                    <group col="2">
+                        <field name="name"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -50,7 +52,7 @@
             <field name="model">project.issue</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
@@ -72,39 +74,33 @@
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar"/>
                 </header>
-                <sheet string="Issue Tracker Form" layout="auto">
-                    <group colspan="4" col="6">
-                        <field name="name"/>
-                        <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
-                        <group colspan="2" col="3">
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" type="action"/>
-                        </group>
-                        <field name="user_id"/>
-                        <field name="version_id" colspan="2" widget="selection"/>
-                        <field name="state" groups="base.group_no_one"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Contact Information"/>
+                <sheet string="Issue">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="project_id" required="True" on_change="on_change_project(project_id)"/></h2>
+                    <group>
+                        <group>
+                            <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                            </group>
-                            <group col="3" colspan="2">
-                            <separator colspan="3" string="Status"/>
-                            <field name="priority" colspan="3"/>
-                            <field name="task_id" on_change="onchange_task_id(task_id)"/>
-                            <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
-                                attrs="{'invisible':[('task_id','!=',False)]}" />
-                            <field name="progress" colspan="3" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                            </group>
-                            <separator string= "Description" colspan="4"/>
-                            <field name="description" nolabel="1" colspan="4"/>
-                            <separator colspan="4"/>
-                        </page>
+                            <label for="task_id"/>
+                            <div>
+                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_form_inline"/>
+                                <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
+                                    attrs="{'invisible':[('task_id','!=',False)]}" />
+                            </div>
+                        </group><group>
+                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                            <field name="version_id" widget="selection"/>
+                            <field name="priority"/>
+                            <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
+                            <field name="state" groups="base.group_no_one"/>
+                        </group>
+                    </group>
+                    <field name="description"/>
+
+                    <notebook groups="base.group_no_one">
                         <page string="Extra Info">
                             <group col="4" colspan="4">
                                 <separator string="Statistics" colspan="4" col="4"/>
@@ -123,9 +119,9 @@
                         </page>
                     </notebook>
                 </sheet>
-	            <div class="oe_form_sheet_width">
-	                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-	            </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -348,7 +344,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-            	<field name="use_tasks" position="after">
+                <field name="use_tasks" position="after">
                     <field name="use_issues"/>
                 </field>
                 <field name="priority" position="before">
diff --git a/addons/project_issue_sheet/i18n/ja.po b/addons/project_issue_sheet/i18n/ja.po
new file mode 100644
index 00000000000..3442b24984f
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/ja.po
@@ -0,0 +1,77 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-09 20:56+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "分析行"
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#, python-format
+msgid "The Analytic Account is in pending !"
+msgstr "分析アカウントは保留中です。"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "プロジェクトの問題"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "勤務表の行"
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#: field:project.issue,analytic_account_id:0
+#, python-format
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr "作業ログ"
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "勤務表"
+
+#. module: project_issue_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr "問題"
+
+#. module: project_issue_sheet
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "ビューアカウントでは分析行を作ることはできません。"
diff --git a/addons/project_issue_sheet/i18n/sv.po b/addons/project_issue_sheet/i18n/sv.po
new file mode 100644
index 00000000000..f9b6304f43d
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/sv.po
@@ -0,0 +1,77 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-04 10:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Objektrad"
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#, python-format
+msgid "The Analytic Account is in pending !"
+msgstr "Objektkontot är väntande"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "Projektärenden"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tidrapportrad"
+
+#. module: project_issue_sheet
+#: code:addons/project_issue_sheet/project_issue_sheet.py:57
+#: field:project.issue,analytic_account_id:0
+#, python-format
+msgid "Analytic Account"
+msgstr "Objektkonto"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr "Arbetslogg"
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Registreringsdatum"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Tidkort"
+
+#. module: project_issue_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "Du kan inte ändra en post i en bekräftad/färdig tidrapport !"
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr "Ärende"
+
+#. module: project_issue_sheet
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "Du kan inte skapa objekttransaktioner med rubrikkonton."
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
new file mode 100644
index 00000000000..1d1c3fbe74c
--- /dev/null
+++ b/addons/project_long_term/i18n/ja.po
@@ -0,0 +1,516 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-10 03:12+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "フェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "次のフェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "割当ユーザ"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "進捗"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "進行中のフェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr "設定の表示"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "スケジュール"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "日"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "フェーズのユーザ割当"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"プロジェクトは異なるフェーズに分割することができます。各フェーズについて、ユーザの割当、異なるタスクの説明と前後のフェーズへのリンク、自動スケジューリング"
+"のための日付制約の追加、利用可能ユーザの計画による長期計画、プロジェクト作業を開始するタスクのシリーズの中にフェーズを変換を定義することができます。"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "単一のプロジェクトの計算"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "前のフェーズ"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "UoMは期間のための単位です。"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "ユーザの計画"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr " これは開始日と期間に応じてスケジューラによって計算されます。"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "終了日"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "締切"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "全私のプロジェクトの計算"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " （コピー）"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "プロジェクトのユーザ割当"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "計算"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "関連タスクを元に計算"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "期間の単位"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "最小の開始日"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "リソース"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "私のプロジェクト"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "開始日"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "関連タスク"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "新規フェーズ"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "スケジュールするプロジェクトを指定して下さい。"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "この日付の後に強制的に開始するフェーズ"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr "これはプロジェクト日付または前フェーズの終了日によりスケジューラにより計算されます。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "月"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "フェーズ開始日はフェーズ終了日より小さい必要があります。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "開始月"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "この日付の前に強制的に終了させるフェーズ"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "プロジェクトのリソースはスケジューラによって自動的に計算されます。"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "保留中フェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "保留中"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "プロジェクトの計算タスク"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "制約"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "フェーズのリストを表示する時に、並び順を与えます。"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "プロジェクトのフェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "残り時間数"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "作業時間"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "フェーズのスケジュール"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "開始フェーズ"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "合計時間数"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "ユーザ"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "フェーズ"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"フェーズはドラフト状態で作成されます。\n"
+"　フェーズが開始されると、進行中状態になります。\n"
+"　フェーズのレビューが必要であれば、保留中状態です。\n"
+"　フェーズが終了すると、完了状態にセットされます。"
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "タスク詳細"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "期間"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "プロジェクトのユーザ"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "プロジェクトのフェーズ"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"全てまたは特定のプロジェクトのフェーズのスケジュールします。その後、ガントチャートビューを開きます。\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "プロジェクトの計算フェーズ"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "フェーズのループは許されません。"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "リソースの休暇"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "タスクのスケジュール"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "日数のデフォルト"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "強制割当ユーザ"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "スケジュール"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 0c175a4ef7e..1717fb950f7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -37,8 +37,8 @@
             <field name="model">project.user.allocation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project User Allocation">
-                    <group colspan="4" col="6">
+                <form string="Project User Allocation" version="7.0">
+                    <group col="4">
                         <field name="user_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
@@ -141,7 +141,7 @@
             <field name="model">project.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Project Phase" version="7.0">
                 <header>
                     <button string="Start Phase" name="set_open" states="pending,draft"/>
                     <button string="Done" name="set_done" states="pending,open"/>
@@ -150,34 +150,44 @@
                     <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
-                <sheet string="Project Phase" layout="auto">
-                    <group colspan="6" col="6">
-                        <group colspan="6" col="7" >
-                            <field name="name" colspan="4"/>
-                            <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                <sheet>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="project_id" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/>
+                    </h2>
+                    <group>
+                        <group>
                             <field name="date_start"/>
                             <field name="date_end"/>
-                            <field name="duration"/>
-                            <field name="product_uom" nolabel="1"/>
+                        </group><group>
+                            <label for="duration"/>
+                            <div>
+                                <field name="duration" class="oe_form_inline"/>
+                                <field name="product_uom"/>
+                            </div>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Planning of Users">
-                            <field colspan="4" name="user_ids" nolabel="1">
+                            <field name="user_ids">
                                  <tree editable="bottom" string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
+                                      <field name="user_id"/>
+                                      <field name="date_start"/>
+                                      <field name="date_end"/>
                                   </tree>
-                                  <form string="Project Users">
-                                    <field name="user_id"/>
-                                    <field name="date_start" />
-                                    <field name="date_end"/>
+                                  <form string="Project Users" version="7.0">
+                                      <group col="4">
+                                          <field name="user_id"/>
+                                          <field name="date_start" />
+                                          <field name="date_end"/>
+                                      </group>
                                   </form>
                              </field>
                         </page>
                         <page string="Tasks Details">
-                            <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+                            <field name="task_ids" readonly="1" context="{'default_project_id' :project_id}">
                                  <tree string="Project's Tasks">
                                     <field name="sequence"/>
                                     <field name="name"/>
@@ -193,24 +203,23 @@
                              </field>
                         </page>
                         <page string="Constraints">
-                           <group colspan="2" col="2">
-                                <separator string="Constraints" colspan="2"/>
-                                <field name="constraint_date_start"/>
-                                <field name="constraint_date_end"/>
+                           <group>
+                               <group>
+                                    <field name="constraint_date_start"/>
+                                    <field name="constraint_date_end"/>
+                                </group>
+                                <group>
+                                    <field name="sequence"/>
+                                </group>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="Displaying Settings" colspan="2"/>
-                                <field name="sequence"/>
-                            </group>
-                           <separator colspan="4" string="Force Assigned Users"/>
-                           <field colspan="4" name="user_force_ids" nolabel="1"/>
-                           <separator colspan="4" string="Previous Phases"/>
-                           <field colspan="4" name="previous_phase_ids" nolabel="1"/>
-                           <separator colspan="4" string="Next Phases"/>
-                           <field colspan="4" name="next_phase_ids" nolabel="1"/>
+                           <separator string="Force Assigned Users"/>
+                           <field name="user_force_ids"/>
+                           <separator string="Previous Phases"/>
+                           <field name="previous_phase_ids"/>
+                           <separator string="Next Phases"/>
+                           <field name="next_phase_ids"/>
                         </page>
                     </notebook>
-                    <newline/>
                 </sheet>
                 </form>
             </field>
@@ -328,7 +337,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
-                    <field name="phase_id" select="1"/>
+                    <field name="phase_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index b6afc26276b..bf2c51e41e6 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -7,19 +7,15 @@
             <field name="model">project.compute.phases</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                  <form string="Schedule Phases">
-                    <group colspan="4" col="4">
-                        <separator colspan="4" string="Schedule Phases" />
-                        <field name="target_project" colspan="4"/>
-                        <field name="project_id" colspan="4" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
-                        <separator colspan="4"/>
-                        <group colspan="2" col="2">
-                        </group>
-                        <group colspan="2" col="2"> <!-- Improve me -->
-                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                            <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                        </group>
-                    </group>
+                  <form string="Schedule Phases" version="7.0">
+                      <header>
+                          <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
+                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                      </header>
+                      <group string="Schedule Phases">
+                          <field name="target_project"/>
+                          <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
+                      </group>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index bf27e7e7286..2e494166464 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,16 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks">
-                    <group colspan="4">
-                        <field name="project_id" colspan="4"/>
-                        <separator colspan="4"/>
-                        <group colspan="2" col="2">
-                        </group>
-                        <group colspan="2" col="2">
-                            <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                            <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                      </group>
-                    </group>
+                     <header>
+                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
+                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                     </header>
+                     <group>
+                         <field name="project_id"/>
+                     </group>
                   </form>
             </field>
         </record>
diff --git a/addons/project_mailgate/i18n/ja.po b/addons/project_mailgate/i18n/ja.po
new file mode 100644
index 00000000000..090ea6c83bb
--- /dev/null
+++ b/addons/project_mailgate/i18n/ja.po
@@ -0,0 +1,78 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-10 03:13+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "履歴情報"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "メッセージ"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:90
+#, python-format
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:116
+#, python-format
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:110
+#, python-format
+msgid "Done"
+msgstr "完了"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:96
+#, python-format
+msgid "Open"
+msgstr "開く"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:102
+#, python-format
+msgid "Pending"
+msgstr "保留中"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "履歴"
diff --git a/addons/project_messages/i18n/ja.po b/addons/project_messages/i18n/ja.po
new file mode 100644
index 00000000000..afe7d7c97b8
--- /dev/null
+++ b/addons/project_messages/i18n/ja.po
@@ -0,0 +1,112 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-10 03:19+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "宛先"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "プロジェクト.メッセージ"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "送信者"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "メッセージをブロードキャストするためにはこれを空のままとします。"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "メッセージ"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"内部プロジェクトメッセージングシステムはプロジェクトメンバー間で、効率的で追跡可能なコミュニケーションを可能にします。メッセージはシステムに保存され、投稿"
+"分析のために使われます。"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "本日"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "宛先"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+msgid "Message"
+msgstr "メッセージ"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "送信者"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "プロジェクトのメッセージ"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
diff --git a/addons/project_messages/i18n/sv.po b/addons/project_messages/i18n/sv.po
new file mode 100644
index 00000000000..d298d5bcf8a
--- /dev/null
+++ b/addons/project_messages/i18n/sv.po
@@ -0,0 +1,113 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-04 10:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Till"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Från"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Gruppera på..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Registeringsdatum"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "Håll detta tomt för att sända meddelandet."
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Meddelanden"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"En inom-projektetmeddelandehanteringssystem möjliggör en effektiv och "
+"spårbar kommunikation mellan projektmedlemmar. De meddelanden som lagras i "
+"systemet och kan också användas för efter-analys."
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Idag"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Meddelande till"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Fel! Du kan inte eskalera till samma projekt"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+msgid "Message"
+msgstr "Meddelande"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Meddelande från"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Projektmeddelanden"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Fel! projektets startdatum måste föregå projekets slutdatum."
diff --git a/addons/project_mrp/i18n/ja.po b/addons/project_mrp/i18n/ja.po
new file mode 100644
index 00000000000..8670faf2eba
--- /dev/null
+++ b/addons/project_mrp/i18n/ja.po
@@ -0,0 +1,127 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-10 03:33+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-06-10 04:37+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: project_mrp
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "各製品のため。サービスで、そしてオーダーで。"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "調達タスク"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sale order line"
+msgstr "受注オーダー行"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "製品タイプがサービスの時はタスクを生成します。"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "製品タイプがサービスの時はタスクを生成します。"
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "受注オーダータスク"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "製品"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "調達"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "タスクはサービスを提供するために作成されます。"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "オーダータスク"
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "タスクの作成"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_ordertask0
+msgid "If procurement method is Make to order and supply method is produce"
+msgstr "調達方法がオーダーを作成、かつ供給方法が製造の場合、"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "そのケースでは受注オーダーでサービスを売ります。"
+
+#. module: project_mrp
+#: field:project.task,sale_line_id:0
+msgid "Sale Order Line"
+msgstr "受注オーダー行"
diff --git a/addons/project_planning/__init__.py b/addons/project_planning/__init__.py
deleted file mode 100644
index 3cf91b8b9f7..00000000000
--- a/addons/project_planning/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import project_planning
-import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
deleted file mode 100644
index 008ac1b577c..00000000000
--- a/addons/project_planning/__openerp__.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Resources Planing',
-    'version': '1.0',
-    "category": "Project Management",
-    'description': """Keep track of your planning
-This module helps you to manage your plannings.
-===============================================
-
-This module is based on the analytic accounting and is totally integrated with
-* the timesheets encoding
-* the holidays management
-* the project management
-
-So that, each department manager can know if someone in his team has still unallocated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
-
-At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
-""",
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'images': ['images/planning_statistics.jpeg','images/project_planning.jpeg'],
-    'depends': [
-        'project',
-        'hr_timesheet',
-        'hr_holidays',
-    ],
-    'init_xml': [],
-    'update_xml': [
-        'security/ir.model.access.csv',
-        'project_planning_view.xml',
-        'project_planning_report.xml',
-        'board_project_planning_view.xml',
-    ],
-    'demo_xml': [
-        'project_planning_demo.xml',
-    ],
-    'test': [
-        'test/planning_states.yml',
-        'test/project_planning_report.yml'
-    ],
-    'installable': True,
-    'auto_install': False,
-    'certificate': '0034901836973',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/board_project_planning_view.xml b/addons/project_planning/board_project_planning_view.xml
deleted file mode 100644
index db29a7f067a..00000000000
--- a/addons/project_planning/board_project_planning_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="board_project_planning_form" model="ir.ui.view">
-            <field name="name">board.project.planning.form</field>
-            <field name="model">board.board</field>
-			<field name="inherit_id" ref="project.board_project_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-      		<xpath expr="/form/board/column/action[@string='My Open Tasks']" position="after">
-				<action name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
-			</xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/project_planning/i18n/ar.po b/addons/project_planning/i18n/ar.po
deleted file mode 100644
index 1b422021203..00000000000
--- a/addons/project_planning/i18n/ar.po
+++ /dev/null
@@ -1,623 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"وتعطى هذه القيمة على مجموع العمل المتبقي للقيام في هذه المهمة لهذا التخطيط، "
-"والتي أعرب عنها في أيام."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "احصائيات التخطيط"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "خط التخطيط"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "الوقت الغير المخصص الكلي"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "اسم التخطيط"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "خطأ ! لا يمكنك انشاء مهام رجعية."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "تخطيط المشروع الخاص بي"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "سجل الدوام"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"مع نظام عالمي لجدولة جميع الموارد لشركة (الناس والمادية)، OpenERP يسمح لك "
-"لتشفير ومن ثم حساب المهام تلقائيا وجدولة مراحل، وتتبع تخصيص الموارد وتوافر."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "المهام المخططة الكلية"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "حساب"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "مهمة"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "ملاحظات"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "التخطيطات"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "مشروع"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "ابدء المهمة"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "ملغي"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "المخطط الكلي (في الايام)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr "تخطيط غير صالح ! لا يمكن لتواريخ التخطيط ان تتشابك لنفس المسؤول. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "التخطيط بالحساب"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "التخطيطات الحالية"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "حساب تحليلي"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "إعادة التعيين لمسودة"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "معلومات إضافية"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "المخطط الكلي"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"القيمة المعطاه من مجموع كل الاعمال المشفره في سجل الدوام بين ‘شكل التاريخ‘ و "
-"‘حتى الان لـ‘ من التخطيط."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "تخصيص الوقت بدون المهام"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "خطوط التخطيط"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "حساب تحليلي"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"تُعطى القيمة من مجموع تخصيص الوقت مع التحقق من خانة ‘عيين في المهامُ وتعيين "
-"الى خطأ, واعرب عنها في الايام."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "متفرقات"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "وستحدد هذه وحدة القياس المستخدمه في التخطيطات."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "تخطيط المصادر البشرية"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "المهام المتبقية"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "التخطيط"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "إلى :"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "تشفير الوقت"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "الوقت الغير المخصص"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"تُعطى القيمة بمجموع تخصيص الوقت بدون المهام المتصلة, التي اعربت في ايام."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "تفويض"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "تحليل التخطيط"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr "ضع هنا عدد ايام العمل من خلال التخطيط هذا لشخص واحد كل الوقت"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "من :"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "التخطبط بواسطة المستخدم"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "مهام"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "التخطيط بواسطة الحساب (في الايام)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "الوقت بدون مهام"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "تاريخ البدء"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "الحر الكلي"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"تُعطى هذه القيمة بمجموع الوقت المخصص مع التحقق من الخانة ‘عُيينت في المهام‘ "
-"المعين للصحيح التي أُعرب عنها في الايام."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"تُحسب كأيام عمل -(تخصيص الوقت للمهام + تخصيص الوقت بدون المهام + ايام "
-"الاجازه)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "وحدة قياس الكمية"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "ملاحظة"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "مسودة"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "التخطيط بالحساب"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "معلّق"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "ايام التخطيط"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "الحالة"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"تُعطى هذه القيمة بالمجموع الكلي لايام الغياب المتحقق من صحته الى ‘تاريخ من‘ "
-"و ‘تاريخ الى‘ للتخطيط."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "مستخدم"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "المهام المتبقية الكلية"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "الشركات"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "الكمية في وحدة القياس الاساسية"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "الوقت المخطط للمهام"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "كمية"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "الرمز"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "خطوط التخطيط"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "تم"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "التخطيط بالمستخدم (بالايام)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "احصائيات التخطيط"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "فتح"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "التخطيط بالمستخدم"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "معلومات"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "أيام العمل"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "إعادة تنشيط"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "خطأ! يجب ان يكون تاريخ انتهاء المهمة اكبر من تاريخ البداية"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "مسؤول"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "القانون الاساسي للتخطيط"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "تخصيص الوقت للمهام"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "الملخص بالمستخدم"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "الوقت الكلي المخصص بدون المهام"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "أطراف المشجر"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "الوقت الكلي المخصص للمهام"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "تاريخ الإنتهاء"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "اسم الشركة يجب أن يكون فريداً !"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "المهام المتبقية"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "الملخص من المشروع"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "المسؤول:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "وحدة تخطيط الوقت"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "تخطيط المهام"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "مدير"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"تُعطى هذه القيمة من مجموع الوقت المخصص مع المهام المتصلة, أُعرب عنها في "
-"الايام."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "خطأ! العملة لابد و أن تكون مثل العملة للشركة المختارة"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "متفرقات"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "وحدة ادارة التخطيط"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "تساعدك هذه الوحدة تساعدك على إدارة التخطيطات الخاصة بك.\n"
-#~ "\n"
-#~ "وتستند هذه الوحدة على المحاسبة التحليلية ويتكامل تماما مع\n"
-#~ "* الجداول الزمنية الترميز\n"
-#~ "* إدارة العطل \n"
-#~ "*إدارة المشروع \n"
-#~ "\n"
-#~ "بحيث يمكن لكل مدير دائرة معرفة ما إذا كان شخص ما في فريقه وغير مخصصة لا يزال "
-#~ "الوقت لتنظيم معين (مع الأخذ في الاعتبار التحقق من صحة أوراق) او ما اذا كان "
-#~ "ما زال يحتاج لترميز المهام.\n"
-#~ "\n"
-#~ "في نهاية هذا الشهر، يمكن لمدير التخطيط تحقق أيضا إذا كان يتم احترام سجلات "
-#~ "الدوام المرمزة في الوقت المخطط لها في كل حساب تحليلي.\n"
diff --git a/addons/project_planning/i18n/bg.po b/addons/project_planning/i18n/bg.po
deleted file mode 100644
index a720e6f6935..00000000000
--- a/addons/project_planning/i18n/bg.po
+++ /dev/null
@@ -1,572 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Bulgarian <bg@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Статистика Планиране"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Грешка! Не можете да създавате рекурсивни задачи."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "График"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Общо планирани задачи"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Сметка"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Задача"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Бележки"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Проект"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Начало на задача"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Отказан"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналитична сметка"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Пращане в проект"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Допълнителна информация"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Общо планирани"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Грешка! Не можете да създадете рекурсивни аналитични сметки."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Аналтична сметка"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Разни"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Планиране"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "До:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Упълномощаване"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Задачи"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Начална дата"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Бележка"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Чернова"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Висящи"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Планирани дни"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Статус"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Потребител"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Общо оставящи задачи"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Фирми"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Количество"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Код"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Завършен"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Отмяна"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Отваряне"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Информация"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Отговорник"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Напускащи"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Крайна дата"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Отговорник :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Планирани задачи"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Мениджър"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Грешка! Валутата трябва да бъде същата като валутата на избраната компания"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Разни"
diff --git a/addons/project_planning/i18n/bs.po b/addons/project_planning/i18n/bs.po
deleted file mode 100644
index cc72e2582e3..00000000000
--- a/addons/project_planning/i18n/bs.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Bosnian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:20+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bosnian <bs@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/ca.po b/addons/project_planning/i18n/ca.po
deleted file mode 100644
index a7992262a28..00000000000
--- a/addons/project_planning/i18n/ca.po
+++ /dev/null
@@ -1,637 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:54+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Catalan <ca@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Aquest valor ve donat per la suma de treball que queda per fer en la tasca "
-"d'aquesta planificació, expressat en dies."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estadístiques de planificació"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Línia de planificació"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Temps total no assignat"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nom planificació"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Error! No podeu crear tasques recursives."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Les meves planificacions de projectes"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Full d'assistència"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Amb el seu sistema global per planificar tots els recursos d'una empresa "
-"(persones i materials), OpenERP li permet codificar i calcular "
-"automàticament la planificació de tasques i fases, i controlar l'assignació "
-"i disponibilitat de recursos."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de tasques planificades"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Comptabilitat"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tasca"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notes"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planificacions"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projecte"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Inicia tasca"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Cancel·lada"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Planificació total (en dies)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Planificació invàlida! Les dates de planificació no es poden superposar per "
-"al mateix càrrec. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planificació per compte"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planificacions actuals"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte analític"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Canvia a esborrany"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Informació extra"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total planejat"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Aquest valor ve donat per la suma de tots els treballs codificats en la/es "
-"fulla/es de serveis entre la 'Data des de' i la 'Data fins' de la "
-"planificació."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! No podeu crear comptes analítics recursius."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Temps d'assignació sense tasques"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Línies planificades"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! No podeu crear companyies recursives."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Compte analític"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Aquest valor ve donat per la suma de l'assignació de temps amb l'opció "
-"'Assignat en tasques' desmarcada, expressat en dies."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Varis"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Això establirà la unitat de mesura utilitzada en les planificacions."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificació RRHH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tasques pendents"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planificació"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Per:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificació del temps"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Temps no assignat"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Aquest valor ve donat per la suma de l'assignació de temps sense tasca/ques "
-"vinculada/es, expressat en dies."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegat"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Anàlisis planificació"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Indiqueu aquí el número de dies de treball dins d'aquesta planificació per "
-"una persona a temps complet."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "De:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planificació per usuari"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tasques"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planificació per compte (en dies)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Temps sense tasques"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data inicial"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total lliure"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Aquest valor ve donat per la suma de l'assignació de temps amb l'opció "
-"\"Assignat en tasques\" marcada expressat en dies."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculat com a dies laborables - (Temps d'assignació de les tasques + Temps "
-"d'assignació sense tasques + Absències de vacances)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Qtat UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificació per compte"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendent"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Dies planificats"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Posició"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Aquest valor ve donat pel total de les absències validades entre la 'Data "
-"des de' i la 'Data fins a' de la planificació."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Usuari"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total de tasques pendents"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Companyies"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Quantitat en la UdM base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Temps planificat en tasques"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Quantitat"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Codi"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Línies planificació"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Realitzat"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Canceŀla"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planificació per usuari (en dies)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estadístiques de planificació"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Obert"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planificació per usuari"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informació"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Dies laborables"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reactiva"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Error ! La data final de la tasca ha de ser major que la data d'inici"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estad. planificació"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Temps d'assignació de tasques"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resum per usuari"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Temps total d'assignació sense tasques"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Absències"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Temps total d'assignació de tasques"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Data final"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tasques pendents"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resum per projecte"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsable:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unitat de temps de planificació"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planificació de tasques"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Director"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Aquest valor ve donat per la suma de l'assignació de temps amb la/es "
-"tasca/ques enllaçada/es, expressat en dies."
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Varis"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Error! La moneda ha de ser la mateixa que la moneda de la companyia "
-#~ "seleccionada."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Mòdul per la gestió de la planificació"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Aquest mòdul li permet gestionar les seves planificacions.\n"
-#~ "\n"
-#~ "Aquest mòdul es basa en la comptabilitat analítica i està totalment integrat "
-#~ "amb\n"
-#~ "* la codificació de fulles de serveis\n"
-#~ "* la gestió de les vacances/festes\n"
-#~ "* la gestió de projectes\n"
-#~ "\n"
-#~ "D'aquesta forma, cada responsable de departament pot saber si algú en el seu "
-#~ "equip encara té temps no assignat per una certa planificació (tenint en "
-#~ "compte les vacances validades) o si encara ho necessiteu per codificar "
-#~ "tasques.\n"
-#~ "\n"
-#~ "Al final del mes, el responsable de planificació també pot comprovar si les "
-#~ "fulles de serveis codificades estan respectant el temps planificat en cada "
-#~ "compte analític.\n"
diff --git a/addons/project_planning/i18n/cs.po b/addons/project_planning/i18n/cs.po
deleted file mode 100644
index f7b40df39c9..00000000000
--- a/addons/project_planning/i18n/cs.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:20+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech <cs@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/da.po b/addons/project_planning/i18n/da.po
deleted file mode 100644
index 75eb788cc47..00000000000
--- a/addons/project_planning/i18n/da.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-27 06:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/de.po b/addons/project_planning/i18n/de.po
deleted file mode 100644
index 728caa9c7c4..00000000000
--- a/addons/project_planning/i18n/de.po
+++ /dev/null
@@ -1,633 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:18+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Dieser Wert repräsentiert die gesamte noch verfügbare Arbeitszeit für die "
-"Planung der Aufgabenzuweisung an Mitarbeiter."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Auswertung verfügbarer Zeitressourcen"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Planungsposition"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Gesamtverfügbare Arbeitszeit"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Ressourcenplanung"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Meine Projektplanung"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Zeiterfassung"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Sämtliche Ressourcen eines Unternehmens (Personal- und Sachmittel) können "
-"durch die umfassende Planungslogik zunächst definiert werden, bevor über "
-"automatische Planungsassistenten Aufgabendauern und Projektphasen unter "
-"gleichzeitiger Berücksichtigung von Verfügbarkeiten zugewiesen werden."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Anzahl geplanter Aufgaben"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Analysekonto"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Aufgabe"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Bemerkungen"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planung Mitarbeiterauslastung"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Beginn Aufgabe"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Gesamtverplante Zeit (in Tagen)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Fehler bei der Planung ! Daten für Zuweisung von Aufgaben oder Zeitfenstern "
-"überschneiden sich für diesen Mitarbeiter. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Verplante Zeiten nach Analysekonto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Aktuelle Auslastungsplanung"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analytisches Konto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Zurücksetzen auf Entwurf"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Extra Information"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Gesamt Auslastung"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Dieser Wert zeigt die Summe der Zeiten mit vorhandener Aufgabenzuweisung im "
-"Rahmen dieser Planung zwischen dem 'Beginn am' und 'Ende am' Datum."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Verfügbare Zeit ohne Aufgabe"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Planungspositionen"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Analytisches Konto"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Dieser Wert zeigt die Summe der Auslastungsplanung in Tagen ausgedrückt, mit "
-"dem Merkmal dass noch keine einzelnen Aufgaben zugewiesen wurden..."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-"Definition der Zeiteinheit für diese Planung ausgedrückt durch eine "
-"Mengeneinheit."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Personalplanung"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Noch Verfügbare Zeit"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Auslastungsplanung"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "An:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Verplane Arbeitszeiten"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Verfügbare Arbeitszeit"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Die Summe für noch freie Arbeitszeitressourcen, ohne aktuell zugewiesene "
-"Aufgaben, ausgedrückt in Tagen."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegiere"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Analyse Planung"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Definieren Sie hier die Arbeitstage in diesem Zeitraum für eine Vollkraft."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Von:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planung nach Benutzer"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Auslastungsplanung nach Analysekonto (in Tagen)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Verfügbare Arbeitszeiten"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Beginn am"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Verfügbare Zeit"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Die Summe für nicht mehr freie Arbeitszeitressourcen, aufgrund der aktuell "
-"zugewiesenen Aufgabenauslastung, ausgedrückt in Tagen."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Berechnet in Arbeitstagen - (verplante Zeit für konkrete Aufgaben + "
-"verplante Zeit ohne konkrete Aufgaben + Urlaubszeit)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Anzahl (ME)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Bemerkung"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planung nach Analysekonto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Im Wartezustand"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Geplante Tage"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Dieser Wert repräsentiert die Summe der genehmigten Urlaubstage für den "
-"Planungszeitraum zwischen 'Beginn am' und 'Ende am'"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Benutzer"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Gesamtverfügbare Zeit"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Unternehmen"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Anzahl in ME"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Geplante Aufgabenzeit"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Menge"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Kurzbez."
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Planungspositionen"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Verfügbare Zeiten nach Benutzern (in Tagen)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Auswertungen Planung"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Offen"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planung nach Benutzer"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Information"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Arbeitstage"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reaktiviere"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Verantwortlich"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Auswertung verfügbarer Zeitressourcen"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Verplante Zeiten für Aufgaben"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Gesamtsumme nach Benutzer"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Gesamtverfügbare Zeit ohne Aufgabenzuweisung"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Abwesenheit"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Gesamtzeit mit zugewiesener Aufgabe"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Bis Datum"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Der Name der Firma darf nur einmal vorkommen!"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Verbleibende Aufgaben"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Zeiten nach Projekt"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Verantwortlich:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Projekt Zeiteinheit"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Aufgabenzuweisung"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Dieser Wert repräsentiert die Summe der verplanten Zeitressource durch "
-"zugewiesene Aufgaben."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Management Zeitressourcen"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Verschiedenes"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Diese Anwendung hilft Ihnen bei der Planung Ihrer Ressourcen.\n"
-#~ "\n"
-#~ "Das Modul basiert auf der Analytischen Buchhaltung und ist vollständig "
-#~ "integriert mit\n"
-#~ "* der Zeiterfassung\n"
-#~ "* der Urlaubsplanung\n"
-#~ "* dem Projektmanagement\n"
-#~ "\n"
-#~ "Somit weiss jeder Projektmanager zu jeder Zeit, ob ein Mitarbeiter seiner "
-#~ "Arbeitsgruppe noch freie Zeitressourcen hat\n"
-#~ "und somit für Projekte oder andere Aufgaben disponiert werden kann. \n"
-#~ "\n"
-#~ "Zum Monatsende kann der Projektmanager dann überprüfen, inwieweit die "
-#~ "geplanten Zeiten mit tatsächlich erfassten (und abrechenbaren) Zeiten "
-#~ "übereinstimmen oder in welcher Höhe eine Abweichung vorliegt.\n"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Fehler! Die Währung muss der Währung des Unternehmens entsprechen"
diff --git a/addons/project_planning/i18n/el.po b/addons/project_planning/i18n/el.po
deleted file mode 100644
index e14a7aac553..00000000000
--- a/addons/project_planning/i18n/el.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:20+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Στατιστικά Σχεδιασμού"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Γραμμή Σχεδιασμού"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Όνομα Σχεδιασμού"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Χρονοδιάγραμμα"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Έργο"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Αναλυτικός Λογαριασμός"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Συνολικός Σχεδιασμός"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Αναλυτικός λογαριασμός"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Σχεδιασμός Ανθρώπινου Δυναμικού"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Σχεδιασμός"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Ανάλυση Σχεδιασμού"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Εργασίες"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Ημερομηνία Έναρξης"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Ποσότητα 1ης ΜΜ"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Σημείωση"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Σχεδίαση κατα Λογαριασμό"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Κατάσταση"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Χρήστης"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Ποσότητα"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Γραμμές σχεδιασμού"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Εκπληρωμένο"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Στατιστικά Σχεδιασμού"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Ανοιχτό"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Υπεύθυνος"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Στατιστική Σχεδιασμού"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Περίληψη κατα χρήστη"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Ημερομηνία Λήξης"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Περίληψη κατα έργο"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Διαχειριστής"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/es.po b/addons/project_planning/i18n/es.po
deleted file mode 100644
index 17eb50ecc91..00000000000
--- a/addons/project_planning/i18n/es.po
+++ /dev/null
@@ -1,637 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de trabajo que queda por hacer en la tarea "
-"de esta planificación, expresado en días."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Línea de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Tiempo no asignado total"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nombre planificación"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Mis planificaciones de proyectos"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Hoja de servicios"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Con su sistema global para planificar todos los recursos de una compañía "
-"(personas y materiales), OpenERP le permite codificar y calcular "
-"automáticamente la planificación de tareas y fases, y controlar la "
-"asignación y disponibilidad de recursos."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de tareas planificadas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Cuenta"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planificaciones"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Iniciar tarea"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Planificación total (en días)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"¡Planificación no válida! Las fechas de la planificación no pueden "
-"superponerse para el mismo responsable. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planificaciones actuales"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total planificado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por la suma de todos los trabajos codificados en la(s) "
-"hoja(s) de servicios entre la 'Fecha desde' y la 'Fecha hasta' de la "
-"planificación."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Tiempo de asignación sin tareas"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Líneas planificadas"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"'Asignado en tareas' desmarcada, expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-"Esto establecerá la unidad de medida utilizada en las planificaciones."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificación RRHH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Hasta:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificación de tiempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Tiempo no asignado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo sin tarea(s) "
-"vinculada(s), expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análisis planificación"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Indique aquí el número de días de trabajo dentro de esta planificación para "
-"una persona a tiempo completo."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Desde:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planificación por cuenta (en días)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tiempo sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total libre"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"\"Asignado en tareas\" marcada expresado en días."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculado como días laborables - (Tiempo de asignación de las tareas + "
-"Tiempo de asignación sin tareas + Ausencias de vacaciones)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Ctdad UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Días planificados"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por el total de las ausencias validadas entre la "
-"'Fecha desde' y la 'Fecha hasta' de la planificación."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total de tareas pendientes"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Cantidad en la UdM base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tiempo planificado en tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Líneas planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planificación por usuario (en días)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Información"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Días laborables"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reactivar"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estad. planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Tiempo de asignación de tareas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumen por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Tiempo total de asignación sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Ausencias"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Tiempo total de asignación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumen por proyecto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsable:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unidad de tiempo de planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planificación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la(s) "
-"tarea(s) enlazada(s), expresado en días."
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Varios"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Módulo para la gestión de la planificación"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo le permite gestionar sus planificaciones.\n"
-#~ "\n"
-#~ "Este módulo se basa en la contabilidad analítica y está totalmente integrado "
-#~ "con\n"
-#~ "* la codificación de hojas de servicios\n"
-#~ "* las gestión de las vacaciones/fiestas\n"
-#~ "* la gestión de proyectos\n"
-#~ "\n"
-#~ "De esta forma, cada responsable de departamento puede saber si alguien en su "
-#~ "equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
-#~ "en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
-#~ "tareas.\n"
-#~ "\n"
-#~ "Al final del mes, el responsable de planificación también puede comprobar si "
-#~ "las hojas de servicios codificadas están respetando el tiempo planificado en "
-#~ "cada cuenta analítica.\n"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
diff --git a/addons/project_planning/i18n/es_AR.po b/addons/project_planning/i18n/es_AR.po
deleted file mode 100644
index db5e7157b98..00000000000
--- a/addons/project_planning/i18n/es_AR.po
+++ /dev/null
@@ -1,346 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* report_analytic_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-22 20:32+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "To:"
-msgstr "Hasta:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumen por proyecto"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Ctdad UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estad. planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
-msgid "Planning account stat"
-msgstr "Estad. cuenta de planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned hours"
-msgstr "Horas planeadas"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Real"
-msgstr "Real"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
-msgid "My Planning Statistics"
-msgstr "Mis estadísticas de planificación"
-
-#. module: project_planning
-#: model:ir.module.module,description:project_planning.module_meta_information
-msgid "Planning on analytic accounts."
-msgstr "Planificación en cuentas analíticas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nombre planificación"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Quantities"
-msgstr "Cantidades"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificación de RRHH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.account,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.user,sum_amount_real:0
-msgid "Timesheet"
-msgstr "Hoja de tareas"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning:0
-msgid "Planning Line"
-msgstr "Línea de planificación"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Responsible:"
-msgstr "Responsable:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by Account"
-msgstr "Cantidades por cuenta"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "From:"
-msgstr "De:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by Account"
-msgstr "Tiempo por cuenta"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Fecha de fin"
-
-#. module: project_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista !"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by User"
-msgstr "Tiempo por usuario"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
-msgid "Planning Statistics of My Projects"
-msgstr "Estadísticas de planificación de mis proyectos"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
-msgid "Current Planning"
-msgstr "Planificación actual"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumen por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Analysis"
-msgstr "Análisis"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.stat.user,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Timesheet"
-msgstr "Total hoja de tareas"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Details of user's time by projects"
-msgstr "Detalle del tiempo del usuario por proyectos"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
-msgid "Planning user stat"
-msgstr "Estad. planificación del usuario"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat.account,quantity:0
-#: field:report_account_analytic.planning.stat.user,quantity:0
-msgid "Planned"
-msgstr "Planificado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análisis de planificación"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Líneas de planificación"
-
-#. module: project_planning
-#: model:ir.module.module,shortdesc:project_planning.module_meta_information
-msgid "Analytic planning - Reporting"
-msgstr "Planificación analítica - Informes"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
-msgid "My Planning"
-msgstr "Mi planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_user_ids:0
-msgid "Planning by user"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_account_ids:0
-msgid "Planning by account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by User"
-msgstr "Cantidades por usuario"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
-msgid "My Current Planning"
-msgstr "Mi planificación actual"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat.account,account_id:0
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Gerente"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: model:ir.ui.menu,name:project_planning.planning_main
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.stat.account,planning_id:0
-#: field:report_account_analytic.planning.stat.user,planning_id:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Planned"
-msgstr "Total planeado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Fecha de inicio"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
-msgid "New Planning"
-msgstr "Nueva planificación"
diff --git a/addons/project_planning/i18n/es_CR.po b/addons/project_planning/i18n/es_CR.po
deleted file mode 100644
index db3707e24ce..00000000000
--- a/addons/project_planning/i18n/es_CR.po
+++ /dev/null
@@ -1,638 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-17 22:34+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-"Language: es\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de trabajo que queda por hacer en la tarea "
-"de esta planificación, expresado en días."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Línea de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Tiempo no asignado total"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nombre planificación"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Mis planificaciones de proyectos"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Hoja de servicios"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Con su sistema global para planificar todos los recursos de una compañía "
-"(personas y materiales), OpenERP le permite codificar y calcular "
-"automáticamente la planificación de tareas y fases, y controlar la "
-"asignación y disponibilidad de recursos."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de tareas planificadas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Cuenta"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planificaciones"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Iniciar tarea"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Planificación total (en días)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"¡Planificación no válida! Las fechas de la planificación no pueden "
-"superponerse para el mismo responsable. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planificaciones actuales"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total planificado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por la suma de todos los trabajos codificados en la(s) "
-"hoja(s) de servicios entre la 'Fecha desde' y la 'Fecha hasta' de la "
-"planificación."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Tiempo de asignación sin tareas"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Líneas planificadas"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"'Asignado en tareas' desmarcada, expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-"Esto establecerá la unidad de medida utilizada en las planificaciones."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificación RRHH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Hasta:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificación de tiempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Tiempo no asignado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo sin tarea(s) "
-"vinculada(s), expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análisis planificación"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Indique aquí el número de días de trabajo dentro de esta planificación para "
-"una persona a tiempo completo."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Desde:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planificación por cuenta (en días)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tiempo sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total libre"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"\"Asignado en tareas\" marcada expresado en días."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculado como días laborables - (Tiempo de asignación de las tareas + "
-"Tiempo de asignación sin tareas + Ausencias de vacaciones)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Ctdad UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Días planificados"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por el total de las ausencias validadas entre la "
-"'Fecha desde' y la 'Fecha hasta' de la planificación."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total de tareas pendientes"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Cantidad en la UdM base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tiempo planificado en tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Líneas planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planificación por usuario (en días)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Información"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Días laborables"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reactivar"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estad. planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Tiempo de asignación de tareas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumen por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Tiempo total de asignación sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Ausencias"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Tiempo total de asignación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "¡El nombre de la compañía debe ser único!"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumen por proyecto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsable:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unidad de tiempo de planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planificación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la(s) "
-"tarea(s) enlazada(s), expresado en días."
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Varios"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Módulo para la gestión de la planificación"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo le permite gestionar sus planificaciones.\n"
-#~ "\n"
-#~ "Este módulo se basa en la contabilidad analítica y está totalmente integrado "
-#~ "con\n"
-#~ "* la codificación de hojas de servicios\n"
-#~ "* las gestión de las vacaciones/fiestas\n"
-#~ "* la gestión de proyectos\n"
-#~ "\n"
-#~ "De esta forma, cada responsable de departamento puede saber si alguien en su "
-#~ "equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
-#~ "en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
-#~ "tareas.\n"
-#~ "\n"
-#~ "Al final del mes, el responsable de planificación también puede comprobar si "
-#~ "las hojas de servicios codificadas están respetando el tiempo planificado en "
-#~ "cada cuenta analítica.\n"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
diff --git a/addons/project_planning/i18n/es_MX.po b/addons/project_planning/i18n/es_MX.po
deleted file mode 100644
index 4383e348b6b..00000000000
--- a/addons/project_planning/i18n/es_MX.po
+++ /dev/null
@@ -1,629 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-17 21:01+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de trabajo que queda por hacer en la tarea "
-"de esta planificación, expresado en días."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Línea de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Tiempo no asignado total"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nombre planificación"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Mis planificaciones de proyectos"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Hoja de servicios"
-
-#. module: project_planning
-#: model:ir.module.module,shortdesc:project_planning.module_meta_information
-msgid "Planning Management Module"
-msgstr "Módulo para la gestión de la planificación"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Con su sistema global para planificar todos los recursos de una compañía "
-"(personas y materiales), OpenERP le permite codificar y calcular "
-"automáticamente la planificación de tareas y fases, y controlar la "
-"asignación y disponibilidad de recursos."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de tareas planificadas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Cuenta"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planificaciones"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Iniciar tarea"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Planificación total (en días)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"¡Planificación no válida! Las fechas de la planificación no pueden "
-"superponerse para el mismo responsable. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planificaciones actuales"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Hasta:"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por la suma de todos los trabajos codificados en la(s) "
-"hoja(s) de servicios entre la 'Fecha desde' y la 'Fecha hasta' de la "
-"planificación."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Tiempo de asignación sin tareas"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Líneas planificadas"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"'Asignado en tareas' desmarcada, expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-"Esto establecerá la unidad de medida utilizada en las planificaciones."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificación RRHH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total planificado"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificación de tiempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Tiempo no asignado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo sin tarea(s) "
-"vinculada(s), expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculado como días laborables - (Tiempo de asignación de las tareas + "
-"Tiempo de asignación sin tareas + Ausencias de vacaciones)"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Indique aquí el número de días de trabajo dentro de esta planificación para "
-"una persona a tiempo completo."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Desde:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planificación por cuenta (en días)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tiempo sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total libre"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"\"Asignado en tareas\" marcada expresado en días."
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análisis planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Ctdad UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Días planificados"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por el total de las ausencias validadas entre la "
-"'Fecha desde' y la 'Fecha hasta' de la planificación."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total de tareas pendientes"
-
-#. module: project_planning
-#: model:ir.module.module,description:project_planning.module_meta_information
-msgid ""
-"\n"
-"This module helps you to manage your plannings.\n"
-"\n"
-"This module is based on the analytic accounting and is totally integrated "
-"with\n"
-"* the timesheets encoding\n"
-"* the holidays management\n"
-"* the project management\n"
-"\n"
-"So that, each department manager can know if someone in his team has still "
-"unallocated time for a given planning (taking in consideration the validated "
-"leaves) or if he still needs to encode tasks.\n"
-"\n"
-"At the end of the month, the planning manager can also check if the encoded "
-"timesheets are respecting the planned time on each analytic account.\n"
-msgstr ""
-"\n"
-"Este módulo le permite gestionar sus planificaciones.\n"
-"\n"
-"Este módulo se basa en la contabilidad analítica y está totalmente integrado "
-"con\n"
-"* la codificación de hojas de servicios\n"
-"* las gestión de las vacaciones/fiestas\n"
-"* la gestión de proyectos\n"
-"\n"
-"De esta forma, cada responsable de departamento puede saber si alguien en su "
-"equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
-"en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
-"tareas.\n"
-"\n"
-"Al final del mes, el responsable de planificación también puede comprobar si "
-"las hojas de servicios codificadas están respetando el tiempo planificado en "
-"cada cuenta analítica.\n"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Cantidad en la UdM base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tiempo planificado en tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Líneas planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planificación por usuario (en días)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Información"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Días laborables"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reactivar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estad. planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Tiempo de asignación de tareas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumen por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Tiempo total de asignación sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Ausencias"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Tiempo total de asignación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumen por proyecto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsable:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unidad de tiempo de planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planificación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la(s) "
-"tarea(s) enlazada(s), expresado en días."
diff --git a/addons/project_planning/i18n/es_VE.po b/addons/project_planning/i18n/es_VE.po
deleted file mode 100644
index 4383e348b6b..00000000000
--- a/addons/project_planning/i18n/es_VE.po
+++ /dev/null
@@ -1,629 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-17 21:01+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de trabajo que queda por hacer en la tarea "
-"de esta planificación, expresado en días."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Línea de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Tiempo no asignado total"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nombre planificación"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Mis planificaciones de proyectos"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Hoja de servicios"
-
-#. module: project_planning
-#: model:ir.module.module,shortdesc:project_planning.module_meta_information
-msgid "Planning Management Module"
-msgstr "Módulo para la gestión de la planificación"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Con su sistema global para planificar todos los recursos de una compañía "
-"(personas y materiales), OpenERP le permite codificar y calcular "
-"automáticamente la planificación de tareas y fases, y controlar la "
-"asignación y disponibilidad de recursos."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de tareas planificadas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Cuenta"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planificaciones"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Iniciar tarea"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Planificación total (en días)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"¡Planificación no válida! Las fechas de la planificación no pueden "
-"superponerse para el mismo responsable. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planificaciones actuales"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Hasta:"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por la suma de todos los trabajos codificados en la(s) "
-"hoja(s) de servicios entre la 'Fecha desde' y la 'Fecha hasta' de la "
-"planificación."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Tiempo de asignación sin tareas"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Líneas planificadas"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"'Asignado en tareas' desmarcada, expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-"Esto establecerá la unidad de medida utilizada en las planificaciones."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificación RRHH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total planificado"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificación de tiempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Tiempo no asignado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo sin tarea(s) "
-"vinculada(s), expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculado como días laborables - (Tiempo de asignación de las tareas + "
-"Tiempo de asignación sin tareas + Ausencias de vacaciones)"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Indique aquí el número de días de trabajo dentro de esta planificación para "
-"una persona a tiempo completo."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Desde:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planificación por cuenta (en días)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tiempo sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total libre"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la opción "
-"\"Asignado en tareas\" marcada expresado en días."
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análisis planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Ctdad UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificación por cuenta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Días planificados"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Este valor viene dado por el total de las ausencias validadas entre la "
-"'Fecha desde' y la 'Fecha hasta' de la planificación."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total de tareas pendientes"
-
-#. module: project_planning
-#: model:ir.module.module,description:project_planning.module_meta_information
-msgid ""
-"\n"
-"This module helps you to manage your plannings.\n"
-"\n"
-"This module is based on the analytic accounting and is totally integrated "
-"with\n"
-"* the timesheets encoding\n"
-"* the holidays management\n"
-"* the project management\n"
-"\n"
-"So that, each department manager can know if someone in his team has still "
-"unallocated time for a given planning (taking in consideration the validated "
-"leaves) or if he still needs to encode tasks.\n"
-"\n"
-"At the end of the month, the planning manager can also check if the encoded "
-"timesheets are respecting the planned time on each analytic account.\n"
-msgstr ""
-"\n"
-"Este módulo le permite gestionar sus planificaciones.\n"
-"\n"
-"Este módulo se basa en la contabilidad analítica y está totalmente integrado "
-"con\n"
-"* la codificación de hojas de servicios\n"
-"* las gestión de las vacaciones/fiestas\n"
-"* la gestión de proyectos\n"
-"\n"
-"De esta forma, cada responsable de departamento puede saber si alguien en su "
-"equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
-"en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
-"tareas.\n"
-"\n"
-"Al final del mes, el responsable de planificación también puede comprobar si "
-"las hojas de servicios codificadas están respetando el tiempo planificado en "
-"cada cuenta analítica.\n"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Cantidad en la UdM base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tiempo planificado en tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Cantidad"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Líneas planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planificación por usuario (en días)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estadísticas de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Información"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Días laborables"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reactivar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estad. planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Tiempo de asignación de tareas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumen por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Tiempo total de asignación sin tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Ausencias"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Tiempo total de asignación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tareas pendientes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumen por proyecto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsable:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unidad de tiempo de planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planificación de tareas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor viene dado por la suma de la asignación de tiempo con la(s) "
-"tarea(s) enlazada(s), expresado en días."
diff --git a/addons/project_planning/i18n/et.po b/addons/project_planning/i18n/et.po
deleted file mode 100644
index 2698052b535..00000000000
--- a/addons/project_planning/i18n/et.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Estonian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian <et@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Plaanimise Statistika"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Plaanimise Rida"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Planeerimise Nimi"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Ajagraafik"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Kokku Planeeritud"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Analüütiline konto"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "HR Planeerimine"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planeerimine"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Planeerimise analüüs"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Ülesanded"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Alguskuupäev"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Mõõtühikute kogus"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Märkus"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planeerimine Kontokohta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Staatus"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Kasutaja"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Kogus"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Planeerimise read"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Tehtud"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Planeerimise statistika"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Avatud"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Vastutav"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Planeerimine viivitamatult"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Summaarselt kasutajakohta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Lõppkuupäev"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Summaarselt Projektikohta"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Haldur"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/fi.po b/addons/project_planning/i18n/fi.po
deleted file mode 100644
index aecc954d6b4..00000000000
--- a/addons/project_planning/i18n/fi.po
+++ /dev/null
@@ -1,599 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Finnish <fi@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Tämä arvo annetaan jäljelläolevan työn määränä tehtävän suorittamiseksi, "
-"määriteltynä päivinä."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Suunnittelutilastot"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Suunnittelulinja"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Allokoimaton aika yhteensä"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Suunnitelman nimi"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Omien projetien suunnittelu"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Tuntilista"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Globaalilla aikataulutusjärjestelmällä varustettu OpenERP järjestelmä "
-"mahdollistaa yrityksen kaikkien resurssien (henkilöiden ja materiaalien) "
-"aikatauluttamisen, syöttämisen, laskemisen ja ajoituksen sekä resurssien "
-"käytön ja saatavuuden seurannan."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Suunnitellut tehtävät yhteensä"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Tili"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tehtävä"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Huomautukset"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Suunnitelmat"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekti"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Aloita tehtävä"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Peruttu"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Suunniteltu yhteensä (päiviä)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Virheellinen suunnitelmat ! Suunnitellut päivät eivät voi mennä päällekkäin "
-"samalla vastuuhenkilöllä. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Suunnitelmat tileittäin"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Nykyiset suunnitelmat"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analyyttinen tili"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Palauta luonnokseksi"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Lisätiedot"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Suunniteltu yhteensä"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Tämä arvo annetaan summana tuntilistoille merkityistä tunniesta alkupäivän "
-"ja loppupäivän väliseltä ajalta"
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Ajan allokointi ilman tehtäviä"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Suunnitelmarivit"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Virhe! Et voi luoda sisäkkäisiä yrityksiä."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Analyyttinen tili"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Tähä arvo on annettu aikavarausten summana kohdista joissa valittu "
-"'Määritelty tehtäville' kentän arvo on epätosi. Ilmoitetaan päivinä."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Muut"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Asettaa mittayksikön jota käytetään suunnitelmissa."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "HR suunnittelu"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Jäljelläolevat tehtävät"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Suunnittelu"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Vastanottaja :"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Ajan syöttö"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Määrittelemätän aika"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Tämä arvo on annettu aikavarausten summana ilman linkitettyjä tehtäviä, "
-"ilmoitetaan päivinä."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegoi"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Suunnitteluanalyysi"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Aseta tähän työpäivien määrä suunnitelmassa yhden täysaikaisen henkilön "
-"osalta."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Lähettäjä :"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Suunnitelu käyttäjittäin"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Suunnittelu tileittäin (päiviä)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Aika ilman tehtäiä"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Aloituspvm"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Yhteensä vapaana"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Tähä arvo on annettu aikavarausten summana kohdista joissa valittu "
-"'Määritelty tehtäville' kentän arvo on tosi. Ilmoitetaan päivinä."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Laskettu työpäivinä - (Aikavaraus tehtäville + aikavaraus ilman tehtäviä + "
-"lomat)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Määrän mittayksikkö"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Huomautus"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Suunnittelu tileittäin"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Odottava"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Suunnitellut päivät"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Tila"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Arvo annetaan hyväksyttyjen lomapäivien määränä alkupäivän ja loppupäivän "
-"välissä suunnitelmassa."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Käyttäjä"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Jäljelläolevat tehtävät yhteensä"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Yritykset"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Määrä perusmittayksikössä"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Suunniteltu aika tehtäville"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Määrä"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Koodi"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Suunnittelurivit"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Suunnittelu käyttäjittäin (päiviä)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Suunnittelutilastot"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Avaa"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Sunnittelu käyttäjittäin"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Tiedot"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Työpäiviä"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Aktivoi uudelleen"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Vastuuhenkilö"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Suunnittelun tila"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Ajan allokointi tehtäville"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Käyttäjän yhteenveto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Kokonais ajan allokointi ilman tehtäviä"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Lomat"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Ajan kokonais allokaatio tehtäville"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Loppupvm"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Yrityksen nimen pitää olla uniikki!"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Jäljelläolevat tehtävät"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Yhteenveto projekteittain"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Vastuuhenkilö :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Suunnittelun mittayksikkö"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Suunnittelutehtävät"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Päällikkö"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Arvo määritellään linkitettyjen tehtävien ajanvarauksen summana, "
-"määritettynä päivinä."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Suunnittelun hallintamoduuli"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Muut"
diff --git a/addons/project_planning/i18n/fr.po b/addons/project_planning/i18n/fr.po
deleted file mode 100644
index f61b204d063..00000000000
--- a/addons/project_planning/i18n/fr.po
+++ /dev/null
@@ -1,634 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:52+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Cette valeur, exprimée en jours, correspond à la somme des travaux restant à "
-"réaliser pour la tâche dans cette planification."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Statistiques des Plannings"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Ligne de planning"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Temps total non alloué"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nom du planning"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Planning de mon projet"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Feuille de temps"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Avec son système global de planification des ressources d'une société "
-"(personnes et matériels), OpenERP permet de saisir puis de calculer "
-"automatiquement les tâches et les phases planifiées, de suivre l'allocation "
-"des ressources et leur disponibilité."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total des tâches planifiées"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Compte"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tâche"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Remarques"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Plannings"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projet"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Démarrer la tâche"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Annulée"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Total planifié (en jours)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Planning invalide ! Les dates de planning ne peuvent pas se chevaucher pour "
-"un même responsable ! "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planning par compte"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Plannings actuels"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Compte analytique"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Remettre en brouillon"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Informations supplémentaires"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total Plannifié"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Cette valeur est la somme de tous les travaux saisis dans les feuilles de "
-"temps du planning entre les dates données."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Allocation des temps sans tâches"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Lignes du planning"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Compte Analytique"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Cette valeur, exprimée en jours, est la somme des temps alloués dont la case "
-"\"Affecté à des tâches\" est décochée."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Ceci définit l'unité de mesure utilisée pour les planifications."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planning RH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tâches Restantes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planning"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "A :"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Saisie des temps"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Temps non alloué"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Cette valeur, exprimée en jours, est la somme des temps alloués et non liés "
-"à une tâche."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Déléguer"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Analyse des plannings"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Planifiez ici le nombre de jours de travail d'une personne à plein temps"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "De :"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planning par utilisateur"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tâches"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planning par compte (en jours)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Temps sans les tâches"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Date de début"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total libre"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Cette valeur, exprimée en jours, est la somme des temps alloués dont la case "
-"à cocher 'Affecté à des tâches' est à VRAI."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculé en tant que : [jours ouvrés - (temps alloués à des tâches + temps "
-"alloués sans tâches + congés déposés)]"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Qté UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Remarque"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planning par Compte"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "En attente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Jours planifiés"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Statut"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Cette valeur est le total des jours de congés validés pour ce planning entre "
-"les dates 'du' à 'au'."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Utilisateur"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Reste à faire"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Sociétés"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Quantité en udm de base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Temps planifiés sur des tâches"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Quantité"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Code"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Lignes de planning"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Effectué"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planning par utilisateur (en jours)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Statistiques de planification"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Ouverte"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planning par utilisateur"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informations"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Jours ouvrés"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Ré-activer"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erreur ! La date de fin de la tâche doit être postérieure à la date de "
-"démarrage"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Statistiques de planification"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Allocation des temps des tâches"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Résumé par utilisateur"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Temps total alloué sans tâches"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Absences"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Temps total alloué à des tâches"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Date de Fin"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Le nom de la société doit être unique !"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tâches restantes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Résumé par projet"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsable :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unité de temps pour le planning"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Tâches du planning"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Responsable"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Cette valeur est le résultat de la somme des temps alloués, liés à des "
-"tâches, exprimée en jour."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Module de gestion des plannings"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Divers"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Erreur ! La devise doit être la même que la devise de la société sélectionnée"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ce module vous aide à gérer vos plannings.\n"
-#~ "\n"
-#~ "Ce module est basé sur les comptes analytiques et est totalement intégré "
-#~ "avec\n"
-#~ "* l'enregistrement des feuilles de présence\n"
-#~ "* la gestion des congés\n"
-#~ "* la gestion de projets\n"
-#~ "\n"
-#~ "Donc, chaque manager de département peut connaitre si quelqu'un de son "
-#~ "équipe a du temps libre pour un planning donné (en prenant en considération "
-#~ "les congés validés) ou si il peut encore saisir des tâches.\n"
-#~ "\n"
-#~ "À la fin du mois, le manager du planning peut également vérifier si les "
-#~ "feuilles de temps saisies respectent les temps planifiés sur chaque compte "
-#~ "analytique.\n"
diff --git a/addons/project_planning/i18n/gl.po b/addons/project_planning/i18n/gl.po
deleted file mode 100644
index 38a00a0466f..00000000000
--- a/addons/project_planning/i18n/gl.po
+++ /dev/null
@@ -1,628 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Galician <gl@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Este valor ven dado pola suma de traballo que queda por facer na tarefa "
-"desta planificación, expresado en días."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estatísticas de planificación"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Liña de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Tempo non asignado total"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nome da planificación"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Non pode crear tarefas recorrentes."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "As miñas planificacións de proxectos"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Parte de tempos"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Co seu sistema global para planificar tódolos recursos dunha compañía "
-"(persoas e materiais), OpenERP permítelle codificar e calcular "
-"automaticamente a planificación das tarefas e fases, e controlar a "
-"asignación e dispoñibilidade de recursos."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de tarefas planificadas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Conta"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planificacións"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proxecto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Iniciar tarefa"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Anulado"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Planificación total (en días)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Planificación non válida! As datas da planificación non se poden superpoñer "
-"para o mesmo responsable. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planificación por conta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planificacións actuais"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta analítica"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Cambiar a modo Borrador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Información adicional"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total planificado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Este valor ven dado pola suma de tódolos traballos codificados na(s) "
-"folla(s) de servizos entre a 'Data desde' e a 'Data ata' da planificación."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Non pode crear contas analíticas recorrentes."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Tempo de asignación sen tarefas"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Liñas planificadas"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Non pode crear compañías recorrentes."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Conta analítica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Este valor ven dado pola suma da asignación de tempo coa opción 'Asignado en "
-"tarefas' desmarcada, expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Isto establecerá a unidade de medida utilizada nas planificacións."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificación RRHH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tarefas pendentes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "A:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificación de tempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Tempo non asignado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor ven dado pola suma da asignación de tempo sen tarefa(s) "
-"vinculada(s), expresado en días."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análise planificación"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Indique aquí o número de días de traballo dentro desta planificación para "
-"unha persoa a tempo completo."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Desde:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planificación por usuario"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planificación por conta (en días)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tempo sen tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data de comezo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total libre"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Este valor ven dado pola suma da asignación de tempo coa opción \"Asignado "
-"en tarefas\" marcada expresado en días."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculado como días laborables - (Tempo de asignación das tarefas + Tempo de "
-"asignación sen tarefas + Ausencias de vacacións)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Ctde UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Proxecto"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificación por conta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Días planificados"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Este valor ven dado polo total das ausencias validadas entre a 'Data desde' "
-"e a 'Data ata' da planificación."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total de tarefas pendentes"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Cantidade na UdM base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tempo planificado en tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Cantidade"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Liñas de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Feito"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Anular"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planificación polo usuario (en días)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estatísticas de planificación"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planificación polo usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Información"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Días laborables"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reactivar"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erro! A data de remate da tarefa debe ser posterior á data de inicio da "
-"tarefa"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estat. planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Tempo de asignación de tarefas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumo por usuario"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Tempo total de asignación sen tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Permisos"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Tempo total de asignación de tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Data de remate"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tarefas pendentes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumo por proxecto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsable:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unidade de tempo de planificación"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planificación de tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Xestor"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor ven dado pola suma da asignación de tempo coa(s) tarefa(s) "
-"vinculada(s), expresado en días."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Erro! A divisa ten que ser a mesma cá da compañía seleccionada"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Módulo para a xestión da planificación"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Varios"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo permítelle xestionar as súas planificacións. Este módulo basease "
-#~ "na contabilidade analítica e está totalmente integrado * coa codificación de "
-#~ "follas de servizos* coa xestión das vacacións/festas* coa xestión de "
-#~ "proxectos. Deste xeito, cada responsable de departamento pode saber se "
-#~ "alguén no seu equipo aínda ten tempo non asignado para unha certa "
-#~ "planificación (tendo en conta as vacacións validadas) ou se aínda o necesita "
-#~ "para codificar tarefas. A fin de mes, o responsable de planificación tamén "
-#~ "pode comprobar se as follas de servizos codificadas están a respectar o "
-#~ "tempo planificado en cada conta analítica.\n"
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
deleted file mode 100644
index 1901844126f..00000000000
--- a/addons/project_planning/i18n/hr.po
+++ /dev/null
@@ -1,591 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:37+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Croatian <hr@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Statistike planiranja"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Linija planiranja"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Ukupno slobodno vrijeme"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Naziv planiranja"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Greška! Rekurzivni zadaci."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "My Project's planning"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Evidencija rada"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Ukupno planiranih zadataka"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Konto"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Task"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Bilješke"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Plannings"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Započni zadatak"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Otkazani"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Total Planned (in Days)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planiranje računa"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Current Plannings"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Konto analitike"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Vrati u nacrt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Dodatni podaci"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Ukupno planirano"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Ova vrijednost daje zbroj svih radova, kodirano u timesheet/u, raspon  'Od "
-"datuma' i 'Do datuma' rasporeda/planiranja."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! You can not create recursive analytic accounts."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Time Allocation without Tasks"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Linije Planiranja"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Analitički konto"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Razno"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "This will set the unit of measure used in plannings."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planiranje ljudskih resursa"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Preostali zadaci"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planiranje"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Do :"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Time Encoding"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Unallocated Time"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegiraj"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Analiza planiranja"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Set here the number of working days within this planning for one person full "
-"time"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "From :"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planning By User"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tasks"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planning By Account (in Days)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Vrijeme bez zadataka"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Početni datum"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Uk. slobodno"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Kol. u JM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Bilješka"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planiranje po Kontu"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Na čekanju"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Planirani dani"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Korisnik"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total Remaining Tasks"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Organizacije"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Količina u osnovnoj JM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Vrijeme za planirane zadatke"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Šifra"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Linija planiranja"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Izvršeno"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planning By User (in Days)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Statistike planiranja"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Otvoreno"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planning by User"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informacija"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Radni dani"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Ponovno Aktiviraj"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Pogreška! Datum završetka zadatka mora biti veći od datuma početka."
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Odgovoran"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Stat planiranja"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Time Allocation of Tasks"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Sažetak prema Korisniku"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Total Time Allocation without Tasks"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Dopusti"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Ukupno vrijeme alociranih zadataka"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Završni Datum"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Remaining tasks"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Sažetak po Projektu"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsible :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Vremenska jedinica planiranja"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planiranje zadataka"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Voditelj"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Vrijednost dobivena zbrojem alociranih vremenskih zadataka iskazanih u "
-"danima."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Planning Management Module"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Razno"
diff --git a/addons/project_planning/i18n/hu.po b/addons/project_planning/i18n/hu.po
deleted file mode 100644
index d135a59a12f..00000000000
--- a/addons/project_planning/i18n/hu.po
+++ /dev/null
@@ -1,626 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * project_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr "A feladaton hátralévő elvégzendő munkák összege, napokban kifejezve."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Tervezési statisztika"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Tervezési sor"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Kiosztatlan idő összesen"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Terv megnevezése"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Saját projektek tervezése"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Munkaidő-kimutatás"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"A vállalat minden (emberi és anyagi) erőforrásának ütemezésére szolgáló "
-"átfogó rendszerével az OpenERP lehetővé teszi a feladatok és a fázisok "
-"berögzítését és ütemezésük automatikus számítását, az erőforrás elosztás és "
-"a rendelkezésre állás nyomon követését."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Összes tervezett feladat"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Gyűjtőkód"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Feladat"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Megjegyzések"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Tervezések"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Feladat kezdete"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Érvénytelenített"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Összet tervezett (napban)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Érvénytelen tervezés! A tervezési dátumok nem eshetnek egybe ugyanarra a "
-"felelősre. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Gyűjtőkód szerinti tervezés"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Jelenlegi tervezések"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Gyűjtőkód"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Visszaállítás tervezet állapotba"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Extra információ"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Összes tervezett"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"A tervezés kezdő dátuma és záró dátuma között a munkaidő-kimutatás(ok)ba "
-"berögzített minden munka összege."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Időkiosztás feladatok nélkül"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Tervezési sorok"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Gyűjtőkód"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Időkiosztás összege napokban kifejezve, ha a Feladathoz kijelölve négyzet "
-"nincs bejelölve."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Vegyes"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Tervezésben használt mértékegység beállítására szolgál."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "HR tervezés"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Hátralévő feladatok"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Tervezés"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Záró dátum:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Idő berögzítése"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Kiosztatlan idő"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr "Feladatok nélküli időkiosztás összege, napokban kifejezve."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Megbízott"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Tervezéselemzés"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Itt lehet beállítani a tervezésen belül az egy főre jutó munkanapok számát"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Kezdő dátum:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Felhasználó szerinti tervezés"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Feladatok"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Gyűjtőkód szerinti tervezés (napokban)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Feladatok nélküli idő"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Kezdő dátum"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Szabad összesen"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Időkiosztás összege napokban kifejezve, ha a Feladathoz kijelölve négyzet be "
-"van jelölve."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"A Munkanapok - (Feladatok időkiosztása + Időkiosztás feladatok nélkül + "
-"Szabadság) képlet alapján kerül kiszámításra"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Mennyiségi egység"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Megjegyzés"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Tervezet"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Gyűjtőkód szerinti tervezés"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Függőben lévő"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Tervezett napok"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Állapot"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Összes jóváhagyott szabadság a tervezés kezdő dátuma és záró dátuma közötti "
-"időszakban."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Felhasználó"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Összes hátralévő feladat"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Vállalatok"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Mennyiség alap m.e-ben"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Feladatokra tervezett idő"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Mennyiség"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Kód"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Tervezési sorok"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Kész"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Felhasználó szerinti tervezés (napokban)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Tervezési statisztika"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Nyitott"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Felhasználó szerinti tervezés"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Információ"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Munkanapok"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Újraaktíválás"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Felelős"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Tervezési statisztika"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Feladatok időkiosztása"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Felhasználó szerinti összesítés"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Időkiosztás feladatok nélkül összesen"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Szabadságok"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Feladatok időkiosztása összesen"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Záró dátum"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Hátralévő feladatok"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Projekt szerinti összesítés"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Felelős :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Tervezési időegység"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Tervezési feladatok"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Menedzser"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr "Feladatokkal kapcsolatos időkiosztás összege, napokban kifejezve."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Hiba! A pénznemnek meg kell egyeznie a kiválasztott vállalat pénznemével."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Tervezéskezelés modul"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Vegyes"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ez a modul a tervezés kezelését segíti.\n"
-#~ "\n"
-#~ "A vezetői számvitelre épül, és teljesen integrálva van az alábbi "
-#~ "területekbe:\n"
-#~ "* munkaidő-kimutatások berögzítése\n"
-#~ "* szabadságok kezelése\n"
-#~ "* projektmenedzsment\n"
-#~ "\n"
-#~ "Segítségével minden részlegvezető tudomást szerezhet arról, ha valamelyik "
-#~ "beosztottjának még van kiosztatlan ideje az adott tervezésre (figyelembe "
-#~ "véve a jóváhagyott szabadságokat), vagy ha még feladatokat kell "
-#~ "berögzítenie.\n"
-#~ "\n"
-#~ "Hónap végén a tervezési vezető ellenőrizheti a berögzített munkaidő-"
-#~ "kimutatásokat a gyűjtőkódokra tervezett idő vonatkozásában.\n"
diff --git a/addons/project_planning/i18n/id.po b/addons/project_planning/i18n/id.po
deleted file mode 100644
index d42e50627ed..00000000000
--- a/addons/project_planning/i18n/id.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Indonesian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Indonesian <id@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/it.po b/addons/project_planning/i18n/it.po
deleted file mode 100644
index 1733970e1cc..00000000000
--- a/addons/project_planning/i18n/it.po
+++ /dev/null
@@ -1,637 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Questo valore è calcolato sommando il lavoro rimanente da effettuare "
-"sull'attività di questa pianificazione, espressa in giorni."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Statistiche di Pianificazione"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Riga Pianificazione"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Totale tempo non allocato"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nome Pianificazione"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Errore ! Non è possibile creare attività ricorsive."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Le mie pianificazioni di progetto"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Timesheet"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Con il suo sistema di pianificazione globale per tutte le risorse "
-"dell'azienda (persone e materiale), OpenERP vi permette di codificare, e "
-"automaticamente calcolare, attività e fasi della pianificazione, tracciare "
-"l'allocazione di risorse e la disponibilità."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Totale attività pianificate"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Conto"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Attività"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Pianificazioni"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Progetto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Inizia Attività"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Annullato"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Totale pianificato (in giorni)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Pianificazione non valida! Le date di pianificazione non possono sovrapporsi "
-"per lo stesso responsabile. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Pianificazioni per conto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Pianificazioni attuali"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Reimposta a Bozza"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Informazioni aggiuntive"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Totale Pianificato"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Questo valore è calcolato dalla somma di tutto il lavoro codificato nel(i) "
-"timesheet tra \"Dalla data\" e \"Alla data\" della pianificazione."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Allocazione temporale senza attività"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Linea pianificazione"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Errore! Non è possibile creare aziende ricorsive."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Contabilità Analitica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Questo valore è calcolato dalla somma delle allocazioni di tempo con la "
-"spunta: \"Assegnato nell'attività\" impostata a falso, espresso in giorni."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Varie"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Questo imposterà l'unità di misura usata nelle pianificazioni."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Pianificazione Risorse Umane"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Attività Rimanenti"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Pianificazione"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "A:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Orario codificato"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Orario non codificato"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Questo valore è calcolato dalla somma del tempo allocato senza la(e) "
-"attività collegate, espresse in giorni."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delega"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Analisi Pianificazione"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Impostare qui il numero di giorni lavorativi in questa pianificazione per "
-"una persona a tempo pieno"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Da:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Pianificazioni per utente"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Attività"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Pianificazioni per conto (in giorni)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tempo senza attività"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data inizio"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Totalmente Libero"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Questo valore è calcolato dalla somma del tempo allocato con la spunta: "
-"\"Assegnato nell'attività\" impostato a vero, espresso in giorni)."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calcolato come un giorno lavorativo - (Tempo allocato per attività + Tempo "
-"allocato senza attività + Permessi ferie)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Q.tà U. di M."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Note"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Bozza"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Pianificazione per Conto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "In sospeso"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Giorni pianificati"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Stato"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Questo valore è calcolato dal totale dei permessi convalidati nella "
-"pianificazione nel periodo: \"dalla data\", \"alla data\""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Utente"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Totale attività rimanenti"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Aziende"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Quantità nell'u.m. di base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tempo pianificato per attività"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Quantità"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Codice"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Linee Pianificazione"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Completato"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Pianificazioni per utente (in giorni)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Statistiche di Pianificazione"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Apri"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Pianificazion per utente"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informazioni"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Giorni lavorativi"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Riattiva"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Errore ! La data finale della mansione deve essere  più vecchia di quella "
-"iniziale"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsabile"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Statistiche Pianificazione"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Allocazione tempo per attività"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Cronologia per Utente"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Totale tempo allocato senza attività"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Permessi"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Totale tempo allocato delle attività"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Data fine"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Il nome azienda deve essere unico!"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Attività rimanenti"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Riepilogo per Progetto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsabile:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Unità temporale pianificazione"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Attività pianificate"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Questo valore è calcolato dalla somma del tempo allocato con attività "
-"collegata, espresso in giorni."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Modulo gestione pianificazioni"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Varie"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Questo modulo permette di gestire le pianificazioni.\n"
-#~ "\n"
-#~ "Questo modulo è basato sulla contabilità analitica ed è totalmente integrato "
-#~ "con \n"
-#~ "* Codifica timesheet\n"
-#~ "* Gestione ferie\n"
-#~ "* Gestione progetto\n"
-#~ "\n"
-#~ "Grazie a questo, ogni manager di reparto, può sapere se qualcuno del suo "
-#~ "team ha tempo non allocato per una data pianificazione (prendendo in "
-#~ "considerazione i permessi convalidati) o necessita ancora di codificare "
-#~ "attività.\n"
-#~ "\n"
-#~ "Alla fine del mese, il manager di progetto può inoltre controllare se, il "
-#~ "timesheet codificato, rispetta il tempo pianificato per tutti i conti "
-#~ "analitici.\n"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Errore! La valuta deve essere la stessa di quella impostata nell'azienda "
-#~ "selezionata"
diff --git a/addons/project_planning/i18n/ko.po b/addons/project_planning/i18n/ko.po
deleted file mode 100644
index adc86627a4e..00000000000
--- a/addons/project_planning/i18n/ko.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Korean <ko@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/ko_KO.po b/addons/project_planning/i18n/ko_KO.po
deleted file mode 100644
index 51973185715..00000000000
--- a/addons/project_planning/i18n/ko_KO.po
+++ /dev/null
@@ -1,346 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#	* project_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-05-19 14:36+0000\n"
-"PO-Revision-Date: 2009-07-03 07:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Korean <ko@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: 2009-08-28 10:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "To:"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
-msgid "Planning account stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Real"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
-msgid "My Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.module.module,description:project_planning.module_meta_information
-msgid "Planning on analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Quantities"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.account,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.user,sum_amount_real:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Responsible:"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by Account"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "From:"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by Account"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
-msgid "Planning Statistics of My Projects"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
-msgid "Current Planning"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Analysis"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.stat.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Details of user's time by projects"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
-msgid "Planning user stat"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat.account,quantity:0
-#: field:report_account_analytic.planning.stat.user,quantity:0
-msgid "Planned"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.module.module,shortdesc:project_planning.module_meta_information
-msgid "Analytic planning - Reporting"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
-msgid "My Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_user_ids:0
-msgid "Planning by user"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_account_ids:0
-msgid "Planning by account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
-msgid "My Current Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat.account,account_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: model:ir.ui.menu,name:project_planning.planning_main
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.stat.account,planning_id:0
-#: field:report_account_analytic.planning.stat.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
-msgid "New Planning"
-msgstr ""
diff --git a/addons/project_planning/i18n/lt.po b/addons/project_planning/i18n/lt.po
deleted file mode 100644
index 161d53d6521..00000000000
--- a/addons/project_planning/i18n/lt.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Lithuanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Lithuanian <lt@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/lv.po b/addons/project_planning/i18n/lv.po
deleted file mode 100644
index f3600fe2843..00000000000
--- a/addons/project_planning/i18n/lv.po
+++ /dev/null
@@ -1,571 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Latvian <lv@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Plānošanas statistika"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Plānošanas rinda"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Neiedalītais laiks kopā"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Plānošanas nosaukums"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Manu projektu plānošanas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Darba laika uzskaites Tabele"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Konts"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Uzdevums"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Piezīmes"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Plānošanas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekts"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Sākt Uzdevumu"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Atcelts"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Plānots kopā (dienās)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Nekorekta plānošana! Plānotas dienas nedrīkst pārklāties vienam "
-"atbildīgajām. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Plānošana pēc konta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Aktīvas plānošanas"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analītiskais Konts"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Atstatīt uz melnrakstu"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Papildus Info"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Plānots kopā"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Kļūda! Nedrīkst veidot rekursīvus analītiskos kontus"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Laika iedalīšana bez uzdevumiem"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Plānošanas rindas"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Analītiskais konts"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Dažādi"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Šis iestatīts mērvienību, ko lietos plānošanā."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "HR plānošana"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Atlikušie uzdevumi"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Plānošana"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Laika kodēšana"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Neiedalīts laiks"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Deleģēt"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Plānošanas anlīze"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Plānošana pēc lietotāja"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Uzdevumi"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Plānošana pēc konta (dienās)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Sākuma datums"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Brīvs kopā"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Daudz. mērv."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Piezīme"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Melnraksts"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Plānošana pēc konta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Neizlemts"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Plānotas dienas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Statuss"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Lietotājs"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Atlikušie uzdevumi kopā"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Uzņēmumi"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Daudzums bāzes mērv."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Plānotais laiks uz uzdevumiem"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Daudzums"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Kods"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Plānošanas rindas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Pabeigts"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Atcelt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Plānošana pēc lietotāja (dienās)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Plānošanas statistika"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Atvērts"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Plānošana pēc lietotāja"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informācija"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Darba dienas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Aktivizēt atkal"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Atbildīgais"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Plānošanas stat."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Uzdevumu laika iedalīšana"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Kopsavilkums pēc lietotāja"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Laika iedalīšana bez uzdevumiem kopā"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Prombūtne"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Beigu datums"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Kopsavilkums pēc projekta"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Plānošanas laika vienība"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Plānošanas uzdevumi"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Vadītājs"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Dažādi"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Plānošanas vadības modulis"
diff --git a/addons/project_planning/i18n/nl.po b/addons/project_planning/i18n/nl.po
deleted file mode 100644
index 86f778066e0..00000000000
--- a/addons/project_planning/i18n/nl.po
+++ /dev/null
@@ -1,633 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:41+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"De waarde wordt bepaald door de som van het resterende te verrichten werk in "
-"de taak voor deze planning, uitgedrukt in dagen."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Planning statistieken"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Planningsregel"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Totaal niet toegewezen tijd"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Planningsnaam"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fout! U kunt geen recursieve taken aanmaken."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Mijn project's planning"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Urenstaat"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Met haar allesomvattende systeem om alle resources van een bedrijf te "
-"plannen (personen en materiaal), laat OpenERP u taak- en faseplanningen "
-"invullen en vervolgens automatisch berekenen en resource toewijzing en "
-"beschikbaarheid bijhouden."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Totaal geplande taken"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Rekening"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notities"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planningen"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Project"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Taak starten"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Totaal gepland (in dagen)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Ongeldige planning ! Planning data kunnen niet overlappen voor dezelfde "
-"verantwoordlijke. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planning per rekening"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Actuele planningen"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Kostenplaats"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Terugzetten naar Concept"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Extra info"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Totaal gepland"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"De waarde wordt bepaald door de som van alle in urenstaten ingevuld werk "
-"tussen de 'Datum van' en 'Datum tot' van de planning."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fout! U kunt geen recursieve kostenplaatsen maken."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Toegewezen tijd zonder taken"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Planningregels"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fout ! U kunt geen recursieve bedrijven maken."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Kostenplaats"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Deze waarde wordt bepaald door de som van de toegewezen tijd waarbij "
-"'Toegewezen aan taken' uitstaat, uitgedrukt in dagen."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Overig"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Dit stelt de meeteenheid in die gebruikt wordt in planningen."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "HR planning"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Resterende taken"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planning"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Aan:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Tijd invoeren"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Niet toegewezen tijd"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Deze waarde wordt bepaald door de som van toegewezen tijd zonder verbonden "
-"taken, uitgedrukt in dagen."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegeren"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Planningsanalyse"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Stel hier het aantal werkdagen in binnen deze planning voor één full-time "
-"persoon"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Van:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planning per gebruiker"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Taken"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planning per rekening (in dagen)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tijd zonder taken"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Startdatum"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Totaal vrij"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Deze waarde wordt bepaald door de som van toegewezen tijd waarbij "
-"'Toegewezen aan taken' aan staat, uitgedrukt in dagen."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Berekend als: werkdagen - (toegewezen tijd van taken + toegewezen tijd "
-"zonder taak + vakantiedagen)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Hoev ME"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Opmerking"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planning per rekening"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Geplande dagen"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"De waarde wordt bepaald door het totaal van goedgekeurd verlof binnen de "
-"'Datum van' en 'Datum tot' in de planning."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Gebruiker"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Totaal resterende taken"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Bedrijven"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Hoeveelheid in basis meeteenheid"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Geplande tijd op taken"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Hoeveelheid"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Code"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Planningsregels"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Verwerkt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planning per gebruiker (in dagen)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Planning statistieken"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Open"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planning per gebruiker"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informatie"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Werkdagen"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Heractiveren"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fout! Einddatum taak moet groter zijn dat begindatum taak"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Verantwoordelijke"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Planning stat"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Toegewezen tijd op taken"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Samenvatting per gebruiker"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Totaal toegewezen tijd zonder taken"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Verlof"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Totaal toegewezen tijd op taken"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Einddatum"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "De naam van het bedrijf moet uniek zijn!"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Resterende taken"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Samenvatting per project"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Verantwoordelijke :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Planning tijdeenheid"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planning taken"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Deze waarde wordt bepaald door de som van de toegewezen tijd met verbonden "
-"taken, uitgedrukt in dagen."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Fout! De valuta moet hetzelfde zijn als de valuta van het geselecteerde "
-#~ "bedrijf"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Planningsbeheer module"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Overig"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Deze module helpt uw planningen te beheren.\n"
-#~ "\n"
-#~ "Deze module is gebaseerd on de kostenplaasen en is volledig geïntegreerd "
-#~ "met\n"
-#~ "* de urenstaat invoer\n"
-#~ "* de vakantiedagen\n"
-#~ "* het project management\n"
-#~ "\n"
-#~ "Zo kan elke afdeling manager weten of iemand uit zijn team nog steeds niet "
-#~ "toegwezen tijd heeft voor een bepaalde planning (rekening houdend met het "
-#~ "goedgekeurde verlof) of dat hij nog taken moet invoeren.\n"
-#~ "\n"
-#~ "Aan het eind van de maand controleert de planning manager of het invullen "
-#~ "van de urenstaten overeenkomt met de geplande tijd bij elke kostenplaats.\n"
diff --git a/addons/project_planning/i18n/nl_BE.po b/addons/project_planning/i18n/nl_BE.po
deleted file mode 100644
index d16051676a8..00000000000
--- a/addons/project_planning/i18n/nl_BE.po
+++ /dev/null
@@ -1,345 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* report_analytic_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:00+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:45+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "To:"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_account
-msgid "Planning account stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Real"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my
-msgid "My Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.module.module,description:project_planning.module_meta_information
-msgid "Planning on analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Quantities"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.account,sum_amount_real:0
-#: field:report_account_analytic.planning.stat.user,sum_amount_real:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Responsible:"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by Account"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "From:"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by Account"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time by User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_my_manager_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat_my_manager
-msgid "Planning Statistics of My Projects"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current
-msgid "Current Planning"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Analysis"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.stat.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "Details of user's time by projects"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat_user
-msgid "Planning user stat"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat.account,quantity:0
-#: field:report_account_analytic.planning.stat.user,quantity:0
-msgid "Planned"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.module.module,shortdesc:project_planning.module_meta_information
-msgid "Analytic planning - Reporting"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_my2
-msgid "My Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_user_ids:0
-msgid "Planning by user"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: rml:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_account_ids:0
-msgid "Planning by account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Quantities by User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_current_my
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_current_my
-msgid "My Current Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat.account,account_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: model:ir.ui.menu,name:project_planning.planning_main
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.stat.account,planning_id:0
-#: field:report_account_analytic.planning.stat.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form_new
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_new
-msgid "New Planning"
-msgstr ""
diff --git a/addons/project_planning/i18n/pl.po b/addons/project_planning/i18n/pl.po
deleted file mode 100644
index 572d95fed1f..00000000000
--- a/addons/project_planning/i18n/pl.po
+++ /dev/null
@@ -1,589 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:19+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Ta wartość jest sumą dni pracy pozostałą do wykonania zadania dla tego "
-"planowania,"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Statystyki planowania"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Pozycja planowania"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Suma czasu nieprzydzielonego"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nazwa planowania"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych zadań."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Moje planowania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Karta czasu pracy"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Suma planowanych zadań"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Konto"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Zadanie"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notatki"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planowania"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Rozpocznij zadanie"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Anulowano"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Suma zaplanowana (w dniach)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Niedozwolone planowanie ! Daty planowania nie mogę na siebie zachodzić dla "
-"tego samego odpowiedzialnego. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planowanie wg kont"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Bieżące planowania"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Konto analityczne"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Przywróć do projektu"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Dodatkowe informacje"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Suma planowana"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Ta wartość jest sumą dni pracy wprowadzonych do planowania w kartach czasu "
-"pracy pomiędzy \"Data od\" i \"Data do\"."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Alokacja czasu bez zadań"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Pozycje planowania"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Konto analityczne"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Ta wartość jest sumą dni przydzieloną wg ODZNACZONEJ opcji 'Przydzielone do "
-"zadań'."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Różne"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "To ustali jednostkę miary stosowaną w planowaniu."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planowanie kadrowe"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Pozostałe zadania"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planowanie"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Do :"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Wprowadzanie czasu"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Czas nieprzydzielony"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr "To jest suma dni przydzielonego bez związku z zadaniami."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Przydziel"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Analiza planowania"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Wprowadź liczbę dni roboczych dla tego planowania na jedną osobę pracującą w "
-"pełnym wymiarze"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "Od :"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planowanie wg użytkowników"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Zadania"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planowanie w kont (w dniach)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Czas bez zadań"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data Początkowa"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Suma wolnych"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"To jest suma dni przydzielonych z ZAZNACZONĄ opcją 'Przedzielone do zadań'."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Obliczone w dniach roboczych (Czas przydzielony w zadaniach + Czas "
-"przydzielony poza zadaniami + Urlopy)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Il. JM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Notatka"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Projekt"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planowanie wg kont"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Oczekujące"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Planowane dni"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Stan"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"To jest suma dni zatwierdzonych nieobecności w planowaniu pomiędzy datami: "
-"'Data od' i 'Data do'."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Użytkownik"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Suma pozostałych zadań"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Firmy"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Ilość w bazowej JM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Czas planowany na zadania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Ilość"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Kod"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Pozycje planowania"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planowanie wg użytkowników (w dniach)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Statystyka planowania"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Otwarte"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planowanie wg użytkowników"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informacja"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Dni pracy"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reaktywuj"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Odpowiedzialny"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Stat. planowania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Alokacja czasu w zadaniach"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Podsumowanie wg użytkowników"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Suma czasu przydzielonego poza zadaniami"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Nieobecności"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Suma czasu przydzielonego w zadaniach"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Data końcowa"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Pozostałe zadania"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Podsumowanie wg projektów"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Odpowiedzialny :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Jednostka czas dla planowania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planowane zadania"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Menedżer"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr "To jest suma dni czasu przydzielonego w zadaniach."
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Moduł planowania projektów"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Różne"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Błąd! Waluta musi być ta sama co waluta wybranej firmy."
diff --git a/addons/project_planning/i18n/project_planning.pot b/addons/project_planning/i18n/project_planning.pot
deleted file mode 100644
index c57197e6505..00000000000
--- a/addons/project_planning/i18n/project_planning.pot
+++ /dev/null
@@ -1,540 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid "This value is given by the sum of work remaining to do on the task for this planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid "With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid "Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid "This value is given by the sum of all work encoded in the timesheet(s) between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid "This value is given by the sum of time allocation with the checkbox 'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid "This value is given by the sum of time allocation without task(s) linked, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid "Set here the number of working days within this planning for one person full time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid "This value is given by the sum of time allocation with the checkbox 'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid "Computed as Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid "This value is given by the total of validated leaves into the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid "This value is given by the sum of time allocation with task(s) linked, expressed in days."
-msgstr ""
-
diff --git a/addons/project_planning/i18n/pt.po b/addons/project_planning/i18n/pt.po
deleted file mode 100644
index bf4bbf36114..00000000000
--- a/addons/project_planning/i18n/pt.po
+++ /dev/null
@@ -1,595 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Este valor é dado pela soma do restante trabalho de fazer a tarefa para este "
-"planeamento, expresso em dias."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estatísticas do Planeamento"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Linha de Planeamento"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Tempo total não alocado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nome do Planeamento"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro ! Não se pode criar tarefas recursivas"
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Planeamento do meu projeto"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Folha de Horas"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Com o sistema global para agendar todos os recursos de uma empresa (pessoas "
-"e materiais), OpenERP permite codificar e, em seguida, calcular "
-"automaticamente as tarefas e o agendamento de fases, acompanhar a alocação "
-"de recursos e disponibilidade."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de tarefas planeadas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Conta"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planeamentos"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projeto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Iniciar Tarefa"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Total Planeado (em dias)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Planeamento inválido! Datas de planeamento não podem sobrepor-se para o "
-"mesmo responsável. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planeamento por Conta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planeamento atual"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Conta Analítica"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Redefinir para rascunho"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Informação Extra"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total Planeado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Este valor é dado pela soma de todos os trabalhos codificados na folha(s) de "
-"horas entre a 'Data  a partir de 'e' Data para 'do planeamento."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Não pode criar contas analíticas recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Alocação de tempo sem tarefas"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Linhas de planeamento"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Não pode criar empresas recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Conta Analítica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Este valor é dado pela soma de alocação de tempo com a caixa de verificação "
-"'Atribuídas em tarefas' definida para FALSO, expresso em dias."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Diversos"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Isto irá definir a unidade de medida usada no planeamento."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planeamento dos RH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tarefas restantes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planeamento"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Para:"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificação de tempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Tempo não alocado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor é dado pela soma de atribuição de tempo sem tarefa(s), ligado, "
-"expresso em dias."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análises do planeamento"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Defina aqui o número de dias úteis dentro deste planeamento para uma única "
-"pessoa a tempo inteiro"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "De:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planeamento por utilizador"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planeamento por conta (em dias)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tempo sem tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data Inicial"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Livre total"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Este valor é dado pela soma de alocação de tempo com a caixa de verificação "
-"'Atribuído em tarefas' definido como VERDADEIRO expresso em dias."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculado como dias úteis - (Alocação de Tempo das Tarefas + Alocação de "
-"Tempo sem Tarefas + Folhas de férias)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Quantidade de UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planeamento por Conta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Dias planeados"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Estado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Este valor é dado pelo total de folhas validadas para a 'Data De' e 'Data "
-"para' do planeamento."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Utilizador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Restante Total de tarefas"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Empresas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Quantidade em base UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tempo previsto em Tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Quantidade"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Linhas de planeamento"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planeamento por utilizador (em dias)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estatísticas do planeamento"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planeamento por utilizador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informação"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Dias úteis"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reativar"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro !Data final da tarefa dever ser posterior à data inicial"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Estado do planeamento"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Tempo de alocação das tarefas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumo por utilizador"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Tempo total de alocação sem tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Ausências"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Tempo total de alocação de tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Data Final"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "O nome da empresa deve ser único!"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tarefas restantes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumo por projeto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsável:"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Planeamento Unidade de Tempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planeamento de tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Gestor"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor é dado pela soma de atribuição de tempo com a tarefa(s), ligado, "
-"expresso em dias."
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Diversos"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Erro! A moeda tem que ser a mesma que foi seleccionada pela empresa"
diff --git a/addons/project_planning/i18n/pt_BR.po b/addons/project_planning/i18n/pt_BR.po
deleted file mode 100644
index 3f31c382d2b..00000000000
--- a/addons/project_planning/i18n/pt_BR.po
+++ /dev/null
@@ -1,629 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Este valor é determinado pela soma do serviço restante para terminar a "
-"tarefa para este planejamento, expresso em dias."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Estatísticas do Planejamento"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Linha do Planejamento"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Tempo total Não Alocado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nome do Planejamento"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Você não pode criar tarefas recursivas."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Meu Planejamento do Projeto"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Planilha de Horas"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Com um sistema global para agendar todos os recursos da empresa (pessoas e "
-"material), O OpenERP lhe permite codificar e  automaticamente calcular o "
-"agendamento de tarefas e fases, acompanhar a alocação de recursos e "
-"disponibilidades."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total de Tarefas Planejadas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Conta"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Observações"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planejamentos"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projeto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Início da Tarefa"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Total Planejado (Em Dias)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Planejamento Inválido ! Planejamento de datas não pode se sobrepor para o "
-"mesmo responsável. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planejamento Por Conta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planejamentos Atuais"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Centro de Custo"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Voltar para Provisório"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Info. Extra"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total Planejado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Este valor é determinado pela soma de todos os serviço codificados na "
-"planilha de horas (s) entre a 'Data de' e 'Data Para' do planejamento."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Você não pode criar contas analíticas recursivas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Alocação de Tempo sem Tarefa"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Linhas Planejamento"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Você não pode criar empresas recursivas."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Conta analítica"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Este valor é determinado pela soma da alocação do tempo com a caixa de "
-"seleção 'Selecionada na Tarefa\" definido como FALSO, expresso em dias."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Diversos"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Isto irá definir a unidade de medida usada em planejamentos."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planejamento de RH"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Tarefas Restantes"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planejamento"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Para :"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codificação de Tempo"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Tempo não Alocado"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor é determinado pela soma da alocação de tempo sem tarefa (s) "
-"vinculada, expresso em dias."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Análises do Planejamento"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Defina aqui o número de dias úteis dentro desse planejamento para uma pessoa "
-"em tempo integral"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "De :"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planejado pelo Usuário"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planejar pela Conta (Em Dias)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Tempo sem Tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data inicial"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total Livre"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Este valor é determinado pela soma da alocação do tempo expresso em dias, "
-"com a caixa de seleção 'Selecionada na Tarefa' definida como VERDADEIRO."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculado como Dias Úteis - (Tempo de Alocação das Tarefas + Tempo de "
-"Alocação sem Tarefas + Feriados)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Qtd UdM"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Anotação"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Provisório"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planejar pela Conta"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Dias Planejados"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Este valor é determinado pelo total de planilhas validadas entre a 'Data De' "
-"e a 'Data Para' do Planejamento."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Usuário"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total de Tarefas Restantes"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Empresas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Qtd na UdM base"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Tempo Planejado nas Tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Quantidade"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Código"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Linhas Planejamento"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planejar por Usuário (Em Dias)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Estatísticas Planejamento"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Aberto"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planejar por Usuário"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informação"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Dias de Trabalho"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reativar"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Stat. Planejamento"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Alocação de Tempo das Tarefas"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Resumo por Usuário"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Tempo de Alocação Total sem as Tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Folhas"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Tempo de Alocação Total das Tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Data Final"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "O nome da empresa deve ser exclusivo!"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Tarefas Restantes"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Resumo por Projeto"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsável :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Und do tempo Planejado"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planejar Tarefas"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Gerente"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Este valor é determinado pela soma da alocação do tempo com tarefa (s) "
-"vinculada, expresso em dias."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "Erro! A moeda deve ser a mesma da empresa selecionada"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Módulo Planejamento"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Diversos"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo ajuda a gerenciar seus planejamentos.\n"
-#~ "\n"
-#~ "Este módulo é baseado na Contabilidade Analítica e está totalmente "
-#~ "Integrado.\n"
-#~ " * A codificação das Planilhas de Horas\n"
-#~ " * O gerenciamento de Feriados\n"
-#~ " * O gerenciamento de Projetos\n"
-#~ "\n"
-#~ "De modo que, cada gerente de departamento pode saber se alguém em sua equipe "
-#~ "tem ainda tempo não alocado para um determinado planejamento (levando em "
-#~ "consideração as planilhas validadas) ou se ele ainda é preciso codificar "
-#~ "tarefas.\n"
diff --git a/addons/project_planning/i18n/ro.po b/addons/project_planning/i18n/ro.po
deleted file mode 100644
index a59961c19c5..00000000000
--- a/addons/project_planning/i18n/ro.po
+++ /dev/null
@@ -1,635 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Romanian <ro@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-"Această valoare este dată de suma muncii care a rămas de efectuat la sarcină "
-"pentru această planificare, exprimată in zile."
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Statistică Planificare"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Linie Planificare"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "Timpul Total Nealocat"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Nume planificare"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Eroare ! Nu puteti crea sarcini recursive."
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "Planificarea Proiectului meu"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Foaie de pontaj"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-"Cu sistemul lui global de programare a tuturor resurselor unei companii "
-"(oameni si material), OpenERP vă permite să inregistrati si apoi să "
-"calculati automat programarea sarcinilor si a etapelor, să tineti evidenta "
-"alocării resurselor si disponibilitatea."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "Total sarcini planificate"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "Cont"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "Sarcină"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "Planificări"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proiect"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "Incepere sarcină"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "Anulat(ă)"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "Total planificat (In zile)"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-"Planificare invalidă ! Datele planificării nu se pot suprapune pentru "
-"acelasi responsabil. "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "Planificare in functie de Cont"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "Planificări curente"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cont analitic"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "Resetare ca ciornă"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "Informaţii suplimentare"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Total planificat"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-"Această valoare este dată de suma intregii munci inregistrate in foaia "
-"(foile) de pontaj intre 'Data de la' si 'Data pană la' a planificării."
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Eroare! Nu puteti crea conturi analitice recursive."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "Alocarea Timpului fără Sarcini"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "Linii planificare"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Eroare! Nu puteti crea companii recursive."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Cont analitic"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-"Această valoare este dată de suma timpului alocat cu căsuta de selectare "
-"'Atribuit in Sarcini' setată pe FALS, exprimată in zile."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "Acesta va seta unitatea de măsură folosită in planificări."
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Planificare Resurse Umane"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "Sarcinile rămase"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planificare"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "Către :"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "Codare Timp"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "Timp nealocat"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-"Această valoare este dată de suma timpului alocat fără sarcină(sarcini) "
-"asociate, exprimată in zile."
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "Delegat"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Analiză Planificare"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-"Aici setati numărul de zile lucătoare in cadrul acestei planificări pentru o "
-"persoană cu normă intreagă"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "De la:"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "Planificare după Utilizator"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Sarcini"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "Planificare după Cont (in Zile)"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "Timp fără sarcini"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Data de început"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "Total Liber"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-"Această valoare este dată de suma timpului alocat cu căsuta de selectare "
-"'Atribuit in Sarcini' setată pe ADEVARAT exprimată in zile."
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-"Calculat ca zile lucrătoare - Timp Alocare Sarcini + Timp Alocare fără "
-"Sarcini + Concedii)"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "UdM Cantitate"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Notă"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "Ciornă"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Planificare după Cont"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "În așteptare"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "Zile planificate"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Stare"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-"Această valoare este dată de totalul concediilor validate in 'Data de la' si "
-"'Data pană la' a planificării."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Utilizator"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "Total Sarcini rămase"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "Companii"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "Cantitatea in udm de bază"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "Timpul planificat in sarcini"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Cantitate"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "Cod"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Linii planificare"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Efectuat"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "Anulează"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "Planificare după Utilizator (in Zile)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Statistică Planificare"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Deschide"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "Planificare după Utilizator"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "Informații"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "Zile lucrătoare"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "Reactivează"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Eroare ! Data de sfarsit a sarcinii trebuie să fie mai mare decat data de "
-"inceput"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Responsabil"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Statistică Planificare"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "Timp Alocat Sarcinilor"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Rezumat după utilizator"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "Total Timp Alocat fără Sarcini"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "Concedii"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "Total Timp Alocare Sarcini"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Data de sfârșit"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "Sarcini rămase"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Rezumat după proiect"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "Responsabil :"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "Planificare Unitate Timp"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "Planificare Sarcini"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Manager"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
-"Această valoare este dată de suma timpului alocat cu sarcina(i) asociate, "
-"exprimată in zile."
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr ""
-#~ "Eroare! Moneda trebuie sa fie aceeasi ca si moneda companiei selectate"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "Modulul Managementului Planificării"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Diverse"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Acest modul vă ajută să vă gestionati planificările.\n"
-#~ "\n"
-#~ "Acest modul se bazează pe contabilitatea analitică si este integrat total "
-#~ "cu\n"
-#~ "* codarea foilor de pontaj\n"
-#~ "* managementul concediilor\n"
-#~ "* managementul proiectului\n"
-#~ "\n"
-#~ "Astfel, fiecare manager de departament stie dacă cineva din echipa lui mai "
-#~ "are incă timp nealocat pentru o sarcină anumită (luand in considerare "
-#~ "concediile validate) sau dacă incă mai trebuie să codeze sarcini.\n"
-#~ "\n"
-#~ "La sfarsitul lunii, managerul care se ocupă cu planificarea poate de "
-#~ "asemenea să verifice dacă foile de pontaj inregistrate respectă timpul "
-#~ "planificat in fiecare cont analitic.\n"
diff --git a/addons/project_planning/i18n/ru.po b/addons/project_planning/i18n/ru.po
deleted file mode 100644
index 8ba1967d6ca..00000000000
--- a/addons/project_planning/i18n/ru.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Планируемое имя"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Табель"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Всего запланировано"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Счет аналитики"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Анализ планирования"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Кол-во ед.изм."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Планирование по счетам"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Статус"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Ответственный"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Начало планирования"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "В общем у пользователя"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/sl.po b/addons/project_planning/i18n/sl.po
deleted file mode 100644
index 81a82f9117f..00000000000
--- a/addons/project_planning/i18n/sl.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Časovnica"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analitični konto"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "Skuap načrtovano"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Analitični konto"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Načrtovanje"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Opravila"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Datum začetka"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Opomba"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "Načrtovanje po konih"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Stanje"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Uporabnik"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Zaključeno"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Odpri"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Odgovoren"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Končni datum"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Povzetek po projektu"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Upravitelj"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/sq.po b/addons/project_planning/i18n/sq.po
deleted file mode 100644
index 6bbb247cce5..00000000000
--- a/addons/project_planning/i18n/sq.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/sv.po b/addons/project_planning/i18n/sv.po
deleted file mode 100644
index 335574795ed..00000000000
--- a/addons/project_planning/i18n/sv.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/tlh.po b/addons/project_planning/i18n/tlh.po
deleted file mode 100644
index 41f345a4177..00000000000
--- a/addons/project_planning/i18n/tlh.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Klingon translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Klingon <tlh@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/tr.po b/addons/project_planning/i18n/tr.po
deleted file mode 100644
index e2f9ed70547..00000000000
--- a/addons/project_planning/i18n/tr.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Planlama İstatistiği"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Planlama Adı"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Zaman Tablosu"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Proje"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Analiz Hesabı"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Analiz Hesabı"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "İK Planlaması"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Planlama"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Görevler"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "Baş. Tarihi"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "Mik. Birim"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Not"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "Durum"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Kullanıcı"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Miktar"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Planlama kalemleri"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Bitti"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Planlama istatistiği"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Açık"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Sorumlu"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "Bitiş Tarihi"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Proje Özeti"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Yönetici"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/uk.po b/addons/project_planning/i18n/uk.po
deleted file mode 100644
index e62fa7ff75a..00000000000
--- a/addons/project_planning/i18n/uk.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Ukrainian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Ukrainian <uk@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "Статистика планування"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "Рядок планування"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "Назва планування"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "Табель"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "Проект"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Аналітичний рахунок"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "Аналітичний рахунок"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "Планування Персоналу"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "Планування"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "Аналіз планування"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "Завдання"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "ОВ к-сті"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "Примітка"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "Користувач"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "Кількість"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "Рядки планування"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "Виконано"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "Планова статистика"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "Відкрито"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "Відповідальний"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "Статистика планування"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "Всього по користувачу"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "Всього за проектом"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "Менеджер"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/vi.po b/addons/project_planning/i18n/vi.po
deleted file mode 100644
index f41f0abccab..00000000000
--- a/addons/project_planning/i18n/vi.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/i18n/zh_CN.po b/addons/project_planning/i18n/zh_CN.po
deleted file mode 100644
index 0329a3f1730..00000000000
--- a/addons/project_planning/i18n/zh_CN.po
+++ /dev/null
@@ -1,599 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:29+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr "这个值由该计划所属的任务剩余工时的合计，单位是天"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr "计划统计"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr "计划明细"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr "总计分配时间"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr "计划名称"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "错误！不能创建循环引用的任务"
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr "我的项目计划"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr "计工单"
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr "OpenERP是个集成的系统，可以统管整个公司的人力和物料资源。这样可以输入和计算任务和阶段的日程，跟踪资源的分配和可用性。"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr "计划的任务总计"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr "科目"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr "任务"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr "备注"
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr "计划"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr "项目"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr "开始任务"
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr "已取消"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr "总计划天数"
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr "输入的计划无效！计划日期不能和负责的日期重合 "
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr "按科目的计划"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr "当前计划"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "辅助核算项目"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr "重置为草稿"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr "附加信息"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr "总计划"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr "这个值来源于在计划的起止期间内计工单中输入的工时数合计。"
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误! 你不能创建递归的辅助核算项目"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr "未被任务分配的时间"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr "计划明细"
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "错误！您不能创建递归公司."
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr "辅助核算项目"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr "这个值是没有分配给任务的时间合计，单位是天"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr "杂项"
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr "这里设置计划的时间单位"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr "人力资源计划"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr "剩下的任务"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr "计划"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr "至"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr "输入时间"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr "未分配的时间"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr "这个值是没有分配给任务的时间合计，单位是天"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr "委派"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr "计划分析"
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr "在这里输入计划范围内一个全职员工的工作天数"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr "["
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr "自："
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr "按用户查看计划"
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr "任务"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr "按科目查看计划"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr "未分配任务的时间"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr "开始日期"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr "不参与总计"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr "这个值是已分配给任务的时间总计，单位是天"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr "计算公式： 正常工作天数 - （已分配给任务的时间 + 未分配给任务的时间 + 休假）"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr "计量单位"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr "备注"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr "草稿"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr "按科目查看计划"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr "等待中"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr "计划天数"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr "状态"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr "这个值由计划起止期间内已确认的休假"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr "用户"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr "总计剩余时间"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr "公司"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr "换算成基本计量单位的数量"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr "分配了任务的时间"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr "数量"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr "编号"
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr "计划明细"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr "已完成"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr "取消(&C)"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr "按用户查看计划天数"
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr "计划统计"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr "开始"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr "按用户查看计划"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr "信息"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr "工作天数"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr "重新激活"
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "错误！任务结束日期必须大于任务开始日期"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr "负责人"
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr "计划状态"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr "已分配任务的时间"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr "按用户合计"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr "未分配任务的时间"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr "休假"
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr "已分配任务的时间"
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr "结束日期"
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "公司名称必须唯一！"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr "剩余任务"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr "按项目合计"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr "负责人"
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr "]"
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr "计划时间单位"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr "计划任务"
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr "经理"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr "这个值是已分配给任务的时间合计，单位是天"
-
-#~ msgid ""
-#~ "Error! The currency has to be the same as the currency of the selected "
-#~ "company"
-#~ msgstr "错误！货币必须是所选公司的本位币"
-
-#~ msgid "Planning Management Module"
-#~ msgstr "项目计划模块"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "杂项"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module helps you to manage your plannings.\n"
-#~ "\n"
-#~ "This module is based on the analytic accounting and is totally integrated "
-#~ "with\n"
-#~ "* the timesheets encoding\n"
-#~ "* the holidays management\n"
-#~ "* the project management\n"
-#~ "\n"
-#~ "So that, each department manager can know if someone in his team has still "
-#~ "unallocated time for a given planning (taking in consideration the validated "
-#~ "leaves) or if he still needs to encode tasks.\n"
-#~ "\n"
-#~ "At the end of the month, the planning manager can also check if the encoded "
-#~ "timesheets are respecting the planned time on each analytic account.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "此模块帮您管理计划。\n"
-#~ "这个模块基于辅助核算会计，与很多其他功能实现了集成：\n"
-#~ "输入计工单\n"
-#~ "休假管理\n"
-#~ "项目管理\n"
-#~ "这样部门经理就可以知道某个人或团队在给定计划期间（去掉休假）是否还可以分配任务\n"
diff --git a/addons/project_planning/i18n/zh_TW.po b/addons/project_planning/i18n/zh_TW.po
deleted file mode 100644
index f6a38344bfa..00000000000
--- a/addons/project_planning/i18n/zh_TW.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Chinese (Traditional) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@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-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,tasks:0
-#: help:report_account_analytic.planning.user,tasks:0
-msgid ""
-"This value is given by the sum of work remaining to do on the task for this "
-"planning, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
-#: model:ir.ui.menu,name:project_planning.menu_board_planning
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
-msgid "Planning Statistics"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
-#: view:report_account_analytic.planning.line:0
-msgid "Planning Line"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,name:0
-msgid "Planning Name"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_planning
-#: view:board.board:0
-msgid "My Project's planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,timesheet:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,sum_amount_real:0
-#: field:report_account_analytic.planning.user,timesheet:0
-msgid "Timesheet"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid ""
-"With its global system to schedule all resources of a company (people and "
-"material), OpenERP allows you to encode and then automatically compute tasks "
-"and phases scheduling, track resource allocation and availability."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total planned tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Notes"
-msgstr ""
-
-#. module: project_planning
-#: field:account.analytic.account,planning_ids:0
-#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
-#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
-msgid "Plannings"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Project"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_planning
-#: selection:report_account_analytic.planning,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-#: view:report_account_analytic.planning.line:0
-msgid "Total Planned (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: constraint:report_account_analytic.planning:0
-msgid ""
-"Invalid planning ! Planning dates can't overlap for the same responsible. "
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_account:0
-msgid "Planning By Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Current Plannings"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,timesheet:0
-#: help:report_account_analytic.planning.user,timesheet:0
-msgid ""
-"This value is given by the sum of all work encoded in the timesheet(s) "
-"between the 'Date From' and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_open:0
-#: field:report_account_analytic.planning.user,plan_open:0
-msgid "Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
-msgstr ""
-
-#. module: project_planning
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,account_id:0
-#: field:report_account_analytic.planning.line,account_id:0
-msgid "Analytic account"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to FALSE, expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: project_planning
-#: help:res.company,planning_time_mode_id:0
-msgid "This will set the unit of measure used in plannings."
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "HR Planning"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,tasks:0
-#: field:report_account_analytic.planning.user,tasks:0
-msgid "Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: model:ir.actions.report.xml,name:project_planning.report_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning
-#: model:ir.ui.menu,name:project_planning.next_id_85
-#: field:project.task,planning_line_id:0
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.account,planning_id:0
-#: field:report_account_analytic.planning.line,planning_id:0
-#: field:report_account_analytic.planning.stat,planning_id:0
-#: field:report_account_analytic.planning.user,planning_id:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To :"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Time Encoding"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,free:0
-msgid "Unallocated Time"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_open:0
-msgid ""
-"This value is given by the sum of time allocation without task(s) linked, "
-"expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning,business_days:0
-msgid ""
-"Set here the number of working days within this planning for one person full "
-"time"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "["
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From :"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,planning_user_ids:0
-msgid "Planning By User"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
-#: view:report_account_analytic.planning:0
-#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By Account (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,total_free:0
-msgid "Total Free"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.account,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with the checkbox "
-"'Assigned in Taks' set to TRUE expressed in days."
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid ""
-"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
-"without Tasks + Holiday Leaves)"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_unit:0
-msgid "Qty UoM"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,sum_amount:0
-msgid "Planned Days"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,holiday:0
-msgid ""
-"This value is given by the total of validated leaves into the 'Date From' "
-"and 'Date To' of the planning."
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,user_id:0
-#: report:report_account_analytic.planning.print:0
-#: field:report_account_analytic.planning.stat,user_id:0
-#: field:report_account_analytic.planning.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Remaining Tasks"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount_in_base_uom:0
-msgid "Quantity in base uom"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,plan_tasks:0
-msgid "Time Planned on Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,amount:0
-msgid "Quantity"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,code:0
-msgid "Code"
-msgstr ""
-
-#. module: project_planning
-#: view:account.analytic.account:0
-#: field:report_account_analytic.planning,line_ids:0
-msgid "Planning lines"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Planning By User (in Days)"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning.stat:0
-msgid "Planning statistics"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-#: selection:report_account_analytic.planning,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
-#: view:report_account_analytic.planning:0
-msgid "Planning by User"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Information"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,business_days:0
-msgid "Business Days"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Reactivate"
-msgstr ""
-
-#. module: project_planning
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,user_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
-msgid "Planning stat"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.account,plan_tasks:0
-msgid "Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by user"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation without Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.user,holiday:0
-msgid "Leaves"
-msgstr ""
-
-#. module: project_planning
-#: view:report_account_analytic.planning:0
-msgid "Total Time Allocation of Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_planning
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Remaining tasks"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Summary by project"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Responsible :"
-msgstr ""
-
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "]"
-msgstr ""
-
-#. module: project_planning
-#: field:res.company,planning_time_mode_id:0
-msgid "Planning Time Unit"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.line,task_ids:0
-msgid "Planning Tasks"
-msgstr ""
-
-#. module: project_planning
-#: field:report_account_analytic.planning.stat,manager_id:0
-msgid "Manager"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,plan_tasks:0
-msgid ""
-"This value is given by the sum of time allocation with task(s) linked, "
-"expressed in days."
-msgstr ""
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
deleted file mode 100644
index 9ce6571bf54..00000000000
--- a/addons/project_planning/project_planning.py
+++ /dev/null
@@ -1,590 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
-
-from osv import fields, osv
-import tools
-
-
-class one2many_mod3(fields.one2many):
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        res = {}
-        for obj in obj.browse(cr, user, ids, context=context):
-            res[obj.id] = []
-            list_ids = []
-            children = obj.pool.get('report_account_analytic.planning')._child_compute(cr, user, [obj.user_id.id], '', [])
-            for u_id in children.get(obj.user_id.id, []):
-                list_ids.append(u_id)
-            list_ids.append(obj.user_id.id)
-            ids2 = obj.pool.get(self._obj).search(cr, user, ['&',(self._fields_id,'=',obj.id),'|',('user_id','in',list_ids),('user_id','=',False)], limit=self._limit)
-            for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
-                if r[self._fields_id] not in res:
-                    res[r[self._fields_id]] = []
-                res[r[self._fields_id]].append( r['id'] )
-        return res
-
-class report_account_analytic_planning(osv.osv):
-    _name = "report_account_analytic.planning"
-    _description = "Planning"
-
-    def emp_to_users(self, cr, uid, ids, context=None):
-        employees = self.pool.get('hr.employee').browse(cr, uid, ids, context=context)
-        user_ids = [e.user_id.id for e in employees if e.user_id]
-        return user_ids
-
-    def _child_compute(self, cr, uid, ids, name, args, context=None):
-        obj_dept = self.pool.get('hr.department')
-        obj_user = self.pool.get('res.users')
-        result = {}
-        for user_id in ids:
-            child_ids = []
-            cr.execute("""SELECT dept.id FROM hr_department AS dept
-                LEFT JOIN hr_employee AS emp ON dept.manager_id = emp.id
-                WHERE emp.id IN
-                    (SELECT emp.id FROM hr_employee
-                        JOIN resource_resource r ON r.id = emp.resource_id WHERE r.user_id = %s)
-                """, (user_id,))
-            mgnt_dept_ids = [x[0] for x in cr.fetchall()]
-            ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
-            if ids_dept:
-                data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
-                emp_children = map(lambda x: x['member_ids'], data_dept)
-                emp_children = tools.flatten(emp_children)
-                children = self.emp_to_users(cr, uid, emp_children, context=context)
-                children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context)
-                if user_id in children:
-                    children.remove(user_id)
-                child_ids = list(set(child_ids + children))
-            result[user_id] = child_ids
-        return result
-
-    def _get_total_planned(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for plan in self.browse(cr, uid, ids, context=context):
-            plan_hrs=0.0
-            for p in plan.planning_user_ids:
-                if not p.plan_open : p.plan_open = 0.0
-                if not p.plan_tasks : p.plan_tasks = 0.0
-                plan_hrs = plan_hrs + p.plan_open + p.plan_tasks
-            result[plan.id] = plan_hrs
-        return result
-
-    def _get_total_free(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for plan in self.browse(cr, uid, ids, context=context):
-            total_free = 0.0
-            for p in plan.planning_user_ids:
-                if  p.free:
-                    total_free = total_free + p.free
-            result[plan.id] = total_free
-        return result
-
-    def _check_planning_responsible(self, cr, uid, ids, context=None):
-        for obj_plan in self.browse(cr, uid, ids, context=context):
-            cr.execute("""
-                SELECT id FROM report_account_analytic_planning plan
-                WHERE (   (%(date_from)s BETWEEN date_from AND date_to)
-                                OR (%(date_to)s BETWEEN date_from AND date_to)
-                                OR (%(date_from)s < date_from AND %(date_to)s > date_to)
-                               )  AND user_id = %(uid)s AND id <> %(id)s""",
-                        {"date_from": obj_plan.date_from,
-                         "date_to": obj_plan.date_to,
-                         "uid": obj_plan.user_id.id,
-                         "id" : obj_plan.id}
-                               )
-
-            res = cr.fetchone()
-            if res:
-                return False
-        return True
-
-    _columns = {
-        'name': fields.char('Planning Name', required=True, size=32, states={'done':[('readonly', True)]}),
-        'code': fields.char('Code', size=32, states={'done':[('readonly', True)]}),
-        'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done':[('readonly', True)]}),
-        'date_from': fields.date('Start Date', required=True, states={'done':[('readonly', True)]}),
-        'date_to':fields.date('End Date', required=True, states={'done':[('readonly', True)]}),
-        'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', states={'done':[('readonly', True)]}),
-        'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('cancel', 'Cancelled'), ('open', 'Open'), ('done', 'Done')], 'Status', required=True),
-        'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
-        'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
-        'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
-        'total_planned': fields.function(_get_total_planned, string='Total Planned'),
-        'total_free': fields.function(_get_total_free, string='Total Free'),
-    }
-    _defaults = {
-        'date_from': lambda self,cr,uid,ctx: fields.date.context_today(self,cr,uid,timestamp=(datetime.now()+relativedelta(day=1)),context=ctx),
-        'date_to': lambda self,cr,uid,ctx: fields.date.context_today(self,cr,uid,timestamp=(datetime.now()+relativedelta(months=1, day=1, days=-1)),context=ctx),
-        'user_id': lambda self, cr, uid, c: uid,
-        'state': 'draft',
-        'business_days': 20,
-    }
-    _order = 'date_from desc'
-
-    _constraints = [
-        (_check_planning_responsible, 'Invalid planning ! Planning dates can\'t overlap for the same responsible. ', ['user_id'])
-    ]
-
-    def action_open(self, cr, uid, id, context=None):
-        self.write(cr, uid, id, {'state' : 'open'}, context=context)
-        return True
-
-    def action_cancel(self, cr, uid, id, context=None):
-        self.write(cr, uid, id, {'state' : 'cancel'}, context=context)
-        return True
-
-    def action_draft(self, cr, uid, id, context=None):
-        self.write(cr, uid, id, {'state' : 'draft'}, context=context)
-        return True
-
-    def action_done(self, cr, uid, id, context=None):
-        self.write(cr, uid, id, {'state' : 'done'}, context=context)
-        return True
-
-report_account_analytic_planning()
-
-class report_account_analytic_planning_line(osv.osv):
-    _name = "report_account_analytic.planning.line"
-    _description = "Planning Line"
-    _rec_name = 'user_id'
-
-    def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return []
-        reads = self.read(cr, uid, ids, ['user_id', 'planning_id', 'note'], context=context)
-        res = []
-        for record in reads:
-            name = '['+record['planning_id'][1]
-            if record['user_id']:
-                name += " - " +record['user_id'][1]+'] '
-            else:
-                name += '] '
-            if record['note']:
-                name += record['note']
-            res.append((record['id'], name))
-        return res
-
-    def _amount_base_uom(self, cr, uid, ids, name, args, context=None):
-        users_obj = self.pool.get('res.users')
-        result = {}
-        tm = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
-        if tm and tm.factor:
-            div = tm.factor
-        else:
-            div = 1.0
-        for line in self.browse(cr, uid, ids, context=context):
-            result[line.id] = line.amount / line.amount_unit.factor * div
-        return result
-
-    _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic account', select=True),
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
-        'user_id': fields.many2one('res.users', 'User', select=True),
-        'amount': fields.float('Quantity', required=True),
-        'amount_unit': fields.many2one('product.uom', 'Qty Unit of Measure', required=True),
-        'note': fields.text('Note', size=64),
-        'amount_in_base_uom': fields.function(_amount_base_uom, string='Quantity in base Unit of Measure', store=True),
-        'task_ids': fields.one2many('project.task', 'planning_line_id', 'Planning Tasks'),
-    }
-    _order = 'user_id, account_id'
-
-report_account_analytic_planning_line()
-
-class account_analytic_account(osv.osv):
-    _name = 'account.analytic.account'
-    _inherit = 'account.analytic.account'
-    _columns = {
-        'planning_ids': fields.one2many('report_account_analytic.planning.line', 'account_id', 'Plannings'),
-    }
-
-account_analytic_account()
-
-class project_task(osv.osv):
-    _name = "project.task"
-    _inherit = "project.task"
-    _columns = {
-        'planning_line_id': fields.many2one('report_account_analytic.planning.line', 'Planning', ondelete='cascade'),
-    }
-
-    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
-        if context is None:
-            context = {}
-        if not context.get('planning', False):
-            return super(project_task,self).search(cr, user, args,
-                offset=offset, limit=limit, order=order, context=context, count=count)
-        cr.execute(" SELECT t.id, t.name \
-                        from project_task t \
-                        join report_account_analytic_planning_line l on (l.id = t.planning_line_id )\
-                        where l.planning_id=%s",(context.get('planning'),))
-        ids = map(lambda x: x[0], cr.fetchall())
-        return ids
-
-project_task()
-
-class report_account_analytic_planning_user(osv.osv):
-    _name = "report_account_analytic.planning.user"
-    _description = "Planning by User"
-    _rec_name = 'user_id'
-    _auto = False
-
-    def _get_tasks(self, cr, uid, ids, name, args, context=None):
-        users_obj = self.pool.get('res.users')
-        result = {}
-        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
-        if tm and tm.factor:
-            div = tm.factor
-        else:
-            div = 1.0
-        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
-        if tm2 and tm2.factor:
-            div2 = tm2.factor
-        else:
-            div2 = 1.0
-        for line in self.browse(cr, uid, ids, context=context):
-            if line.user_id:
-                cr.execute("""select COALESCE(sum(tasks.remaining_hours),0) from project_task tasks \
-                               where  tasks.planning_line_id IN (select id from report_account_analytic_planning_line\
-                where planning_id = %s and user_id=%s)""", (line.planning_id.id, line.user_id.id,))
-
-                result[line.id] = cr.fetchall()[0][0] / div * div2
-            else:
-                result[line.id] = 0
-        return result
-
-    def _get_free(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            if line.user_id:
-                result[line.id] = line.planning_id.business_days - line.plan_tasks - line.plan_open - line.holiday
-            else:
-                result[line.id] = 0.0
-        return result
-
-    def _get_timesheets(self, cr, uid, ids, name, args, context=None):
-        users_obj = self.pool.get('res.users')
-        result = {}
-        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
-        if tm2 and tm2.factor:
-            div2 = tm2.factor
-        else:
-            div2 = 1.0
-        for line in self.browse(cr, uid, ids, context=context):
-            if line.user_id:
-                cr.execute("""
-                SELECT sum(unit_amount/uom.factor) FROM account_analytic_line acc
-                LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
-                WHERE acc.date>=%s and acc.date<=%s and acc.user_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.user_id.id ))
-                res = cr.fetchall()
-                result[line.id] = res[0][0] and res[0][0] * div2 or False
-            else:
-                result[line.id] = 0
-        return result
-
-    _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
-        'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'tasks': fields.function(_get_tasks, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
-        'plan_tasks': fields.float('Time Planned on Tasks', readonly=True, help='This value is given by the sum of time allocation with task(s) linked, expressed in days.'),
-        'free': fields.function(_get_free, string='Unallocated Time', readonly=True, help='Computed as \
-Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)'),
-        'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation without task(s) linked, expressed in days.'),
-        'holiday': fields.float('Leaves',help='This value is given by the total of validated leaves into the \'Date From\' and \'Date To\' of the planning.'),
-        'timesheet': fields.function(_get_timesheets, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
-    }
-
-    def init(self, cr):
-        cr.execute(""" CREATE OR REPLACE VIEW report_account_analytic_planning_user AS (
-        SELECT
-            planning.id AS planning_id,
-            (1000*(planning.id) + users.id)::integer AS id,
-            planning.business_days,
-            users.id AS user_id,
-            (SELECT sum(line1.amount_in_base_uom)
-                FROM report_account_analytic_planning_line line1
-                WHERE   (
-                        SELECT COUNT(1)
-                        FROM project_task task
-                        WHERE task.planning_line_id = line1.id
-                        ) > 0
-                AND line1.user_id = users.id
-                AND line1.planning_id = planning.id
-            )AS plan_tasks,
-            (SELECT SUM(line1.amount_in_base_uom)
-                FROM report_account_analytic_planning_line line1
-                WHERE   (
-                        SELECT COUNT(1)
-                        FROM project_task task
-                        WHERE task.planning_line_id = line1.id
-                        ) = 0
-                AND line1.user_id = users.id
-                AND line1.planning_id = planning.id
-            ) AS plan_open,
-            (SELECT -(SUM(holidays.number_of_days))
-                FROM hr_holidays holidays
-                WHERE holidays.employee_id IN
-                    (
-                    SELECT emp.id
-                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id
-                    )
-                AND holidays.state IN ('validate')
-                AND holidays.type = 'remove'
-                AND holidays.date_from >= planning.date_from
-                AND holidays.date_to <= planning.date_to
-            ) AS holiday
-
-        FROM report_account_analytic_planning planning
-        LEFT JOIN report_account_analytic_planning_line line ON (line.planning_id = planning.id), res_users users
-        GROUP BY planning.id, planning.business_days, users.id, planning.date_from, planning.date_to
-
-        UNION
-
-        SELECT
-            planning.id AS planning_id,
-            (1000*(planning.id) - 1)::integer AS id,
-            planning.business_days,
-            line.user_id,
-            (SELECT SUM(line1.amount_in_base_uom)
-                FROM report_account_analytic_planning_line line1
-                WHERE (SELECT COUNT(1) FROM project_task task WHERE task.planning_line_id = line1.id) > 0
-                AND line1.user_id IS NULL
-            ) AS plan_tasks,
-            (SELECT SUM(line1.amount_in_base_uom)
-                FROM report_account_analytic_planning_line line1
-                WHERE (SELECT COUNT(1) FROM project_task task WHERE task.planning_line_id = line1.id) = 0
-                AND line1.user_id IS NULL
-            ) AS plan_open,
-            '0' AS holiday
-        FROM report_account_analytic_planning planning
-        INNER JOIN report_account_analytic_planning_line line ON line.planning_id = planning.id
-            AND line.user_id IS NULL
-        GROUP BY planning.id, planning.business_days, line.user_id, planning.date_from, planning.date_to
-        )
-        """)
-
-report_account_analytic_planning_user()
-
-class report_account_analytic_planning_account(osv.osv):
-    _name = "report_account_analytic.planning.account"
-    _description = "Planning by Account"
-    _rec_name = 'account_id'
-    _auto = False
-
-    def _get_tasks(self, cr, uid, ids, name, args, context=None):
-        users_obj = self.pool.get('res.users')
-        result = {}
-        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
-        if tm and tm.factor:
-            div = tm.factor
-        else:
-            div = 1.0
-        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
-        if tm2 and tm2.factor:
-            div2 = tm2.factor
-        else:
-            div2 = 1.0
-        for line in self.browse(cr, uid, ids, context=context):
-            cr.execute("""
-                SELECT COALESCE(sum(tasks.remaining_hours),0)
-                FROM project_task tasks
-                WHERE tasks.planning_line_id IN (
-                    SELECT id
-                    FROM report_account_analytic_planning_line
-                    WHERE planning_id = %s AND account_id=%s
-                )""", (line.planning_id.id, line.account_id and line.account_id.id or None))
-            result[line.id] = cr.fetchall()[0][0] / div * div2
-        return result
-
-    def _get_timesheets(self, cr, uid, ids, name, args, context=None):
-        users_obj = self.pool.get('res.users')
-        result = {}
-        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
-        if tm2 and tm2.factor:
-            div2 = tm2.factor
-        else:
-            div2 = 1.0
-        for line in self.browse(cr, uid, ids, context=context):
-            cr.execute("""
-                SELECT SUM(unit_amount/uom.factor) FROM account_analytic_line acc
-                LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
-                WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id and line.account_id.id or None))
-            res = cr.fetchall()[0][0]
-            if res:
-                result[line.id] = res * div2
-            else:
-                result[line.id] = 0
-        return result
-
-    _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
-        'tasks': fields.function(_get_tasks, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
-        'plan_tasks': fields.float('Time Allocation of Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to TRUE expressed in days.'),
-        'plan_open': fields.float('Time Allocation without Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to FALSE, expressed in days.'),
-        'timesheet': fields.function(_get_timesheets, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
-    }
-
-    def init(self, cr):
-        cr.execute(""" CREATE OR REPLACE VIEW report_account_analytic_planning_account AS (
-          SELECT
-            MIN(l.id) AS id,
-            l.account_id AS account_id,
-            SUM(l.amount) AS quantity,
-            l.planning_id AS planning_id,
-            ( SELECT SUM(line1.amount_in_base_uom)
-              FROM report_account_analytic_planning_line line1
-              WHERE
-                ( SELECT COUNT(1)
-                  FROM project_task task
-                  WHERE task.planning_line_id = line1.id
-                ) > 0
-                AND l.account_id = line1.account_id
-                AND l.planning_id = line1.planning_id
-            ) AS plan_tasks,
-            ( SELECT SUM(line1.amount_in_base_uom)
-              FROM report_account_analytic_planning_line line1
-              WHERE
-                ( SELECT COUNT(1)
-                  FROM project_task task
-                  WHERE task.planning_line_id = line1.id
-                ) = 0
-                AND l.account_id = line1.account_id
-                AND planning.id = line1.planning_id
-            ) AS plan_open
-          FROM report_account_analytic_planning_line l
-          INNER JOIN report_account_analytic_planning planning ON planning.id=l.planning_id
-          GROUP BY l.account_id, l.planning_id, planning.date_from, planning.date_to, planning.id
-        )
-        """)
-
-report_account_analytic_planning_account()
-
-class report_account_analytic_planning_stat(osv.osv):
-    _name = "report_account_analytic.planning.stat"
-    _description = "Planning stat"
-    _rec_name = 'user_id'
-    _auto = False
-    _log_access = False
-    _order = 'planning_id,user_id'
-
-    def _sum_amount_real(self, cr, uid, ids, name, args, context=None):
-        users_obj = self.pool.get('res.users')
-        result = {}
-        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
-        if tm2 and tm2.factor:
-            div2 = tm2.factor
-        else:
-            div2 = 1.0
-        for line in self.browse(cr, uid, ids, context=context):
-            if line.user_id:
-                cr.execute('''SELECT sum(acc.unit_amount/uom.factor) FROM account_analytic_line acc
-                LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
-WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to))
-            else:
-                cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to))
-
-        sum = cr.fetchone()
-        if sum and sum[0]:
-            result[line.id] = sum[0] * div2
-        return result
-
-    def _sum_amount_tasks(self, cr, uid, ids, name, args, context=None):
-        users_obj = self.pool.get('res.users')
-        result = {}
-        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
-        if tm and tm.factor:
-            div = tm.factor
-        else:
-            div = 1.0
-        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
-        if tm2 and tm2.factor:
-            div2 = tm2.factor
-        else:
-            div2 = 1.0
-        for line in self.browse(cr, uid, ids, context=context):
-            where = ''
-            if line.user_id:
-                where = 'user_id=' + str(line.user_id.id) + ' and '
-            cr.execute('''select
-                    sum(planned_hours)
-                FROM
-                    project_task
-                WHERE
-                ''' + where + '''
-                    project_id IN (select id from project_project where analytic_account_id=%s) AND
-                    date_end>=%s AND
-                    date_end<=%s''', (
-                line.account_id and line.account_id.id or None,
-                line.planning_id.date_from,
-                line.planning_id.date_to)
-            )
-            sum = cr.fetchone()
-            if sum and sum[0]:
-                result[line.id] = sum[0] /div * div2
-        return result
-
-    _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', select=True),
-        'user_id': fields.many2one('res.users', 'User', select=True),
-        'manager_id': fields.many2one('res.users', 'Manager'),
-        'account_id': fields.many2one('account.analytic.account', 'Account'),
-        'sum_amount': fields.float('Planned Days', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, string='Timesheet'),
-        'sum_amount_tasks': fields.function(_sum_amount_tasks, string='Tasks'),
-    }
-
-    def init(self, cr):
-        cr.execute("""
-            create or replace view report_account_analytic_planning_stat as (
-                SELECT
-                    min(l.id) as id,
-                    l.user_id as user_id,
-                    a.user_id as manager_id,
-                    l.account_id as account_id,
-                    sum(l.amount/u.factor) as sum_amount,
-                    l.planning_id
-                FROM
-                    report_account_analytic_planning_line l
-                LEFT JOIN
-                    report_account_analytic_planning a on (a.id = l.planning_id)
-                LEFT JOIN
-                    product_uom u on (l.amount_unit = u.id)
-                GROUP BY
-                    l.planning_id, l.user_id, l.account_id, a.user_id
-            )
-        """)
-
-report_account_analytic_planning_stat()
-
-class res_company(osv.osv):
-    _inherit = 'res.company'
-    _columns = {
-        'planning_time_mode_id': fields.many2one('product.uom', 'Planning Time Unit',
-            help='This will set the unit of measure used in plannings.',
-        ),
-    }
-res_company()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/project_planning_demo.xml b/addons/project_planning/project_planning_demo.xml
deleted file mode 100644
index 4abf8786378..00000000000
--- a/addons/project_planning/project_planning_demo.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-    
-        <!-- Project Planning  -->
-                
-        <record id="project_plannning_1" model="report_account_analytic.planning">
-            <field name="name">Project_Planning</field>
-            <field name="business_days">20</field>
-            <field name="date_from" eval="time.strftime('%Y-%m-01')"/>
-            <field name="date_to" eval="time.strftime('%Y-%m-28')"/>
-            <field name="state">open</field>
-            <field name="user_id" ref="base.user_al"/>
-        </record>
-        
-        
-        <record id="project_plannning_line1" model="report_account_analytic.planning.line">
-            <field name="account_id" ref="account.analytic_trunk"/>
-            <field name="amount">16.0</field>
-            <field name="amount_unit" ref="product.uom_hour"/>
-            <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="base.user_al"/>
-            <field name="task_ids" eval="[(6,0,[ref('project.project_task_188')])]"/>
-        </record>        
-
-        
-        <record id="project_plannning_line2" model="report_account_analytic.planning.line">
-            <field name="account_id" ref="account.analytic_trunk"/>
-            <field name="amount">24.0</field>
-            <field name="amount_unit" ref="product.uom_hour"/>
-            <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="base.user_qdp"/>
-            <field name="task_ids" eval="[(6,0,[ref('project.project_task_190')])]"/>
-        </record>     
-        
-                
-        <record id="project_plannning_line3" model="report_account_analytic.planning.line">
-            <field name="account_id" ref="account.analytic_trunk"/>
-            <field name="amount">90.0</field>
-            <field name="amount_unit" ref="product.uom_hour"/>
-            <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="base.user_fpi"/>
-            <field name="task_ids" eval="[(6,0,[ref('project.project_task_11')])]"/>
-        </record>     
-        
-                
-        <record id="project_plannning_line4" model="report_account_analytic.planning.line">
-            <field name="account_id" ref="account.analytic_trunk"/>
-            <field name="amount">50.0</field>
-            <field name="amount_unit" ref="product.uom_hour"/>
-            <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="base.user_mit"/>
-            <field name="task_ids" eval="[(6,0,[ref('project.project_task_13')])]"/>
-        </record>     
-
-        
-    </data>
-</openerp>
diff --git a/addons/project_planning/project_planning_report.xml b/addons/project_planning/project_planning_report.xml
deleted file mode 100644
index 6a60850124b..00000000000
--- a/addons/project_planning/project_planning_report.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <report id="report_planning"
-        	model="report_account_analytic.planning"
-        	name="report_account_analytic.planning.print"
-        	rml="project_planning/report/report_planning.rml"
-        	string="Planning"/>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
deleted file mode 100644
index fd65ae61b88..00000000000
--- a/addons/project_planning/project_planning_view.xml
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Planning -->
-        <record id="account_analytic_planning_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.tree</field>
-            <field name="model">report_account_analytic.planning</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Planning">
-                    <field name="name" />
-                    <field name="user_id" />
-                    <field name="date_from" />
-                    <field name="date_to" />
-                    <field name="business_days" />
-                    <field name="total_planned" />
-                    <field name="total_free" />
-                    <field name="state" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="account_analytic_planning_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.form</field>
-            <field name="model">report_account_analytic.planning</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form layout="manual">
-                <header>
-                    <button name="action_open" states="draft" string="Open" type="object" />
-                    <button name="action_done" states="open" string="Done" type="object" />
-                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" />
-                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" />
-                   <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
-                </header>
-                <sheet string="Planning by Account" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <field name="name" select="1" />
-                        <field name="code" select="1" />
-                        <field name="user_id" select="1" />
-                        <field name="business_days" />
-                        <field name="date_from" />
-                        <field name="date_to" />
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Planning by User">
-                        <field colspan="4" name="planning_user_ids"
-                                nolabel="1" widget="one2many_list" readonly="1">
-                            <tree string="Planning By User (in Days)">
-                                <field name="user_id"/>
-                                <field name="tasks" sum="Total Remaining Tasks"/>
-                                <field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
-                                <field name="plan_open" sum="Total Time Allocation without Tasks"/>
-                                <field name="holiday" />
-                                <field name="free" sum="Total Unallocated Time"/>
-                                <field name="timesheet"/>
-                            </tree>
-                        </field>
-                        </page>
-                        <page string="Planning by Account">
-                        <field colspan="4" name="planning_account"
-                                nolabel="1" widget="one2many_list" readonly="1">
-                            <tree string="Planning By Account (in Days)">
-                                <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                                <field name="tasks" sum="Total Remaining Tasks"/>
-                                <field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
-                                <field name="plan_open" sum="Total Time Allocation without Tasks"/>
-                                <field name="timesheet" />
-                            </tree>
-                        </field>
-                        </page>
-                        <page string="Time Encoding">
-                            <field colspan="4" name="line_ids"
-                                nolabel="1">
-                                <tree editable="bottom"
-                                    string="Planning Lines">
-                                    <field name="user_id"/>
-                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount" />
-                                    <field name="amount_unit" />
-                                    <field name="task_ids" />
-                                    <field name="note" />
-                                    <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-                                </tree>
-                                <form string="Planning Lines">
-                                    <field name="user_id"/>
-                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount" />
-                                    <field name="amount_unit" />
-                                       <field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
-                                        <form string="Tasks">
-                                            <group colspan="4" col="2">
-                                                <field name="name" select="1"/>
-                                                <field name="project_id" required="1" select="1" domain="[('analytic_account_id','=',parent.account_id)]"/>
-                                            </group>
-                                            <group colspan="4" col="4">
-                                                <field name="date_deadline"/>
-                                                <field name="user_id" select="1"  domain="[('id','=',parent.user_id)]"/>
-                                            </group>
-                                            <notebook colspan="4">
-                                                <page string="Information">
-                                                    <group col="3" colspan="4">
-                                                        <field name="effective_hours" widget="float_time" invisible="True" />
-                                                        <field name="planned_hours"
-                                                            widget="float_time"
-                                                            attrs="{'readonly':[('state','!=','draft')]}"
-                                                            on_change="onchange_planned(planned_hours,effective_hours)"/>
-                                                        <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                                    </group>
-                                                    <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
-                                                    <group col="11" colspan="4">
-                                                        <field name="state" select="1"/>
-                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                                                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-                                                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
-                                                        <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
-                                                        <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                                        <button name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                                        <button name="%(mail.action_email_compose_message_wizard)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
-                                                    </group>
-                                                 </page>
-                                                <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
-                                                    <group colspan="2" col="2">
-                                                        <field name="priority"/>
-                                                        <field name="sequence"/>
-                                                    </group>
-                                                <separator string="Miscellaneous" colspan="4"/>
-                                                    <field name="stage_id"/>
-                                                    <field name="active"/>
-                                                    <field name="partner_id"/>
-                                                    <separator colspan="4" string="Notes"/>
-                                                    <field colspan="4" name="notes" nolabel="1"/>
-                                                </page>
-                                            </notebook>
-                                        </form>
-                                    </field>
-                                    <separator string="Notes" colspan="4" />
-                                    <field name="note" colspan="4"
-                                        nolabel="1" />
-                                </form>
-                            </field>
-                        </page>
-                    </notebook>
-                   </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="account_analytic_planning_view_search" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.search</field>
-            <field name="model">report_account_analytic.planning</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Planning by Account">
-                    <group>
-                        <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="user_id"/>
-                        <field name="state"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <!-- Planning Line -->
-
-        <record id="account_analytic_planning_line_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.line.tree</field>
-            <field name="model">report_account_analytic.planning.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Planning Line">
-                    <field name="planning_id"/>
-                    <field name="user_id"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="amount" />
-                    <field name="amount_unit" />
-                    <field name="note" select="1"/>
-                    <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="account_analytic_planning_line_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.line.form</field>
-            <field name="model">report_account_analytic.planning.line</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Planning Line">
-                    <field name="planning_id" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="amount" />
-                    <field name="amount_unit" />
-                    <separator string="Notes" colspan="4" />
-                    <field name="note" colspan="4" nolabel="1" />
-                </form>
-            </field>
-        </record>
-
-        <record id="action_account_analytic_planning_form" model="ir.actions.act_window">
-            <field name="name">Plannings</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_user_id":uid}</field>
-            <field name="search_view_id" ref="account_analytic_planning_view_search"/>
-            <field name="help">With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability.</field>
-        </record>
-<!--        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
-        <menuitem id="base.menu_project_long_term" name="Planning"
-            parent="base.menu_main_pm" sequence="3"/>
-
-        <menuitem action="action_account_analytic_planning_form"
-            id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
-
-        <!--
-            Planning statistics
-        -->
-        <record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.form</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Planning statistics">
-                    <field name="planning_id" select="1" />
-                    <field name="user_id" select="1" />
-                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.tree</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Planning statistics">
-                    <field name="planning_id" />
-                    <field name="user_id" />
-                    <field name="manager_id" />
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="sum_amount" />
-                    <field name="sum_amount_real" />
-                    <field name="sum_amount_tasks" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.graph</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Planning statistics" type="bar">
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="sum_amount" operator="+" />
-                    <field name="sum_amount_real" operator="+" />
-                    <field name="sum_amount_tasks" operator="+" />
-                </graph>
-            </field>
-        </record>
-
-        <record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
-            <field name="name">report_account_analytic.planning.stat.search</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Planning statistics">
-                    <group>
-                        <field name="planning_id"/>
-                        <field name="user_id"/>
-                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-
-        <record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
-            <field name="name">Planning Statistics</field>
-            <field name="res_model">report_account_analytic.planning.stat</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <!-- <field name="context">{"search_default_user_id":uid}</field> -->
-            <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
-        </record>
-
-            <menuitem  action="action_account_analytic_planning_stat_form"
-                       icon="terp-graph"
-                       id="menu_board_planning"
-                       parent="project.menu_project_dashboard"/>
-
-<!--        Analytic account Form -->
-
-        <record id="view_project_planning_form" model="ir.ui.view">
-            <field name="name">planning.account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Planning" >
-                        <separator string="Planning Lines"/>
-                        <field name="planning_ids" colspan="4" nolabel="1">
-                            <form string="Planning Lines">
-                                <field name="planning_id" select="1"/>
-                                <field name="user_id"/>
-                                <field name="amount" />
-                                <field name="amount_unit" />
-                                <separator string="Notes" colspan="4" />
-                                <field name="note" colspan="4" nolabel="1" />
-                            </form>
-                            <tree editable="bottom"
-                                    string="Planning Lines">
-                                    <field name="user_id"/>
-                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount" />
-                                    <field name="amount_unit" />
-                                    <field name="task_ids" />
-                                    <field name="note" />
-                                    <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-                                </tree>
-                        </field>
-                    </page>
-                </notebook>
-            </field>
-        </record>
-
-
-<!--        Task Form -->
-
-        <record id="view_task_planning_form" model="ir.ui.view">
-            <field name="name">planning.task.form</field>
-            <field name="model">project.task</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.view_task_form2"/>
-            <field name="arch" type="xml">
-                <field name="priority" position="before">
-                    <field name="planning_line_id" domain="['|', ('user_id','=',user_id), ('user_id','=', False)]"/>
-                </field>
-            </field>
-        </record>
-
-<!--Added link to open the list of all tasks planned on all lines of this planning.-->
-        <act_window context="{'planning': active_id}"
-            id="act_task_of_lines" name="Tasks" res_model="project.task"
-            src_model="report_account_analytic.planning"
-        />
-
-        <!-- company form -->
-        <record id="planning_company" model="ir.ui.view">
-            <field name="name">res.company.planning.config</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
-            <field name="priority">25</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <field name="project_time_mode_id" position="after">
-                <field name="planning_time_mode_id"/>
-            </field>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/project_planning/report/__init__.py b/addons/project_planning/report/__init__.py
deleted file mode 100644
index 230f7e6a702..00000000000
--- a/addons/project_planning/report/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import report_planning
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/report/report_planning.py b/addons/project_planning/report/report_planning.py
deleted file mode 100644
index 67fd118491f..00000000000
--- a/addons/project_planning/report/report_planning.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from report import report_sxw
-
-class report_planning(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context=None):
-        super(report_planning, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'time': time,
-        })
-
-report_sxw.report_sxw('report.report_account_analytic.planning.print','report_account_analytic.planning','addons/project_planning/report/report_planning.rml',parser=report_planning, header='internal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
deleted file mode 100644
index 0f656d96967..00000000000
--- a/addons/project_planning/report/report_planning.rml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0"?>
-<document filename="HR Planning.pdf">
-  <template title="HR Planning" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#808080" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#808080" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table8">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10"/>
-    <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER"/>
-    <paraStyle name="terp_default_8_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="terp_default_9_right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="terp_default_12_center_bold" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER"/>
-    <paraStyle name="terp_tbl_header" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
-    <paraStyle name="terp_tbl_header_center" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="terp_tbl_header_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header_center">HR Planning</para>
-    <para style="terp_default_8_center">[[ o.name]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="227.0,312.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_default_9"><font fontName="Helvetica-Bold">Responsible : </font>[[ o.user_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_9_right"><font fontName="Helvetica-Bold">From :</font> [[ formatLang(o.date_from,date=True) ]] <font fontName="Helvetica-Bold"> To : </font>[[ formatLang(o.date_to,date=True) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="539.0" style="Table6">
-      <tr>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_12_center_bold">Summary by user</para>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_tbl_header">User</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Total planned tasks</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Remaining tasks</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Time without tasks</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Timesheet</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(o.planning_user_ids , 'u') ]]</para>
-      <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table8">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ u.user_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(u.plan_tasks) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(u.tasks) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(u.free) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(u.timesheet) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="539.0" style="Table5">
-      <tr>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_12_center_bold">Summary by project</para>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_tbl_header">Project</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Total planned tasks</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Remaining tasks</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Time without tasks</para>
-        </td>
-        <td>
-          <para style="terp_tbl_header_center">Timesheet</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(o.planning_account , 'l') ]] </para>
-      <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table2">
-        <tr>
-          <td>
-            <para style="terp_default_9">[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(l.plan_tasks) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(l.tasks) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(l.plan_open) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_center">[[ formatLang(l.timesheet) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-  </story>
-</document>
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
deleted file mode 100644
index 0c3a57cf173..00000000000
--- a/addons/project_planning/security/ir.model.access.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_report_account_analytic_planning_project_manager,report_account_analytic.planning manager,model_report_account_analytic_planning,project.group_project_manager,1,1,1,1
-access_report_account_analytic_planning_line_project_manager,report_account_analytic.planning.line manager,model_report_account_analytic_planning_line,project.group_project_manager,1,0,0,0
-access_report_account_analytic_planning_stat_project_manager,report_account_analytic.planning.stat manager,model_report_account_analytic_planning_stat,project.group_project_manager,1,0,0,0
-access_report_account_analytic_planning_stat_project_user,report_account_analytic.planning.stat user,model_report_account_analytic_planning_stat,project.group_project_user,1,1,1,0
-access_account_analytic_account_project_manager,account.analytic.account project manager,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
-access_report_account_analytic_planning__project_user,report_account_analytic.planning user,model_report_account_analytic_planning_user,project.group_project_user,1,1,1,0
-access_report_account_analytic_planning_account_project_manager,report_account_analytic.planning.account,model_report_account_analytic_planning_account,project.group_project_manager,1,1,1,1
-access_report_account_analytic_planning_line_project_user,report_account_analytic.planning.line user,model_report_account_analytic_planning_line,project.group_project_user,1,1,1,0
-access_report_account_analytic_planning_account_project_user,report_account_analytic.planning.account user,model_report_account_analytic_planning_account,project.group_project_user,1,1,1,0
-access_report_account_analytic_planning__project_manager,report_account_analytic.planning.manager,model_report_account_analytic_planning_user,project.group_project_manager,1,1,1,1
diff --git a/addons/project_planning/test/planning_states.yml b/addons/project_planning/test/planning_states.yml
deleted file mode 100644
index 5f7433125de..00000000000
--- a/addons/project_planning/test/planning_states.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-- 
-  Create a analytic planning 'Project Planning'
-- 
-  !record {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0}:
-    business_days: 20
-    date_from: !eval time.strftime('%Y-%m-%d')
-    date_to: !eval "(datetime.now() + timedelta(31)).strftime('%Y-%m-%d')"
-    name: Project Planning
-    state: draft
-    user_id: base.user_demo
-    
-    
-- 
-  Open the planning
-- 
-  !python {model: report_account_analytic.planning}: |
-    self.action_open(cr, uid, [ref("report_account_analytic_planning_projectplanning0")],
-      {"lang": "en_US", "active_ids": [ref("project_planning.menu_report_account_analytic_planning")],
-      "tz": False, "active_model": "ir.ui.menu", "section_id": False, "active_id":
-      ref("project_planning.menu_report_account_analytic_planning"), "search_default_user_id":
-      1, "project_id": False, "department_id": False, })
--
-   Check if planning in open state
--
-   !assert {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0, string: Planning in open state}:     
-     - state == "open"
-
-- 
-  Cancel the planning
-- 
-  !python {model: report_account_analytic.planning}: |
-    self.action_cancel(cr, uid, [ref("report_account_analytic_planning_projectplanning0")],
-      {"lang": "en_US", "active_ids": [ref("project_planning.menu_report_account_analytic_planning")],
-      "tz": False, "active_model": "ir.ui.menu", "section_id": False, "active_id":
-      ref("project_planning.menu_report_account_analytic_planning"), "search_default_user_id":
-      1, "project_id": False, "department_id": False, })
--
-   Check if planning in cancel state
--
-   !assert {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0, string: Planning in cancel state}:     
-     - state == "cancel"    
-    
-- 
-  Reopen the planning
-- 
-  !python {model: report_account_analytic.planning}: |
-    self.action_draft(cr, uid, [ref("report_account_analytic_planning_projectplanning0")],
-      {"lang": "en_US", "active_ids": [ref("project_planning.menu_report_account_analytic_planning")],
-      "tz": False, "active_model": "ir.ui.menu", "section_id": False, "active_id":
-      ref("project_planning.menu_report_account_analytic_planning"), "search_default_user_id":
-      1, "project_id": False, "department_id": False, })
--
-   Check if planning in draft state
--
-   !assert {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0, string: Planning in draft state}:     
-     - state == "draft"   
-    
-- 
-  Open the planning
-- 
-  !python {model: report_account_analytic.planning}: |
-    self.action_open(cr, uid, [ref("report_account_analytic_planning_projectplanning0")],
-      {"lang": "en_US", "active_ids": [ref("project_planning.menu_report_account_analytic_planning")],
-      "tz": False, "active_model": "ir.ui.menu", "section_id": False, "active_id":
-      ref("project_planning.menu_report_account_analytic_planning"), "search_default_user_id":
-      1, "project_id": False, "department_id": False, })
--
-   Check if planning in open state
--
-   !assert {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0, string: Planning in open state}:     
-     - state == "open"    
-    
-- 
-  Close the planning
-- 
-  !python {model: report_account_analytic.planning}: |
-    self.action_done(cr, uid, [ref("report_account_analytic_planning_projectplanning0")],
-      {"lang": "en_US", "active_ids": [ref("project_planning.menu_report_account_analytic_planning")],
-      "tz": False, "active_model": "ir.ui.menu", "section_id": False, "active_id":
-      ref("project_planning.menu_report_account_analytic_planning"), "search_default_user_id":
-      1, "project_id": False, "department_id": False, })
--
-   Check if planning in done state
--
-   !assert {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0, string: Planning in done state}:     
-     - state == "done"
diff --git a/addons/project_planning/test/project_planning_report.yml b/addons/project_planning/test/project_planning_report.yml
deleted file mode 100644
index a7597af86e8..00000000000
--- a/addons/project_planning/test/project_planning_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a Project Planning, we will print Project Planning Report
--
-  !python {model: report_account_analytic.planning}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.report_account_analytic.planning.print').create(cr, uid, [ref('project_planning.project_plannning_1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'project_planning-project_planning_report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index a7753fe33b4..f7b5d0a3736 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -88,7 +88,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Dashboard" layout="manual">
+                <form string="Purchase Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(purchase_draft)d" string="Request for Quotations" creatable="true"/>
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index d9d2fb9f9ee..08637ba362d 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -10,7 +10,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <field name="po_lead"/>
+                    <group>
+                        <field name="po_lead"/>
+                    </group>
                 </page>
             </field>
         </record>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b6f06dfd4bf..47ff616b548 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -173,7 +173,7 @@ class purchase_order(osv.osv):
         'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
-        'notes': fields.text('Notes'),
+        'notes': fields.text('Terms and Conditions'),
         'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"),
         'picking_ids': fields.one2many('stock.picking.in', 'purchase_id', 'Picking List', readonly=True, help="This is the list of incomming shipments that have been generated for this purchase order."),
         'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e561473363a..dafa55ad102 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -24,10 +24,6 @@
             action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
             parent="menu_purchase_config_pricelist" sequence="10" />
 
-        <!--<menuitem
-            action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type"
-            parent="menu_purchase_config_pricelist" sequence="2"/>-->
-
         <menuitem
             id="menu_product_in_config_purchase" name="Products"
             parent="menu_purchase_config_purchase" sequence="30" groups="base.group_no_one"/>
@@ -130,7 +126,7 @@
             <field name="model">purchase.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Purchase Order" version="7.0">
                 <header>
                     <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_form_button_hi"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
@@ -146,24 +142,24 @@
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Purchase Order" layout="auto">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="date_order"/>
-                        <field name="invoiced"/>
-                        <newline/>
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
-                        <field name="partner_ref"/>
-                        <field name="shipped"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Purchase Order">
+                <sheet>
+                    <group>
+                        <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
+                            <field name="partner_ref"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
-                            <field name="origin"/>
-                            <newline/>
-                            <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
+                        </group>
+                        <group>
+                            <field name="name"/>
+                            <field name="date_order"/>
+                            <field name="origin" attr="{'invisible': [('origin','=',False)]}"/>
+                            <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Purchase Order">
+                            <field name="order_line">
                                 <tree string="Purchase Order Lines">
                                     <field name="date_planned"/>
                                     <field name="name"/>
@@ -172,45 +168,43 @@
                                     <field name="price_unit"/>
                                     <field name="price_subtotal"/>
                                 </tree>
-                                <!-- default form view -->
                             </field>
-                            <group col="7" colspan="4">
-                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                            <group class="oe_form_subtotal_footer">
+                                <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" sum="Total amount"/>
+                                <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
+                            <div class="oe_clear"/>
+                            <label for="notes"/>
+                            <field name="notes"/>
                         </page>
                         <page string="Delivery &amp; Invoicing">
-                            <group colspan="2" col="2">
-                                <separator string="Delivery" colspan="2"/>
-                                <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
-                                <field name="minimum_planned_date"/>
-                                <field name="location_id" groups="stock.group_locations"/>
+                            <group>
+                                <group string="Delivery">
+                                    <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
+                                    <field name="minimum_planned_date"/>
+                                    <field name="location_id" groups="stock.group_locations"/>
+                                    <field name="shipped"/>
+                                </group>
+                                <group string="Invoice Control">
+                                    <field name="invoice_method"/>
+                                    <field name="fiscal_position" widget="selection"/>
+                                    <field name="invoiced"/>
+                                </group>
+                                <group groups="base.group_no_one" string="Purchase Control">
+                                    <field name="validator"/>
+                                    <field name="date_approve"/>
+                                </group>
+                                <separator string="Invoices"/>
+                                <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="Invoice Control" colspan="2"/>
-                                <field name="invoice_method"/>
-                                <field name="fiscal_position" widget="selection"/>
-                            </group>
-                            <newline/>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Purchase Control" colspan="4"/>
-                                <field name="validator"/>
-                                <field name="date_approve"/>
-                            </group>
-                            <separator string="Invoices" colspan="4"/>
-                            <newline/>
-                            <field name="invoice_ids" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
-                   <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                   <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -333,37 +327,39 @@
             <field name="model">purchase.order.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Order Line">
-                    <notebook colspan="4">
-                        <page string="Order Line">
-                            <field name="product_id" colspan="4" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" required="1"/>
-                            <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
-                            <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
-                            <field colspan="4" name="name"/>
-                            <field name="date_planned" widget="date"/>
-                            <field name="price_unit"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
-                            <group colspan="4" col="4">
-                                <separator colspan="4" string="Taxes"/>
-                                <field colspan="4" nolabel="1" name="taxes_id"
+                <form string="Purchase Order Line" version="7.0">
+                    <sheet>
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1><field name="name"/></h1>
+                        <label for="product_id" class="oe_form_readonly_hidden"/>
+                        <group>
+                            <group>
+                                <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
+                                <label for="product_qty"/>
+                                <div>
+                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_form_inline"/>
+                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_form_inline"/>
+                                </div>
+                                <field name="price_unit"/>
+                            </group>
+                            <group>
+                                <field name="date_planned" widget="date"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
+                                <field name="taxes_id" widget="many2many_tags"
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             </group>
-                        </page>
-                        <page string="Invoicing">
-                            <separator colspan="4" string="Manual Invoices"/>
-                            <field name="invoiced"/>
-                            <newline/>
-                            <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
-                        </page>
-                           <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                        <page string="History">
-                               <separator colspan="4" string="Stock Moves"/>
-                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>
-                    </notebook>
+                            <group string="Notes" colspan="4">
+                                <field name="notes"/>
+                            </group>
+                            <group string="Invoices" colspan="4">
+                                <field name="invoiced"/>
+                                <field name="invoice_lines" nolabel="1" colspan="2"/>
+                            </group>
+                            <separator string="Stock Moves"/>
+                            <field name="move_ids"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -394,39 +390,41 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Purchase Order Line">
-                    <notebook colspan="4">
-                        <page string="Order Line">
-                               <separator colspan="4" string="General Information"/>
-                             <field name="order_id"/>
-                            <field name="product_id" readonly="1" />
-                            <field name="product_qty" readonly="1" />
-                            <field name="product_uom" readonly="1" groups="product.group_uom"/>
-                            <field colspan="4" name="name"/>
-                            <field name="date_planned" widget="date"  readonly="1"/>
+                <form string="Purchase Order Line" version="7.0">
+                    <label for="order_id" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="order_id" class="oe_form_inline"/>, 
+                        <field name="date_order" class="oe_form_inline"/>
+                    </h1>
+                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="partner_id"/></h2>
+
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="product_id" readonly="1"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty" readonly="1" class="oe_form_inline"/>
+                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_form_inline"/>
+                            </div>
                             <field name="price_unit"/>
+                        </group>
+                        <group>
+                            <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <group colspan="4" col="4">
-                                <separator colspan="4" string="Taxes"/>
-                                <field colspan="4" nolabel="1" name="taxes_id"
-                                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-                            </group>
-                        </page>
-                        <page string="Invoicing">
-                            <separator colspan="4" string="Manual Invoices"/>
+                            <field name="taxes_id" widget="many2many_tags"
+                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             <field name="invoiced"/>
-                            <newline/>
-                            <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
-                        </page>
-                         <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                        <page string="History">
-                               <separator colspan="4" string="Stock Moves"/>
-                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>
-                    </notebook>
+                        </group>
+                    </group>
+                    <separator string="Manual Invoices"/>
+                    <field name="invoice_lines"/>
+                    <separator string="Notes"/>
+                    <field name="notes"/>
+                    <separator string="Stock Moves"/>
+                    <field name="move_ids"/>
                 </form>
             </field>
         </record>
@@ -436,20 +434,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                        <group>
+                    <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
                         <field name="partner_id"  string="Supplier"/>
-                        </group>
+                    </group>
                         <newline/>
-                        <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
                         <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                        </group>
+                    </group>
                </search>
             </field>
         </record>
@@ -509,7 +507,7 @@
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page/field[@name='close_move']" position="before">
+                <xpath expr="//field[@name='close_move']" position="before">
                     <field name="purchase_id"/>
                 </xpath>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 575863fddc4..c45503faa36 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -6,12 +6,13 @@
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Purchases" layout="manual">
+                <form string="Configure Purchases" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
+                    <sheet>
+                    <group col="4">
                         <separator string="Invoicing" colspan="4"/>
                         <field name="default_invoice_method"/>
                         <field name="decimal_precision"/>
@@ -26,6 +27,7 @@
 
                         <separator string="Products" colspan="4"/>
                         <field name="module_product_manufacturer"/>
+                    </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 2f11eea18b2..40f081076f6 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Make the invoice-->
-        
-		<record id="view_purchase_line_invoice" model="ir.ui.view">
+
+        <record id="view_purchase_line_invoice" model="ir.ui.view">
             <field name="name">Create invoices</field>
             <field name="model">purchase.order.line_invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select an Open Sale Order">
-				    <separator colspan="4" string="Do you want to generate the supplier invoices?" />
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="makeInvoices" string="Confirm"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                <form string="Select an Open Sale Order" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" />
+                    </header>
+                    <label string="Do you want to generate the supplier invoices?"/>
                 </form>
             </field>
         </record>
 
-	<act_window name="Create invoices"		    
-		    res_model="purchase.order.line_invoice"
-		    src_model="purchase.order.line"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_view_purchase_line_invoice"/>	
-	</data>
-</openerp>	
-        
\ No newline at end of file
+    <act_window name="Create invoices"
+            res_model="purchase.order.line_invoice"
+            src_model="purchase.order.line"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_view_purchase_line_invoice"/>
+    </data>
+</openerp>
+
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index b49656350e6..50c75668068 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -6,9 +6,12 @@
             <field name="model">purchase.order.group</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="Merge orders">
-                    <separator string="Are you sure you want to merge these orders?" colspan="4"/>
-                       <newline/>
+               <form string="Merge orders" version="7.0">
+                    <header>
+                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <separator string="Are you sure you want to merge these orders?"/>
                     <label string="
 Please note that: &#10; &#10;
 Orders will only be merged if: &#10;
@@ -17,11 +20,7 @@ Orders will only be merged if: &#10;
 * Purchase Orders are have same stock location, same pricelist &#10; &#10;
 Lines will only be merged if: &#10;
 * Order lines are exactly the same except for the product,quantity and unit &#10;
-" colspan="4"/>                
-                    <newline/>                    
-                    <separator string="" colspan="4" />
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
+" colspan="4"/>
                 </form>
             </field>
         </record>
@@ -32,10 +31,10 @@ Lines will only be merged if: &#10;
             src_model="purchase.order"
             view_mode="form"
             target="new"
-            multi="True"        
-            key2="client_action_multi"    
-            id="action_view_purchase_order_group"/>    
-                        
+            multi="True"
+            key2="client_action_multi"
+            id="action_view_purchase_order_group"/>
+
     </data>
 </openerp>
 
diff --git a/addons/purchase_double_validation/i18n/ja.po b/addons/purchase_double_validation/i18n/ja.po
index f1240312833..844601c815f 100644
--- a/addons/purchase_double_validation/i18n/ja.po
+++ b/addons/purchase_double_validation/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-04-29 05:11+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-06-08 21:47+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-04-30 04:41+0000\n"
-"X-Generator: Launchpad (build 15171)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -25,7 +25,7 @@ msgstr "発注アプリケーションの設定"
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
 msgid "Define minimum amount after which puchase is needed to be validated."
-msgstr ""
+msgstr "発注を検証するために必要な最小金額を定義します。"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -57,7 +57,7 @@ msgstr "res_config_contents"
 #. module: purchase_double_validation
 #: help:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum amount after which validation of purchase is required."
-msgstr ""
+msgstr "発注の検証に要求される最大金額"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
diff --git a/addons/purchase_double_validation/i18n/sv.po b/addons/purchase_double_validation/i18n/sv.po
new file mode 100644
index 00000000000..687f718bbe6
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/sv.po
@@ -0,0 +1,70 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-08 21:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr ""
diff --git a/addons/purchase_requisition/i18n/sv.po b/addons/purchase_requisition/i18n/sv.po
new file mode 100644
index 00000000000..8fa5f6c978b
--- /dev/null
+++ b/addons/purchase_requisition/i18n/sv.po
@@ -0,0 +1,444 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-08 21:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
+#, python-format
+msgid "No Product in Tender"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "New"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: model:ir.module.category,name:purchase_requisition.module_category_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:136
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Current Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
+msgid "User"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:136
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr ""
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr ""
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr ""
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 2b2323308b2..dc13be5b1ec 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -32,44 +32,53 @@
         <field name="type">form</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form string="Purchase Requisition" version="7.0">
             <header>
                 <button name="tender_in_progress" states="draft" string="Start" type="object" />
                 <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
                 <button name="tender_done" states="in_progress" string="Done" type="object" />
                 <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
-                <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
+                <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
-            <sheet string="Purchase Requisition" layout="auto">
-                <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="exclusive"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                    <field name="origin"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+            <sheet>
+                <label for="name" class="oe_form_readonly_hidden"/>
+                <h1>
+                    <field name="name" class="oe_form_inline"/>, 
+                    <field name="origin" class="oe_form_inline"/>
+                </h1>
+                <group>
+                    <group>
+                        <field name="user_id"/>
+                        <field name="exclusive"/>
+                    </group><group>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="warehouse_id" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
                 </group>
                 <notebook colspan="4">
                     <page string="Products">
-                        <field name="line_ids" colspan="4" nolabel="1">
+                        <field name="line_ids">
                             <tree string="Products" editable="bottom">
                                 <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom_id"/>
                             </tree>
-                            <form string="Products">
-                                <field name="product_id" />
-                                <field name="product_qty"/>
-                                <field name="product_uom_id" />
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <form string="Products" version="7.0">
+                                <group col="4">
+                                    <field name="product_id" />
+                                    <field name="product_qty"/>
+                                    <field name="product_uom_id" />
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                </group>
                             </form>
-
                         </field>
+                        <separator string="Terms and Conditions"/>
+                        <field name="description"/>
                     </page>
                     <page string="Quotations">
-                        <field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
+                        <field name="purchase_ids">
                             <tree string="Purchase Order">
                                 <field name="name" string="Reference"/>
                                 <field name="date_order" string="Order Date"/>
@@ -84,16 +93,9 @@
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
                             </tree>
                          </field>
-                        <separator colspan="4" string=""/>
-                         <group col="8" colspan="4">
-                          <label colspan="6"  string=""/>
-                        <button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
+                         <button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
                            attrs="{'readonly': [('state', '=', 'done')]}" />
-                        </group>
                    </page>
-                    <page string="Notes">
-                        <field name="description" colspan="4" nolabel="1"/>
-                    </page>
                 </notebook>
             </sheet>
             </form>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 4656d3c37c6..62d9e605600 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -1,32 +1,31 @@
 <openerp>
       <data>
 
-    	<record id="view_purchase_requisition_partner" model="ir.ui.view">
+        <record id="view_purchase_requisition_partner" model="ir.ui.view">
             <field name="name">Purchase Requisition</field>
             <field name="model">purchase.requisition.partner</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Purchase Requisition">
-              	 <group colspan="2" col="2">
-              	     <field name="partner_id"/>
-              		  <separator string="" colspan="4" />
-		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-		            		<button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
-		              </group>
-			  	</form>
+                <form string="Purchase Requisition" version="7.0">
+                    <header>
+                        <button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
+                    </header>
+                    <group>
+                        <field name="partner_id"/>
+                    </group>
+                </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_purchase_requisition_partner" model="ir.actions.act_window">
-	           <field name="name">Purchase Requisition</field>
-	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">purchase.requisition.partner</field>
-	           <field name="view_type">form</field>
-	           <field name="view_mode">form</field>
-		       <field name="context">{'record_id' : active_id}</field>
-	           <field name="target">new</field>
-    	</record>        
+        <record id="action_purchase_requisition_partner" model="ir.actions.act_window">
+               <field name="name">Purchase Requisition</field>
+               <field name="type">ir.actions.act_window</field>
+               <field name="res_model">purchase.requisition.partner</field>
+               <field name="view_type">form</field>
+               <field name="view_mode">form</field>
+               <field name="context">{'record_id' : active_id}</field>
+               <field name="target">new</field>
+        </record>
 </data>
 </openerp>
-
-       
\ No newline at end of file
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 2527f2e4f97..b069fd159ee 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -19,7 +19,7 @@
             <field name="inherit_id" ref="base.view_country_form"/>
             <field name="arch" type="xml">
                 <field name="code" position="after">
-                    <field name="intrastat" select="1"/>
+                    <field name="intrastat"/>
                 </field>
             </field>
         </record>
@@ -53,9 +53,11 @@
             <field name="model">report.intrastat.code</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Intrastat code">
-                    <field name="name" select="1"/>
-                    <field name="description" select="1"/>
+                <form string="Intrastat Code" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="description"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index c66afd4f66c..0a052b8de20 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -5,13 +5,13 @@
             <field name="model">ir.header_img</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <group col="6" colspan="4">
+                <form version="7.0">
+                    <group>
                         <field name="name"/>
                         <field name="type"/>
                         <field name='company_id' />
                     </group>
-                    <field name="img" widget="image" colspan="4"/>
+                    <field name="img" widget="image" class="oe_right"/>
                 </form>
             </field>
         </record>
@@ -21,28 +21,25 @@
             <field name="model">ir.header_webkit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="name" colspan="4"/>
-                    <notebook colspan="4">
-                        <page string="Company and Page Setup" >
-                            <field name='company_id' colspan="4"/>
-                            <field name="orientation" />
-                            <field name="format" />
-                            <field name="margin_top" />
-                            <field name="margin_bottom" />
-                            <field name="margin_left" />
-                            <field name="margin_right" />
-                        </page>
-                        <page string="CSS Style" >
-                            <field name="css" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Header" >
-                            <field name="html" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Footer" >
-                            <field name="footer_html" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                <form version="7.0">
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name='company_id'/>
+                            <field name="orientation"/>
+                            <field name="format"/>
+                        </group><group>
+                            <field name="margin_top"/>
+                            <field name="margin_bottom"/>
+                            <field name="margin_left"/>
+                            <field name="margin_right"/>
+                        </group>
+                    </group>
+                    <group>
+                        <field name="css"/>
+                        <field name="html"/>
+                        <field name="footer_html"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index 76d166fc070..223c23f595f 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -7,19 +7,19 @@
             <field name="model">report.webkit.actions</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Add Print Buttons" col="4">
-                    <field name="print_button"/>
-                     <field name="open_action"/>
-                    <separator string="" colspan="6"/>
-                    <group colspan="6" col="4" >
-                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                <form string="Add Print Buttons" col="4" version="7.0">
+                    <header>
                         <button name="do_action" type="object" string="_Ok" icon="gtk-ok" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                    </header>
+                    <group>
+                        <field name="print_button"/>
+                        <field name="open_action"/>
                     </group>
                 </form>
             </field>
         </record>
 
-    
         <act_window name="Add Print Buttons"
             res_model="report.webkit.actions"
             src_model="ir.actions.report.xml"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 1cd4336ab6c..bf8ab3c11e9 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -76,12 +76,13 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Working Time">
-                    <field name="name"/>
-                    <field name="manager"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <separator string="" colspan="4"/>
-                    <field name="attendance_ids" colspan="4" nolabel="1"/>
+                <form string="Working Time" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                    <field name="attendance_ids"/>
                 </form>
             </field>
         </record>
@@ -93,8 +94,8 @@
             <field name="arch" type="xml">
                 <tree string="Working Time">
                     <field name="name"/>
-                    <field name="manager" select="1"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
+                    <field name="manager"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -128,10 +129,10 @@
             <field name="model">resource.calendar.attendance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Working Time">
-                    <field colspan="4" name="name" select="1"/>
+                <form string="Working Time" version="7.0">
+                    <field colspan="4" name="name"/>
                     <field name="date_from"/>
-                    <field name="dayofweek" select="1"/>
+                    <field name="dayofweek"/>
                     <field name="hour_from" widget="float_time"/>
                     <field name="hour_to" widget="float_time"/>
                 </form>
@@ -172,8 +173,8 @@
             <field name="model">resource.resource</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Resource">
-                   <group col="6" colspan="4">
+                <form string="Resource" version="7.0">
+                   <group col="4">
                        <field name="name" colspan="4"/>
                        <field name="active"/>
                        <newline/>
@@ -218,18 +219,18 @@
             <field name="model">resource.calendar.leaves</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Leave Detail">
-                    <group colspan="4" col="6">
-                       <group colspan="2" col="2">
+                <form string="Leave Detail" version="7.0">
+                    <group>
+                       <group>
                            <field name="resource_id" on_change="onchange_resource(resource_id)"/>
                            <field name="name" string="Reason"/>
                        </group>
-                       <group colspan="2" col="2">
+                       <group>
                            <field name="date_from"/>
                            <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
-                       <group colspan="2" col="2">
+                       <group>
                            <field name="date_to"/>
                        </group>
                    </group>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 510a7ac28f7..256ca4648a9 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -63,7 +63,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard" layout="manual">
+                <form string="Sales Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_quotation_for_sale)d" string="My Quotations" creatable="true"/>
@@ -92,7 +92,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard" layout="manual">
+                <form string="Sales Manager Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 46dc7724b2a..af6a2061541 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:24+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-06-08 07:56+0000\n"
+"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:57+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
 msgid "Based on Timesheet"
-msgstr ""
+msgstr "基于时间表"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
-msgstr ""
+msgstr "已完成或在异常状态和尚未开发票的销售订单明细将被确认。"
 
 #. module: sale
 #: view:board.board:0
@@ -44,7 +44,7 @@ msgstr "如果库存不够一次全部交货，你是否接受部分交货？"
 #. module: sale
 #: view:sale.order:0
 msgid "UoS"
-msgstr ""
+msgstr "销售单位"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
@@ -76,7 +76,7 @@ msgstr "报价单“%s”将转换为销售单。"
 #. module: sale
 #: view:sale.order:0
 msgid "Print Quotation"
-msgstr ""
+msgstr "打印报价单"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:42
@@ -98,7 +98,7 @@ msgstr "由销售订单明细产生的采购订单。"
 #: view:sale.report:0 field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -106,7 +106,7 @@ msgid ""
 "Here is a list of each sales order line to be invoiced. You can invoice "
 "sales orders partially, by lines of sales order. You do not need this list "
 "if you invoice from the delivery orders or if you invoice sales totally."
-msgstr "要开票的销售订单明细列表。你可以按照销售订单明细分别开票。如果按发货单开票，或者按销售订单统一开票的话，你不需要这个列表。"
+msgstr "要开票的销售订单明细列表。你可以按照销售订单明细分别开票。如果按送货单开票，或者按销售订单统一开票的话，你不需要这个列表。"
 
 #. module: sale
 #: code:addons/sale/sale.py:295
@@ -115,7 +115,7 @@ msgid ""
 "In order to delete a confirmed sale order, you must cancel it before ! To "
 "cancel a sale order, you must first cancel related picking or delivery "
 "orders."
-msgstr ""
+msgstr "在删除一个已确认的销售订单时，你必须小心！你必须要先取消其生成的装箱单或送货单。"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
@@ -125,17 +125,17 @@ msgstr "采购订单"
 #. module: sale
 #: view:sale.report:0 field:sale.report,partner_id:0
 msgid "Partner"
-msgstr "合作伙伴"
+msgstr "业务伙伴"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice based on deliveries"
-msgstr ""
+msgstr "根据送货单生成发票"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr "采购订单明细"
+msgstr "订单明细"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -148,9 +148,10 @@ msgid ""
 "configuration of the sales order, a draft invoice will be generated so that "
 "you just have to confirm it when you want to bill your customer."
 msgstr ""
-"销售订单管理能帮助你管理报价单和客户订单。 OpenERP建议你先创建报价单， "
-"一旦报价单被确认后，系统会自动把报价单转换成销售订单。OpenERP能处理多种类型产品使一个销售订单可能触发任务，发货单，生产订单，采购等。\r\n"
-"根据销售订单的设置，将会产生一张发票草稿以便当你需要向客户开票的时候，你只需要确认一下即可。"
+"销售订单管理能帮助你管理报价单和客户订单。\r\n"
+"系统建议你先创建报价单， 一旦报价单被确认后，系统会自动把报价单转换成销售订单。\r\n"
+"系统能处理多种类型产品使一个销售订单能触发任务，送货单，生产订单，采购等。\r\n"
+"根据销售订单的设置，将产生一张发票草稿以便当你需要向客户开票的时候，你只需要确认一下即可。"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -161,8 +162,9 @@ msgid ""
 "the product is a service, shipped quantities means hours spent on the "
 "associated tasks."
 msgstr ""
-"销售订单会自动生成发票提议（草稿发票）。订货和交货数量不一定需要一致。你需要选择发票是基于订货数量或交货数量。如果产品是指某种服务，则交货数量是指在指定的"
-"任务上工作时数。"
+"销售订单会自动生成发票提议（发票草稿）。\r\n"
+"销售订单和送货单的数量不一定需要一致。你需要选择发票是基于销售订单数量或送货单的数量。\r\n"
+"如果产品是指服务，则交货数量是指在指定的任务上工作时数。"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -172,12 +174,12 @@ msgstr "默认付款条件"
 #. module: sale
 #: field:sale.config.picking_policy,deli_orders:0
 msgid "Based on Delivery Orders"
-msgstr ""
+msgstr "基于送货单"
 
 #. module: sale
 #: field:sale.config.picking_policy,time_unit:0
 msgid "Main Working Time Unit"
-msgstr ""
+msgstr "主要工作时间单位"
 
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
@@ -193,7 +195,7 @@ msgstr "折扣(%)"
 #. module: sale
 #: view:sale.report:0 field:sale.report,price_total:0
 msgid "Total Price"
-msgstr "价格合计"
+msgstr "总价"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -203,7 +205,7 @@ msgstr "选择此项，发票将会按客户分组。"
 #. module: sale
 #: view:sale.order:0
 msgid "My Sale Orders"
-msgstr ""
+msgstr "我的销售订单"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -223,12 +225,12 @@ msgstr "库存调拨"
 #. module: sale
 #: field:sale.order,name:0 field:sale.order.line,order_id:0
 msgid "Order Reference"
-msgstr "单号"
+msgstr "订单关联"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: sale
 #: view:sale.order:0
@@ -240,28 +242,28 @@ msgstr "日期"
 msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
-msgstr "如果运送方式是‘提货后开票’或者‘发货后开票’， 系统将会自己创建发票。"
+msgstr "如果运送方式是“发票来自装箱单” 或 “送货后开票”， 系统将会自己创建发票。"
 
 #. module: sale
 #: field:sale.config.picking_policy,task_work:0
 msgid "Based on Tasks' Work"
-msgstr ""
+msgstr "基于指派的工作"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Quotations and Sales"
-msgstr ""
+msgstr "报价单或销售订单"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr "销售生成发票"
+msgstr "销售订单生成发票"
 
 #. module: sale
 #: code:addons/sale/sale.py:330
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "价格表警告！"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -284,7 +286,7 @@ msgstr "销售经理仪表盘"
 #. module: sale
 #: field:sale.order.line,product_packaging:0
 msgid "Packaging"
-msgstr "包装"
+msgstr "装箱"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -310,6 +312,11 @@ msgid ""
 "  - The 'Invoice based on deliveries' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"这开票规则是用于同步发票和送货操作。\n"
+"  - “送货前支付”先生成发票，再产生装箱单，然后按发票付款。\n"
+"  - “送货&等待发票” 将直接生成装箱单和等待用户手动点击“发票”按钮生成基于销售订单或其明细的发票草稿。\n"
+"  - “送货后生成发票”根据销售订单生成的所有装箱单都完成后才生成发票草稿。\n"
+"  - “根据送货单开发票”在处理装箱期间生成发票"
 
 #. module: sale
 #: code:addons/sale/sale.py:1171
@@ -327,7 +334,7 @@ msgstr "销售异常"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:70
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "设置错误!"
 
 #. module: sale
 #: view:sale.order:0
@@ -350,7 +357,7 @@ msgstr "8月"
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "你尝试分配一个来自其它产品的批次"
+msgstr "您尝试为不同类的产品分配一个批次"
 
 #. module: sale
 #: code:addons/sale/sale.py:655
@@ -372,7 +379,7 @@ msgstr "不能取消此销售订单 ！"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr "销售订单统"
+msgstr "销售订单统计"
 
 #. module: sale
 #: help:sale.order,project_id:0
@@ -387,7 +394,7 @@ msgstr "10月"
 #. module: sale
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: sale
 #: view:board.board:0 view:sale.order:0 view:sale.report:0
@@ -434,26 +441,26 @@ msgstr "包装数"
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
 msgid "In Progress"
-msgstr "进展"
+msgstr "处理中"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
 msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
-msgstr "业务员确认报价。销售订单的状态变成‘进度’或‘手工进度’。"
+msgstr "业务员确认报价单。销售订单的状态变成‘处理中’或‘手动处理’。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1074
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
+msgstr "你不能取消已开发票的销售订单明细！"
 
 #. module: sale
 #: code:addons/sale/sale.py:1079
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
-msgstr "你必须先取消所有附加在此销售订单明细上的库存调拨。"
+msgstr "你必须先取消所有属于此销售订单明细上的库存调拨。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1147
@@ -490,7 +497,7 @@ msgstr "备注"
 #. module: sale
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名必须唯一！"
 
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
@@ -500,29 +507,29 @@ msgstr "当前销售订单的发票地址。"
 #. module: sale
 #: view:sale.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "上月"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "下单超一个月的销售订单"
 
 #. module: sale
 #: code:addons/sale/sale.py:504
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
-msgstr ""
+msgstr "你不能对有不同货币结算的同一个业务伙伴的销售订单进行分组。"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver each product when available"
-msgstr ""
+msgstr "可以分批交货"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "已开发票"
+msgstr "已开票"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -552,12 +559,12 @@ msgstr "3月"
 #. module: sale
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "您不能将产品移动到类型为视图的库位上。"
 
 #. module: sale
 #: field:sale.config.picking_policy,sale_orders:0
 msgid "Based on Sales Orders"
-msgstr ""
+msgstr "根据销售订单"
 
 #. module: sale
 #: help:sale.order,amount_total:0
@@ -577,7 +584,7 @@ msgstr "发票地址:"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Line Sequence"
-msgstr ""
+msgstr "明细序列号"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -601,7 +608,7 @@ msgstr "发票地址"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr "查询未开票明细"
+msgstr "查找未开票明细"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -616,7 +623,7 @@ msgstr "明细#"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr "未结发票销售订单"
+msgstr "未开票销售订单"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -632,7 +639,7 @@ msgstr "仓库"
 #. module: sale
 #: report:sale.order:0
 msgid "Order N°"
-msgstr "订单号"
+msgstr "单号"
 
 #. module: sale
 #: field:sale.order,order_line:0
@@ -648,7 +655,7 @@ msgstr "未完税金额"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Lines to Invoice"
-msgstr "需开票的销售订单明细"
+msgstr "待开票的销售订单明细"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -663,7 +670,7 @@ msgstr "创建日期"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "杂项"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -690,7 +697,7 @@ msgstr "无效动作！"
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr "附加信息"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
@@ -707,7 +714,7 @@ msgstr "数量#"
 #: code:addons/sale/sale.py:1327
 #, python-format
 msgid "Hour"
-msgstr ""
+msgstr "小时"
 
 #. module: sale
 #: view:sale.order:0
@@ -718,7 +725,7 @@ msgstr "订单日期"
 #: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped"
-msgstr "已运送"
+msgstr "已送货"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -728,7 +735,7 @@ msgstr "所有报价单"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Options"
-msgstr ""
+msgstr "设置"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -739,7 +746,7 @@ msgstr "9月"
 #: code:addons/sale/sale.py:632
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
-msgstr ""
+msgstr "你不能确认没有明细的销售订单。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1259
@@ -748,6 +755,8 @@ msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"你必须在销售界面选一个客户或价格表！\n"
+"请在选择产品前设置。"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,categ_id:0
@@ -793,7 +802,7 @@ msgstr "安全天数"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr "已出售物料采购"
+msgstr "采购已下销售单的物料"
 
 #. module: sale
 #: view:sale.order:0
@@ -803,24 +812,24 @@ msgstr "生成最终发票"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr "运送地址"
+msgstr "送货地址"
 
 #. module: sale
 #: help:sale.order,shipped:0
 msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
-msgstr "它表示销售订单已经发货了。只有运行日程表（scheduler）后这个字段才会被修改。"
+msgstr "它表示销售订单已经送货。只有运行调度程序（scheduler）后这个字段才会被修改。"
 
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr "扩展过滤器..."
+msgstr "增加筛选条件"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -842,12 +851,15 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the order date."
 msgstr ""
+"给出报价单或销售订单的状态。\n"
+"在发票确认（发票异常）或在装箱单处理中（运输异常），“异常”状态会自动设置一个取消操作。\n"
+"在“等待调度”状态设置发票等待在调度的日期里确认。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1272
 #, python-format
 msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "明细没有找到有效的价格表！"
 
 #. module: sale
 #: view:sale.order:0
@@ -857,7 +869,7 @@ msgstr "日志"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on order after delivery"
-msgstr ""
+msgstr "在订单送货后生成发票"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -870,13 +882,13 @@ msgstr "这是为此销售订单生成的发票列表。同一销售订单可能
 #. module: sale
 #: report:sale.order:0
 msgid "Your Reference"
-msgstr "你参考"
+msgstr "您的关联单号"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact who requested the order or quotation."
-msgstr "订单或报价请求人的姓名和地址。"
+msgstr "订单或报价单联系人姓名和地址。"
 
 #. module: sale
 #: help:res.company,security_lead:0
@@ -892,12 +904,12 @@ msgstr "数量"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr "引用"
+msgstr "关联"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr ""
+msgstr "我的销售订单明细"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -911,7 +923,7 @@ msgstr "取消"
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -919,7 +931,7 @@ msgstr ""
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0 view:sale.order.line:0
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr "生成发票"
 
 #. module: sale
 #: view:sale.order:0
@@ -929,7 +941,7 @@ msgstr "不含税总金额"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order reference"
-msgstr ""
+msgstr "订单关联单号"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -944,7 +956,7 @@ msgstr "业务伙伴的销售情况"
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr "订购联系"
+msgstr "联系人的订购"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
@@ -955,7 +967,7 @@ msgstr "未结发票"
 #. module: sale
 #: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
 msgid "Auto-email confirmed sale orders"
-msgstr ""
+msgstr "销售订单确认的自动电子邮件"
 
 #. module: sale
 #: code:addons/sale/sale.py:413
@@ -976,17 +988,17 @@ msgstr "来自订单"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr "基于已运送或被订购的数据。"
+msgstr "已运送或被已订购的数量。"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Deliver all products at once"
-msgstr ""
+msgstr "一次性交货"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr "装箱单"
+msgstr "关联的装箱单"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -996,7 +1008,7 @@ msgstr "名称"
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
-msgstr "运送地址:"
+msgstr "运货地址:"
 
 #. module: sale
 #: view:board.board:0
@@ -1012,18 +1024,18 @@ msgstr "销售订单草稿状态"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr "创建发货单"
+msgstr "生成送货单"
 
 #. module: sale
 #: code:addons/sale/sale.py:1303
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
+msgstr "不能删除'%s'状态的销售订单明细！"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Qty(UoS)"
-msgstr ""
+msgstr "数量（销售单位）"
 
 #. module: sale
 #: view:sale.order:0
@@ -1033,12 +1045,12 @@ msgstr "含税总金额"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr "创建分拣单"
+msgstr "生成装箱单"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered date of the sales order"
-msgstr ""
+msgstr "销售订单的订购日期"
 
 #. module: sale
 #: view:sale.report:0
@@ -1059,18 +1071,18 @@ msgstr "错误"
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
 msgid "Group By..."
-msgstr "分组于..."
+msgstr "分组..."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Invoice"
-msgstr "重新创建发票"
+msgstr "重新生成发票"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr "开票的发货单"
+msgstr "送货单待开票"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
@@ -1080,12 +1092,12 @@ msgstr "等待调度"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr "采购方式"
+msgstr "引起需求的方式"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr "分拣单"
+msgstr "装箱单"
 
 #. module: sale
 #: view:sale.order:0
@@ -1179,7 +1191,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr "确认"
+msgstr "审核"
 
 #. module: sale
 #: view:sale.order:0
@@ -1195,12 +1207,12 @@ msgstr "创建采购订单"
 #: view:sale.order:0 field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr "税款"
+msgstr "税"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order ready to be invoiced"
-msgstr ""
+msgstr "待开票的销售订单"
 
 #. module: sale
 #: help:sale.order,create_date:0
@@ -1215,7 +1227,7 @@ msgstr "库存调拨"
 #. module: sale
 #: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr "生成发票"
+msgstr "创建发票"
 
 #. module: sale
 #: view:sale.report:0
@@ -1233,7 +1245,7 @@ msgid ""
 "If 'on order', it triggers a procurement when the sale order is confirmed to "
 "create a task, purchase order or manufacturing order linked to this sale "
 "order line."
-msgstr ""
+msgstr "如果是“来自订单”，当销售订单确认后它会触发一个需求，销售订单的明细会关联出采购订单或生产单。"
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -1243,12 +1255,12 @@ msgstr "预付款总额"
 #. module: sale
 #: field:sale.config.picking_policy,charge_delivery:0
 msgid "Do you charge the delivery?"
-msgstr ""
+msgstr "你负责送货？"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr "已运数量"
+msgstr "已送货数量"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
@@ -1261,7 +1273,7 @@ msgstr "基于销售订单开票"
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
 "prices of existing order lines will not be updated."
-msgstr ""
+msgstr "如果你修改这订单的价格表（货币），现有订单明细的价格不会修改。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
@@ -1285,12 +1297,12 @@ msgstr "不能取消销售订单 ！"
 #. module: sale
 #: view:sale.order:0
 msgid "Qty(UoM)"
-msgstr ""
+msgstr "数量（计量单位）"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered Year of the sales order"
-msgstr ""
+msgstr "今年的销售订单"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1300,18 +1312,18 @@ msgstr "7月"
 #. module: sale
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr "产品需求"
+msgstr "需求"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.report,state:0
 msgid "Shipping Exception"
-msgstr "运送异常"
+msgstr "送货异常"
 
 #. module: sale
 #: code:addons/sale/sale.py:1156
 #, python-format
 msgid "Picking Information ! : "
-msgstr ""
+msgstr "装箱信息！： "
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
@@ -1321,30 +1333,30 @@ msgstr "发票组"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Invoice Policy"
-msgstr ""
+msgstr "开票规则"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 #: view:sale.config.picking_policy:0
 msgid "Setup your Invoicing Method"
-msgstr ""
+msgstr "设置你开票的方法"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr "等待会计审核。"
+msgstr "等待会计复核。"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Reference UoM"
-msgstr "参考计量单位（UoM）"
+msgstr "相关计量单位"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid ""
 "This tool will help you to install the right module and configure the system "
 "according to the method you use to invoice your customers."
-msgstr ""
+msgstr "该工具帮助你安装适合的模块并设置系统你对客户开发票的方法。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1359,7 +1371,7 @@ msgstr "发票异常"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr "促使采购和开票"
+msgstr "驱动需求计算和开发票"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1381,6 +1393,8 @@ msgid ""
 "Here is a proposition of quantities according to the packaging:\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"你选择了 %d 单位的数量。但它不兼容选定的包装。\n"
+"这是对应该包装的建议数量：EAN: %s ，  数量: %s， 单位类型: %s"
 
 #. module: sale
 #: view:sale.order:0
@@ -1404,24 +1418,24 @@ msgid ""
 "The Salesman creates an invoice manually, if the sales order shipping policy "
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
-msgstr "如果销售定单的运货方式是‘运送并且手工开票’， 业务员需要手工生成发票。如果运送方式是‘先付款后开票’，发票将自动生成。"
+msgstr "如果销售订单的送货方式是‘送货并手工开票’， 业务员需要手工生成发票。如果送货方式是‘先付款后送货’，发票将自动生成。"
 
 #. module: sale
 #: help:sale.config.picking_policy,order_policy:0
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
-msgstr "你可以根据销售订单或运输单生成发票。"
+msgstr "你可以根据销售订单或送货单生成发票。"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
+msgstr "确认销售订单明细，尚未送货"
 
 #. module: sale
 #: code:addons/sale/sale.py:473
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "客户发票"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -1438,7 +1452,7 @@ msgstr "单价"
 #: selection:sale.order,state:0 view:sale.order.line:0
 #: selection:sale.order.line,state:0 selection:sale.report,state:0
 msgid "Done"
-msgstr "完成"
+msgstr "已完成"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -1454,17 +1468,17 @@ msgid ""
 "Please set one customer before choosing a product."
 msgstr ""
 "你必须在销售表单中选择一个客户 ！\n"
-"请在选择产品之前设置1个客户。"
+"请在选择产品之前设置客户。"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr "源文档"
+msgstr "源单据"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr "待处理"
+msgstr "待办事项"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
@@ -1490,7 +1504,7 @@ msgstr "你必须先取消销售订单上的所有装箱单。"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr "销售预付发票"
+msgstr "销售预付款发票"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,month:0
@@ -1511,7 +1525,7 @@ msgstr "产品"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr "取消指定"
+msgstr "取消分配"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -1522,7 +1536,7 @@ msgstr "sale.config.picking_policy"
 #: view:account.invoice.report:0 view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_turnover_by_month
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "月营业额"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1532,7 +1546,7 @@ msgstr "开票依据"
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
-msgstr "订购日期"
+msgstr "下单日期"
 
 #. module: sale
 #: field:sale.order.line,product_uos:0
@@ -1542,7 +1556,7 @@ msgstr "产品销售单位"
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
-msgstr "手动进展"
+msgstr "手动处理"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -1579,8 +1593,8 @@ msgid ""
 "generates an invoice or a delivery order as soon as it is confirmed by the "
 "salesman."
 msgstr ""
-"根据销售订单的开票方式， 根据交货或者订购数据生成发票。\r\n"
-"因此，一旦销售订单被业务员确认，就会为它生产发票或者发货单。"
+"根据销售订单的开票方式， 基于送货单或者订购数量生成发票。\r\n"
+"因此，一旦销售订单被业务员确认，就会为它生成发票或者送货单。"
 
 #. module: sale
 #: code:addons/sale/sale.py:1251
@@ -1605,7 +1619,7 @@ msgstr "res_config_contents"
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr "客户订单号"
+msgstr "客户关联单号"
 
 #. module: sale
 #: field:sale.order,amount_total:0 view:sale.order.line:0
@@ -1623,17 +1637,17 @@ msgid ""
 "Depending on the configuration of the location Output, the move between the "
 "output area and the customer is done through the Delivery Order manually or "
 "automatically."
-msgstr "根据出库库位的设置，出库和客户之间的库存转移是通过发货单手工或自动完成的。"
+msgstr "根据出库库位的设置，出库和客户之间的库存调拨是通过送货单手工或自动完成的。"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Pay before delivery"
-msgstr ""
+msgstr "送货前付款"
 
 #. module: sale
 #: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "销售控制台"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1645,7 +1659,7 @@ msgstr "生成发票"
 #. module: sale
 #: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
-msgstr "开票"
+msgstr "待开票"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
@@ -1655,7 +1669,7 @@ msgstr "销售订单的日期已确认。"
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
-msgstr ""
+msgstr "合并、分析科目"
 
 #. module: sale
 #: field:sale.order,company_id:0 field:sale.order.line,company_id:0
@@ -1681,6 +1695,8 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"找不到此产品和数量的价格表。\n"
+"你必须修改产品，或价格表的数量。"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1707,7 +1723,7 @@ msgstr "已取消"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
+msgstr "销售订单明细与我的销售订单"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1731,7 +1747,7 @@ msgstr "警告"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 msgid "Sales by Month"
-msgstr "月销售情况"
+msgstr "月度销售订单"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1750,7 +1766,7 @@ msgstr "数量(销售单位)"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
+msgstr "“已完成”状态的销售订单明细"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1759,7 +1775,7 @@ msgid ""
 "the same time as the procurement order. It represents the assignment of "
 "parts to the sales order. There is 1 pick list by sales order line which "
 "evolves with the availability of parts."
-msgstr "一旦销售订单被确认，装箱单就会和采购订单一起被生成。它代表部分销售订单分配。每行有效的销售订单明细会对应一张装箱单。"
+msgstr "一旦销售订单被确认，装箱单就会和需求单一起生成。表示销售订单所产生的需求。有效的销售订单明细会相应产生一张装箱单。"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1769,7 +1785,7 @@ msgstr "已确认"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Main Method Based On"
-msgstr ""
+msgstr "主要方法"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1785,12 +1801,12 @@ msgstr "错误！您不能创建递归公司."
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_product_total_price
 msgid "Sales by Product's Category in last 90 days"
-msgstr "最近90天各产品类别的销售情况"
+msgstr "最近90天各产品类别的销售订单"
 
 #. module: sale
 #: view:sale.order:0 field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr "发票行"
+msgstr "发票明细"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1801,7 +1817,7 @@ msgstr "销售订单明细"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr "发货提前期"
+msgstr "送货提前期"
 
 #. module: sale
 #: view:res.company:0
@@ -1812,17 +1828,17 @@ msgstr "设置"
 #: code:addons/sale/edi/sale_order.py:146
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI 价格表 (%s)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Print Order"
-msgstr ""
+msgstr "打印订单"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in current year"
-msgstr ""
+msgstr "本年创建的销售订单"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:113
@@ -1840,7 +1856,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
-msgstr ""
+msgstr "销售订单明细已完成"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1869,7 +1885,7 @@ msgid ""
 "confirmed or as the invoice is paid. It drives the purchasing and the "
 "production of products regarding to the rules and to the sales order's "
 "parameters. "
-msgstr "采购订单会在销售订单确认或发票付款后立刻自动生成。根据产品的采购和生产规则和销售订单参数。 "
+msgstr "需求会在销售订单确认或发票付款后自动生成。它是采购和生产则根据有关的规则和售订订单参数而得出的。 "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1886,12 +1902,12 @@ msgstr "业务员"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr "老的报价单"
+msgstr "旧的报价单"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "未完税金额"
+msgstr "不含税金额"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:170
@@ -1927,8 +1943,8 @@ msgid ""
 msgstr ""
 "*当相关的销售订单处于草稿状态时设置为'草稿'状态。                     \n"
 "*当相关的销售订单被确认时设置为'已确认'状态。                     \n"
-"*当相关的销售订单被设置为异常的时候设置为'异常'状态。                     \n"
-"*当销售订单明细已经拣货时设置为'已完成'状态。                     \n"
+"*当相关的销售订单为异常的时候设置为'异常'状态。                     \n"
+"*当销售订单明细已经装箱时设置为'已完成'状态。                     \n"
 "*当用户取消相关销售订单时设置为'已取消'状态。"
 
 #. module: sale
@@ -1944,18 +1960,18 @@ msgstr "装箱单"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
+msgstr "准备开发票的销售订单明细"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales order created in last month"
-msgstr ""
+msgstr "上月创建的销售订单"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
 #: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "电子邮件模板"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -1966,7 +1982,7 @@ msgstr "销售订单"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
 msgid "Sales Shop"
-msgstr "销售店"
+msgstr "销售商店"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1976,7 +1992,7 @@ msgstr "11月"
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr "预付产品"
+msgstr "预付款产品"
 
 #. module: sale
 #: view:sale.order:0
@@ -1997,12 +2013,12 @@ msgstr "1月"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
-msgstr "销售订单进展"
+msgstr "销售订单处理中"
 
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr "生成此销售订单请求的单据"
+msgstr "生成此销售订单相关的请求单据"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,delay:0
@@ -2012,14 +2028,14 @@ msgstr "承诺延迟"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Deliver & invoice on demand"
-msgstr ""
+msgstr "要求的送货单和发票"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
-msgstr "销售订单的对应一个采购订单"
+msgstr "一个需求单对应一个销售订单明细里的组件"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -2039,7 +2055,7 @@ msgstr "确认的销售订单开票。"
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+msgstr "销售订单尚未被确认"
 
 #. module: sale
 #: code:addons/sale/sale.py:322
@@ -2061,17 +2077,17 @@ msgstr "关闭"
 #: code:addons/sale/sale.py:1261
 #, python-format
 msgid "No Pricelist ! : "
-msgstr ""
+msgstr "没价格表！： "
 
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr "已交货"
+msgstr "已送货"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "你必须为产品安排生产批次"
+msgstr "必须为此产品赋予一个生产批次"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -2109,7 +2125,7 @@ msgstr "客户"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance"
-msgstr "预支"
+msgstr "预付款"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2129,7 +2145,7 @@ msgstr "会计"
 #. module: sale
 #: view:sale.order:0 view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr "查询销售订单"
+msgstr "查找销售订单"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
@@ -2140,12 +2156,12 @@ msgstr "销售订单申请"
 #: code:addons/sale/sale.py:1255
 #, python-format
 msgid "Not enough stock ! : "
-msgstr ""
+msgstr "没足够的库存！： "
 
 #. module: sale
 #: report:sale.order:0 field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr "付款条件"
+msgstr "付款条款"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2156,8 +2172,8 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
-"这个报表会对你的报价单和销售订单进行分析。分析报告会检查你的销售收入，并且按照不同的分组标准（业务员，合作伙伴，产品等）进行培训。用这个报表对还没有开票的"
-"销售订单进行分析。 如果你想分析你的营业额，你应该使用会计应用程序里面的发票分析报表。"
+"这个报表会对你的报价单和销售订单进行分析。分析检查你的销售收入，并且按照不同的标准分组（业务员，合作伙伴，产品等）。用这个报表对还没有开票的销售订单进行分"
+"析。 如果你想分析你的营业额，你应该用会计模块里的发票分析报表。"
 
 #. module: sale
 #: report:sale.order:0
@@ -2167,7 +2183,7 @@ msgstr "报价单号"
 #. module: sale
 #: field:sale.order,picked_rate:0 view:sale.report:0
 msgid "Picked"
-msgstr "已领料/退货"
+msgstr "已装箱"
 
 #. module: sale
 #: view:sale.report:0 field:sale.report,year:0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a4200b439ff..ea7f6eb230e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -726,6 +726,26 @@ class sale_order(osv.osv):
             self.cancel_send_note(cr, uid, [sale.id], context=None)
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
+    
+    def action_button_confirm(self, cr, uid, ids, context=None):
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
+        wf_service = netsvc.LocalService('workflow')
+        wf_service.trg_validate(uid, 'sale.order', ids[0], 'order_confirm', cr)
+
+        # redisplay the record as a sale order
+        view_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'view_order_form')
+        view_id = view_ref and view_ref[1] or False,
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Sales Order'),
+            'res_model': 'sale.order',
+            'res_id': ids[0],
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': view_id,
+            'target': 'current',
+            'nodestroy': True,
+        }
 
     def action_wait(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c97dfc69e65..3dc03f145c7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -9,14 +9,20 @@
             <field name="model">sale.shop</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Shop">
-                    <field name="name" select="1"/>
-                    <field name="warehouse_id" required="1" select="1" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <separator colspan="4" string="Accounting"/>
-                    <field name="payment_default_id"/>
-                    <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" select="1"/>
-                    <field name="project_id" select="1" groups="analytic.group_analytic_accounting"/>
+                <form string="Sales Shop" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <group>
+                        <group>
+                            <field name="warehouse_id" required="1" widget="selection"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="payment_default_id"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist"/>
+                            <field name="project_id" groups="analytic.group_analytic_accounting"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
@@ -96,7 +102,7 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Sales Order" version="7.0">
                     <header>
                         <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
@@ -107,12 +113,12 @@
                         <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_form_button_hi"/>
                         <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
-                        <button name="order_confirm" states="draft" string="Confirm"/>
-                        <button name="order_confirm" states="sent" string="Confirm" class="oe_form_button_hi"/>
+                        <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
+                        <button name="action_button_confirm" states="sent" string="Confirm" class="oe_form_button_hi" type="object"/>
                         <button name="action_view_invoice" string="Open Invoice" type="object" 
-                        attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
+                          attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" type="object" 
-                        attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+                          attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                         <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="manual"/>
                         <button name="cancel" states="draft,sent" string="Cancel"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
@@ -120,88 +126,78 @@
                         <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
-                <sheet string="Sales Order" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <group col="4" colspan="4">
-                            <field name="name"/>
-                            <field name="date_order"/>
-                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
-                            <field name="client_order_ref"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <field name="invoiced"/>
-                            <field name="shipped"/>
-                        </group>
-                    </group>
-                    <notebook colspan="5">
-                        <page string="Sales Order">
+                <sheet>
+                    <group>
+                        <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <newline/>
-                            <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
-                                <form string="Sales Order Lines">
-                                    <notebook>
-                                        <page string="Order Line">
-                                        <group colspan="4" col="5">
-                                            <field colspan="3"
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                            <field name="name" placeholder="Porduct/Service characteristics"/>
- 
-                                            <field
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                                name="product_uom_qty"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                            <group colspan="1">
-                                                <field name="product_uom" nolabel="1" groups="product.group_uom"
+                        </group><group>
+                            <field name="name"/>
+                            <field name="date_order"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
+                            <field name="client_order_ref"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Order Lines">
+                            <field name="order_line">
+                                <form string="Sales Order Lines" version="7.0">
+                                    <field name="product_id"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                    <field name="name" placeholder="Porduct/Service characteristics"/>
+                                    <group>
+                                        <group>
+                                            <label for="product_uom_qty"/>
+                                            <div>
+                                                <field
+                                                    context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                    name="product_uom_qty" class="oe_form_inline"
+                                                    on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"
                                                     on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
-                                            </group>
-                                            <field name="price_unit"/>
 
-                                            <field groups="product.group_uos" name="product_uos_qty"/>
-                                            <field groups="product.group_uos" name="product_uos" nolabel="1"/>
-                                            <newline/>
+                                            </div>
+                                            <label for="product_uos_qty"/>
+                                            <div>
+                                                <field groups="product.group_uos" name="product_uos_qty" class="oe_form_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" class="oe_form_inline"/>
+                                            </div>
+                                            <field name="price_unit"/>
+                                            <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                        </group><group>
                                             <field name="product_packaging"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                                 domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
-                                            <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                            <separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/>
-                                            <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-                                            <separator colspan="5" string="Taxes"/>
-                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <group colspan="5" col="5">
-                                                <separator colspan="5" string="States"/>
-                                                <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-                                                <field name="invoiced"/>
-                                                <group attrs="{'invisible':[('invoiced','=',True)]}">
-                                                    <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
-                                                </group>
-                                            </group>
+                                            <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                            <field name="invoiced"/>
+                                            <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                            <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                         </group>
-                                        </page>
-                                        <page string="Extra Info" groups="product.group_mrp_properties">
+                                        <group col="4">
                                             <field name="type"/>
                                             <field name="delay"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
-                                            <separator colspan="4" string="Properties"/>
-                                            <field name="property_ids" colspan="4" nolabel="1"/>
-                                        </page>
-                                        <page string="History">
+                                        </group>
+                                        <separator string="Properties" colspan="2"/>
+                                        <field name="property_ids"/>
+                                        <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
+                                        <field name="notes" groups="base.group_sale_notes_subtotal"/>
+                                        <div groups="base.group_no_one">
                                             <separator colspan="4" string="Invoice Lines"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                                             <separator colspan="4" string="Stock Moves"/>
                                             <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                                        </page>
-                                    </notebook>
+                                        </div>
+                                    </group>
                                 </form>
                                 <tree string="Sales Order Lines">
-                                    <field colspan="4" name="name"/>
+                                    <field name="name"/>
                                     <field name="product_uom_qty" string="Quantity"/>
                                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                     <field groups="product.group_uos" name="product_uos_qty" string="Quantity (UoS)"/>
@@ -211,45 +207,40 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group colspan="2" col="4" name="bellow_the_lines_hook">
-                            </group>
-                            <div class="oe_form_subtotal_footer" colspan="2">
-                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                            <group class="oe_form_subtotal_footer" colspan="2" name="sale_total">
+                                <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
-                            </div>
-                            <div class="oe_clear"/>
-
-                            <separator colspan="4" string="Notes"/>
-                            <field colspan="4" name="note" nolabel="1" placeholder="Our quotation is valid for 30 days..."/>
+                            </group>
+                            <separator string="Notes"/>
+                            <field name="note" placeholder="Our quotation is valid for 30 days..."/>
                         </page>
                         <page string="Other Information">
-                            <group colspan="2" col="2" name="logistics">
-                                <separator string="Logistic" colspan="2"/>
-                                <field name="incoterm" widget="selection"/>
-                                <field name="picking_policy" required="True"/>
-                                <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
-                                <field name="invoice_quantity" invisible="True"/>
+                            <group>
+                                <group name="logistics">
+                                    <field name="incoterm" widget="selection"/>
+                                    <field name="picking_policy" required="True"/>
+                                    <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
+                                    <field name="invoice_quantity" invisible="True"/>
+                                </group>
+                                <group>
+                                    <field name="user_id"/>
+                                    <field groups="base.group_no_one" name="origin"/>
+                                    <field name="invoiced"/>
+                                    <field name="shipped"/>
+                                </group>
+                                <group name="sale_pay">
+                                    <field name="payment_term" widget="selection"/>
+                                    <field name="fiscal_position" widget="selection"/>
+                                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                </group>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="References" colspan="2"/>
-                                <field name="user_id"/>
-                                <field groups="base.group_no_one" name="origin"/>
-                            </group>
-                            <group name="sale_pay" colspan="2" col="2">
-                                <separator string="Conditions" colspan="2"/>
-                                <field name="payment_term" widget="selection"/>
-                                <field name="fiscal_position" widget="selection"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
-                            <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
-                            <field colspan="4" name="note" nolabel="1" groups="base.group_sale_notes_subtotal"/>
                         </page>
                         <page string="History">
-                            <separator colspan="4" string="Invoices"/>
-                            <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
-                            <separator colspan="4" string="Delivery Orders"/>
-                            <field colspan="4" name="picking_ids" nolabel="1" context="{'default_type': 'out'}">
+                            <separator string="Invoices"/>
+                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}"/>
+                            <separator string="Delivery Orders"/>
+                            <field name="picking_ids" context="{'default_type': 'out'}">
                                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                                     <field name="name"/>
                                     <field name="partner_id"/>
@@ -266,9 +257,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
@@ -345,6 +336,13 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
+            <field name="help">
+                Click here to create a new quotation.
+                &lt;p&gt;
+                The "Quotation" is the first step of the Sales flow.  Manage your sales from quotation to invoice.
+                &lt;p&gt;
+                You will be able to sell products (manage deliveries) as well as services (create projects).
+            </field>
         </record>
 
         <menuitem id="menu_sale_quotations"
@@ -397,35 +395,36 @@
             <field name="model">sale.order.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Order Lines">
-                    <group colspan="4" col="6">
-                        <field name="order_id"/>
-                        <field name="order_partner_id" readonly="1" invisible="1"/>
-                        <field name="invoiced"/>
-
-                        <field name="product_id" readonly="1"/>
-                        <field name="product_uom_qty" readonly="1"/>
-                        <field name="product_uom" groups="product.group_uom"/>
-                        <newline/>
-
-                        <field colspan="4" name="name" groups="base.group_no_one"/>
-                        <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                    </group>
-                    <separator colspan="4" string="Price"/>
-                    <group colspan="4" col="6">
-                        <field name="price_unit"/>
-                        <field name="discount" groups="sale.group_discount_per_so_line"/>
-                        <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
-                    </group>
-                    <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
-                    <field colspan="4" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-                    <separator colspan="4"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-                    <group col="3" colspan="2">
+                <form string="Sales Order Lines" version="7.0">
+                    <header>
                         <button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
-                        <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}"/>
+                        <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}"/>
                         <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                    </header>
+                    <label for="order_id" class="oe_form_readonly_hidden"/>
+                    <h1><field name="order_id"/></h1>
+                    <label for="order_partner_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="order_partner_id"/></h2>
+                    <group>
+                        <group>
+                            <field name="product_id" readonly="1"/>
+                            <field name="name" groups="base.group_no_one"/>
+                            <label name="product_uom_qty"/>
+                            <div>
+                                <field name="product_uom_qty" readonly="1" class="oe_form_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                            </div>
+                        </group><group>
+                            <field name="price_unit"/>
+                            <field name="discount" groups="sale.group_discount_per_so_line"/>
+                            <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
+                            <field name="invoiced"/>
+                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        </group>
                     </group>
+                    <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
+                    <field name="notes" groups="base.group_sale_notes_subtotal"/>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index be3e9b5fefd..84c19665e65 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -6,10 +6,12 @@
             <field name="model">sale.order.line.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Create invoices">
-                 <separator colspan="4" string="Do you really want to create the invoice(s)?" />
-                 <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                 <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+             <form string="Create invoices" version="7.0">
+                <header>
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                </header>
+                <separator string="Do you really want to create the invoice(s)?" />
             </form>
             </field>
         </record>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index ebd59f355c6..8129d5ee24d 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -6,14 +6,16 @@
             <field name="model">sale.make.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create invoices">
+                <form string="Create invoices" version="7.0">
+                    <header>
+                        <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
                     <separator colspan="4" string="Do you really want to create the invoice(s)?" />
-                    <field name="grouped"/>
-                    <newline/>
-                    <field name="invoice_date"/>
-                    <separator string="" colspan="6"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <group>
+                        <field name="grouped"/>
+                        <field name="invoice_date"/>
+                    </group>
                </form>
             </field>
         </record>
@@ -28,7 +30,7 @@
             <field name="target">new</field>
             <field name="multi">True</field>
         </record>
-        
+
         <record model="ir.values" id="sale_order_make_invoice">
             <field name="model_id" ref="sale.model_sale_order" />
             <field name="name">Make Invoices</field>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 8ab55c67c17..67b20e6e288 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -6,19 +6,18 @@
             <field name="model">sale.advance.payment.inv</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Advance Invoice">
-                    <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
-                    <newline />
-                    <field name="qtty" invisible="1"/>
-                    <field name="product_id" on_change="onchange_advance_payment_method(advance_payment_method,product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" colspan="2"/>
-                    <field name="amount" colspan="2"/>
-                    <newline />
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="6" />
-                    <group colspan="4">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Advance Invoice" version="7.0">
+                    <header>
                         <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward" context="{'open_invoices': False}"/>
                         <button name="create_invoices" string="Create and view Invoice" type="object" icon="terp-camera_test" context="{'open_invoices': True}" />
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <group col="4">
+                        <field name="advance_payment_method" on_change="onchange_advance_payment_method(advance_payment_method,product_id)"/>
+                        <newline />
+                        <field name="qtty" invisible="1"/>
+                        <field name="product_id" on_change="onchange_advance_payment_method(advance_payment_method,product_id)" context="{'search_default_services':1}" attrs="{'invisible': [('advance_payment_method','=','percentage')]}" colspan="2"/>
+                        <field name="amount" colspan="2"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 2d4ff082288..0e2ccb41651 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -18,7 +18,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-           <xpath expr="/form/sheet/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
+           <xpath expr="//field[@name='order_line']/form//field[@name='delay']" position="after">
                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
            </xpath>
         </field>
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
new file mode 100644
index 00000000000..90dee9e022a
--- /dev/null
+++ b/addons/sale_crm/i18n/ja.po
@@ -0,0 +1,135 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-08 09:02+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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-06-09 05:39+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "注文参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr "販売見積書(%s)を移動"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "見積りへ移動"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "データ不足です。"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "顧客の住所が不明確です。"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "営業する。"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_作成"
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr "私の営業チーム"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr "発注書を作成後、これをチェックしオポチュニティを終了します。"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr "私のオポチュニティ"
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "見積りへ移動"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "お店"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "オポチュニティ: %s"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "オポチュニティ成立"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr "状況による私の計画売上高"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr "オポチュニティの'%s' は、見積りへ変わりました。"
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "営業チーム"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "見積り作成"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "受注"
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index d73a2cee1ef..39546037c1f 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -8,19 +8,16 @@
           <field name="model">crm.make.sale</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-            <form string="Convert to Quotation" >
-                <group colspan="4">
+            <form string="Convert to Quotation"  version="7.0">
+                <header>
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward'/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                </header>
+                <group col="4">
                     <field name="partner_id" required="1"/>
                     <field name="shop_id" required="1" widget="selection"/>
                     <field name="close"/>
                 </group>
-                <newline/>
-                <separator colspan="4"/>
-                <group col="4" colspan="4">
-                    <label string="" colspan="2"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward'/>
-                </group>
             </form>
           </field>
        </record>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 3979318e299..90b1959aff7 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -7,14 +7,14 @@
             <field name="model">sale_journal.invoice.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice Type">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="invoicing_method" select="1"/>
-                        <field name="active" select="1"/>
+                <form string="Invoice Type" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="invoicing_method"/>
+                        <field name="active"/>
                     </group>
-                    <separator string="Notes" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
+                    <separator string="Notes"/>
+                    <field name="note"/>
                 </form>
             </field>
         </record>
@@ -97,7 +97,7 @@
             <field name="inherit_id" ref="stock.vpicktree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -109,7 +109,7 @@
             <field name="inherit_id" ref="stock.view_picking_in_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -121,7 +121,7 @@
             <field name="inherit_id" ref="stock.view_picking_in_tree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -133,7 +133,7 @@
             <field name="inherit_id" ref="stock.view_picking_out_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -145,7 +145,7 @@
             <field name="inherit_id" ref="stock.view_picking_out_tree" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" select="1"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 8b7a7b09764..daa3ab28f8b 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -13,98 +13,98 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='order_line']" position="replace">
-                    <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
-                            <form string="Order Line">
-                                <notebook>
-                                    <page string="Order Line">
-                                    <group colspan="4" col="5">
-                                        <field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
-                                        <field name="sequence" groups="base.group_no_one"/>
-                                        <field colspan="3"
-                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
-                                            name="product_id"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"
-                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
-                                            select="1"/>
-                                        <field
-                                            name="name" required="0"
-                                            attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/>
+                    <field name="abstract_line_ids">
+                        <form string="Order Line">
+                            <notebook>
+                                <page string="Order Line">
+                                <group colspan="4" col="5">
+                                    <field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+                                    <field name="sequence" groups="base.group_no_one"/>
+                                    <field colspan="3"
+                                        context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                        name="product_id"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"
+                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
+                                        select="1"/>
+                                    <field
+                                        name="name" required="0"
+                                        attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/>
 
-                                        <field
-                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
-                                            name="product_uom_qty"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"
-                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                        <field name="product_uom"
-                                            nolabel="1"
-                                            groups="product.group_uom"
-                                            required="0"
-                                            attrs="{'invisible':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
-                                            on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
-                                        <field name="price_unit"
-                                            attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
+                                    <field
+                                        context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                        name="product_uom_qty"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"
+                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                                    <field name="product_uom"
+                                        nolabel="1"
+                                        groups="product.group_uom"
+                                        required="0"
+                                        attrs="{'invisible':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
+                                        on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
+                                    <field name="price_unit"
+                                        attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
 
-                                        <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
-                                        <field groups="product.group_uos" name="product_uos" nolabel="1"/>
-                                        <newline/>
+                                    <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
+                                    <field groups="product.group_uos" name="product_uos" nolabel="1"/>
+                                    <newline/>
 
-                                        <field
-                                            name="product_packaging"
-                                            colspan="3"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"
-                                            context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
-                                            on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
-                                            domain="[('product_id','=',product_id)]"
-                                            groups="product.group_stock_packaging"/>
-                                        <field
-                                            name="discount"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                    <field
+                                        name="product_packaging"
+                                        colspan="3"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"
+                                        context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                        on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
+                                        domain="[('product_id','=',product_id)]"
+                                        groups="product.group_stock_packaging"/>
+                                    <field
+                                        name="discount"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}"/>
 
-                                        <group colspan="5"
-                                            attrs="{'invisible':[('layout_type','not in', ['article','text'])]}">
-                                            <separator colspan="4" string="Notes"/>
-                                            <field colspan="4" name="notes" nolabel="1"/>
-                                        </group>
-
-                                        <group colspan="5"
-                                            attrs="{'invisible':[('layout_type','!=','article')]}">
-                                            <separator colspan="4" string="Taxes"/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/>
-                                        </group>
-
-                                        <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}">
-                                            <separator colspan="5" string="States"/>
-                                            <field name="state"/>
-                                            <field name="invoiced"/>
-                                            <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
-                                        </group>
+                                    <group colspan="5"
+                                        attrs="{'invisible':[('layout_type','not in', ['article','text'])]}">
+                                        <separator colspan="4" string="Notes"/>
+                                        <field colspan="4" name="notes" nolabel="1"/>
                                     </group>
-                                    </page>
-                                    <page string="Extra Info" attrs="{'invisible':[('layout_type','!=','article')]}">
-                                        <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/>
-                                        <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/>
-                                        <field name="address_allotment_id" select="2"/>
-                                        <separator colspan="4" string="Properties"/>
-                                        <field colspan="4" name="property_ids" nolabel="1"/>
-                                    </page>
-                                    <page string="History" attrs="{'invisible':[('layout_type','!=','article')]}">
-                                        <separator colspan="4" string="Invoice Lines"/>
-                                        <field colspan="4" name="invoice_lines" nolabel="1"/>
-                                        <separator colspan="4" string="Stock Moves"/>
-                                        <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                            <tree string="Sales order lines">
-                                    <field colspan="4" name="name"/>
-                                    <field name="product_uom_qty" string="Qty"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="discount"/>
-                                    <field name="price_unit"/>
-                                    <!-- field name="price_net"/-->
-                                    <field name="price_subtotal"/>
-                                    <field name="sequence"/>
-                                </tree>
+
+                                    <group colspan="5"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}">
+                                        <separator colspan="4" string="Taxes"/>
+                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/>
+                                    </group>
+
+                                    <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                        <separator colspan="5" string="States"/>
+                                        <field name="state"/>
+                                        <field name="invoiced"/>
+                                        <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
+                                    </group>
+                                </group>
+                                </page>
+                                <page string="Extra Info" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                    <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                    <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                    <field name="address_allotment_id" select="2"/>
+                                    <separator colspan="4" string="Properties"/>
+                                    <field colspan="4" name="property_ids" nolabel="1"/>
+                                </page>
+                                <page string="History" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                    <separator colspan="4" string="Invoice Lines"/>
+                                    <field colspan="4" name="invoice_lines" nolabel="1"/>
+                                    <separator colspan="4" string="Stock Moves"/>
+                                    <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                </page>
+                            </notebook>
+                        </form>
+                        <tree string="Sales order lines">
+                            <field colspan="4" name="name"/>
+                            <field name="product_uom_qty" string="Qty"/>
+                            <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                            <field name="discount"/>
+                            <field name="price_unit"/>
+                            <!-- field name="price_net"/-->
+                            <field name="price_subtotal"/>
+                            <field name="sequence"/>
+                        </tree>
                     </field>
                 </xpath>
             </field>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 76c7a4d416b..519863b85f7 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,10 +8,10 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@class='oe_form_subtotal_footer']" position="after">
-                <div>
+            <xpath expr="//group[@class='oe_form_subtotal_footer']" position="inside">
+                <group>
                     <field name="margin"/>
-                </div>
+                </group>
             </xpath>
         </field>
     </record>
diff --git a/addons/share/i18n/sv.po b/addons/share/i18n/sv.po
new file mode 100644
index 00000000000..c704c8373eb
--- /dev/null
+++ b/addons/share/i18n/sv.po
@@ -0,0 +1,521 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 10:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: share
+#: field:share.wizard,embed_option_title:0
+msgid "Display title"
+msgstr "Visningstitel"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access granted!"
+msgstr "Behörighet given!"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Sharing method"
+msgstr "Delningsmetod"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share with these People (one e-mail per line)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,name:0
+msgid "Share Title"
+msgstr "Delningstitel"
+
+#. module: share
+#: model:ir.module.category,name:share.module_category_share
+msgid "Sharing"
+msgstr "Delning"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Share Access URL"
+msgstr "Delnings URL"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:782
+#, python-format
+msgid "You may use your current login (%s) and password to view them.\n"
+msgstr ""
+"Du kan använda nuvarande inloggning (%s) och lösenord för att se dem.\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:601
+#, python-format
+msgid "(Modified)"
+msgstr "(Ändrad)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:769
+#, python-format
+msgid ""
+"The documents are not attached, you can view them online directly on my "
+"OpenERP server at:"
+msgstr ""
+"Dokumenten är inte bilagda, du kan se dem online direkt på vår OpenERP-"
+"server på:"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:579
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_url:0 field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:776
+#, python-format
+msgid "These are your credentials to access this protected area:\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:643
+#, python-format
+msgid "You must be a member of the Share/User group to use the share wizard"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share"
+msgstr "Utdelning"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:551
+#, python-format
+msgid "(Duplicated for modified sharing permissions)"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: share
+#: model:ir.model,name:share.model_ir_model_access
+msgid "ir.model.access"
+msgstr "ir.model.access"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Nästa"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:777
+#, python-format
+msgid "Username"
+msgstr "Användarnamn"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing Options"
+msgstr "Utdelningsalternativ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:765
+#, python-format
+msgid "Hello,"
+msgstr "Hej,"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Stäng"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:640
+#, python-format
+msgid "Action and Access Mode are required to create a shared access"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:781
+#, python-format
+msgid ""
+"The documents have been automatically added to your current OpenERP "
+"documents.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Delningsgrupp"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid "Email required"
+msgstr "E-post krävs"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,name:0
+msgid "Title for the share (displayed to users as menu and shortcut name)"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Options"
+msgstr "Alternativ"
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:787
+#, python-format
+msgid ""
+"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
+"Sales, HR, etc.)\n"
+"It is open source and can be found on http://www.openerp.com."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Optional: include a personal message"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:647
+#, python-format
+msgid "Please indicate the emails of the persons to share with, one per line"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0
+msgid "unknown"
+msgstr "okänd"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:526
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:616
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:767
+#, python-format
+msgid "I've shared %s with you!"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,share_root_url:0
+msgid "Main access page for users that are granted shared access"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "Gruppens namn måsta vara unikt !"
+
+#. module: share
+#: model:res.groups,name:share.group_share_user
+msgid "User"
+msgstr "Användare"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grupper"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:636
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Use this Link"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:779
+#, python-format
+msgid "Database"
+msgstr "Databas"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Domän"
+
+#. module: share
+#: view:share.wizard:0 field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Sammandrag"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:493
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+msgid "Share your documents"
+msgstr "Dela dina dokument"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Or insert the following code where you want to embed your documents"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"An e-mail notification with instructions has been sent to the following "
+"people:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "share.wizard.result.line"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,view_type:0
+msgid "Current View Type"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can view"
+msgstr "Kan se"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can edit"
+msgstr "Kan ändra"
+
+#. module: share
+#: help:share.wizard,message:0
+msgid ""
+"An optional personal message, to be included in the e-mail notification."
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:60
+#: code:addons/share/wizard/share_wizard.py:635
+#, python-format
+msgid "Sharing access could not be created"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:740
+#, python-format
+msgid "Shared access created!"
+msgstr ""
+
+#. module: share
+#: model:res.groups,comment:share.group_share_user
+msgid ""
+"\n"
+"Members of this groups have access to the sharing wizard, which allows them "
+"to invite external users to view or edit some of their documents."
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:778
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Lösenord"
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "Emails"
+msgstr "E-post"
+
+#. module: share
+#: field:share.wizard,embed_option_search:0
+msgid "Display search view"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:197
+#, python-format
+msgid "No e-mail address configured"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,message:0
+msgid "Personal Message"
+msgstr "Personligt meddelande"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,login:0
+msgid "Login"
+msgstr "Inloggning"
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing: preparation"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:198
+#, python-format
+msgid ""
+"You must configure your e-mail address in the user preferences before using "
+"the Share button."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,access_mode:0
+msgid "Access rights to be granted on the shared documents."
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:8
+msgid "Link or embed..."
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
+msgid "Share with..."
+msgstr ""
+
+#~ msgid "Share with these people (one e-mail per line)"
+#~ msgstr "Dela med dessa personer (en e-post per rad)"
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index a33bf1bee31..136584284dd 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-07-08 03:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-06-07 03:37+0000\n"
+"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:11+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-08 04:40+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -114,7 +114,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,domain:0
 msgid "Optional domain for further data filtering"
-msgstr "更多数据的过滤器的可选择域"
+msgstr "可选的过滤条件，用于再次过滤数据"
 
 #. module: share
 #: sql_constraint:res.users:0
@@ -195,7 +195,7 @@ msgstr "需要一个电子邮件地址"
 msgid ""
 "Optionally, you may specify an additional domain restriction that will be "
 "applied to the shared data."
-msgstr "可选项，你可以为共享数据外加一个限制。"
+msgstr "可选项，你可以针对于要分享的数据指定一个过滤条件。"
 
 #. module: share
 #: help:share.wizard,name:0
@@ -329,7 +329,7 @@ msgstr "数据库"
 #. module: share
 #: field:share.wizard,domain:0
 msgid "Domain"
-msgstr "定义域"
+msgstr "过滤条件"
 
 #. module: share
 #: view:share.wizard:0 field:share.wizard,result_line_ids:0
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 6008d45e58a..1c9bb011432 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -7,17 +7,18 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sharing: preparation">
-                    <separator colspan="4"
-                        string="Please select the action that opens the screen containing the data you want to share."/>
-                    <field name="action_id" colspan="4"/>
-                    <separator colspan="4"
-                        string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
-                    <field name="domain"/>
-                    <separator colspan="4"/>
-                    <group colspan="4">
+                <form string="Sharing: preparation" version="7.0">
+                    <header>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward"/>
                         <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                        <button name="go_step_1" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
+                    </header>
+                    <separator
+                        string="Please select the action that opens the screen containing the data you want to share."/>
+                    <group>
+                        <field name="action_id"/>
+                        <label colspan="2"
+                            string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
+                        <field name="domain"/>
                     </group>
                 </form>
             </field>
@@ -28,32 +29,29 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
+                    <header>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward"/>
+                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                    </header>
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
-                    <group colspan="4" name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}">
-                        <separator colspan="4" string="Share with these People (one e-mail per line)"/>
-                        <field colspan="4" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
-                    </group>
-                    <group colspan="4" col="2" name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}">
-                        <separator colspan="4" string="Share with these People (one e-mail per line)"/>
-                        <field name="email_1"/>
-                        <field name="email_2"/>
-                        <field name="email_3"/>
-                    </group>
-                    <group colspan="4" col="4" attrs="{'invisible':[('user_type', '=', 'embedded')]}">
-                        <separator colspan="4" string="Include an Optional Personal Message"/>
-                        <field name="message" colspan="4" nolabel="1"/>
-                    </group>
-                    <group colspan="4" col="4" attrs="{'invisible':[('invite', '=', True)]}">
-                        <separator colspan="4" string="Sharing Options"/>
-                        <field name="name" colspan="4"/>
-                        <field name="access_mode" colspan="4"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4">
-                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                        <button name="go_step_2" string="Share" colspan="1" type="object" icon="gtk-go-forward"/>
+                    <group>
+                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
+                            <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
+                        </group>
+                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail per line)">
+                            <field name="email_1"/>
+                            <field name="email_2"/>
+                            <field name="email_3"/>
+                        </group>
+                        <group attrs="{'invisible':[('user_type', '=', 'embedded')]}" string="Include an Optional Personal Message">
+                            <field name="message" colspan="2" nolabel="1"/>
+                        </group>
+                        <group attrs="{'invisible':[('invite', '=', True)]}" string="Sharing Options">
+                            <field name="name"/>
+                            <field name="access_mode"/>
+                        </group>
                     </group>
                 </form>
             </field>
@@ -64,35 +62,36 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Access granted!">
-                  <field name="user_type" invisible="1"/>
-                  <field name="access_mode" invisible="1"/>
-		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','=','embedded')]}">
-                    <separator string="An e-mail notification with instructions has been sent to the following people:"/>
-                     <field name="result_line_ids" nolabel="1" mode="tree">
-                        <tree string="Summary">
-                            <field name="login"/>
-                        </tree>
-                        <form string="Access info">
-                            <field name="login"/>
-                        </form>
-		            </field>
-                  </group>
-		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
-		            <separator string="Use this Link"/>
-		            <field name="embed_url" nolabel="1"/>
-		            <separator string="Or insert the following code where you want to embed your documents"/>
-		            <group col="4" string="Options">
-			            <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/>
-			            <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" attrs="{'invisible':[('access_mode','=','readonly')]}"/>
-		            </group>
-		            <field name="embed_code" nolabel="1"/>
-                  </group>
-
-                    <separator colspan="4"/>
-                    <group colspan="4">
+                <form string="Access granted!" version="7.0">
+                    <header>
                         <button special="cancel" string="Close" icon='gtk-ok'/>
+                        <field name="user_type" invisible="1"/>
+                        <field name="access_mode" invisible="1"/>
+                    </header>
+                    <group attrs="{'invisible':[('user_type','=','embedded')]}">
+                        <separator string="An e-mail notification with instructions has been sent to the following people:"/>
+                        <field name="result_line_ids" nolabel="1" mode="tree">
+                            <tree string="Summary">
+                                <field name="login"/>
+                            </tree>
+                            <form string="Access info" version="7.0">
+                                <group>
+                                    <field name="login"/>
+                                </group>
+                            </form>
+                        </field>
                     </group>
+                    <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
+                        <separator string="Use this Link"/>
+                        <field name="embed_url"/>
+                        <separator string="Or insert the following code where you want to embed your documents"/>
+                        <group string="Options">
+                            <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/>
+                            <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" attrs="{'invisible':[('access_mode','=','readonly')]}"/>
+                            <field name="embed_code"/>
+                        </group>
+                    </group>
+
                 </form>
             </field>
         </record>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 38412228723..9fab20c9643 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -44,7 +44,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Warehouse board" layout="manual">
+                <form string="Warehouse board" version="7.0">
                     <board style="2-1">
                         <column>
                             <action name="%(action_incoming_product_board)d" string="Incoming Shipments" creatable="true"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index aca84d33473..49e0e9c1880 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -8,11 +8,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-                   <field name="pricelist_id" position="before">
-                       <field name="location_id" widget="selection" context="{'location': self}"/>
-                       <field name="warehouse_id" widget="selection" context="{'warehouse': self}"/>
-                       <separator orientation="vertical"/>
-                   </field>
+                <field name="pricelist_id" position="before">
+                    <field name="location_id" widget="selection" context="{'location': self}"/>
+                    <field name="warehouse_id" widget="selection" context="{'warehouse': self}"/>
+                </field>
             </field>
         </record>
 
@@ -22,9 +21,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group col="2" colspan="2">
-                        <separator string="Accounting Stock Properties" colspan="2"/>
+                <form position="inside" version="7.0">
+                    <group string="Accounting Stock Properties">
                         <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
@@ -42,13 +40,15 @@
             <field name="arch" type="xml">
                 <page position="after" string="Information">
                     <page string="Properties">
-                        <separator string="Counter-Part Locations Properties" groups="stock.group_locations" colspan="4"/>
-                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
-                        <separator string="Accounting Entries" colspan="4"/>
-                        <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <group string="Counter-Part Locations Properties" groups="stock.group_locations">
+                            <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
+                            <field name="property_stock_production" domain="[('usage','=','production')]"/>
+                            <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
+                        </group>
+                        <group string="Accounting Entries">
+                            <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        </group>
                     </page>
                 </page>
             </field>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 7d3fc6074f3..51236e47962 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -53,9 +53,11 @@
             <field name="model">report.stock.lines.date</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Dates of Inventories">
-                    <field name="product_id"/>
-                    <field name="date"/>
+                <form string="Dates of Inventories" version="7.0">
+                    <group>
+                        <field name="product_id"/>
+                        <field name="date"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 7d17d9eec50..de3e91ee183 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -7,34 +7,36 @@
             <field name="model">stock.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="Configure Warehouse" layout="manual">
+                <form string="Configure Warehouse" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Traceability" colspan="4"/>
-                        <field name="group_stock_production_lot"/>
-                        <field name="module_product_expiry"
-                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                        <newline/>
-                        <field name="group_stock_tracking_lot"/>
+                    <sheet>
+                        <group col="4">
+                            <separator string="Traceability" colspan="4"/>
+                            <field name="group_stock_production_lot"/>
+                            <field name="module_product_expiry"
+                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                            <newline/>
+                            <field name="group_stock_tracking_lot"/>
 
-                        <separator string="Logistics" colspan="4"/>
-                        <field name="group_stock_multiple_locations"/>
-                        <field name="module_stock_location"/>
-                        <field name="module_stock_invoice_directly"/>
-                        <field name="decimal_precision"/>
+                            <separator string="Logistics" colspan="4"/>
+                            <field name="group_stock_multiple_locations"/>
+                            <field name="module_stock_location"/>
+                            <field name="module_stock_invoice_directly"/>
+                            <field name="decimal_precision"/>
 
-                        <separator string="Products" colspan="4"/>
-                        <field name="group_stock_packaging"/>
-                        <field name="group_stock_inventory_valuation"/>
-                        <field name="group_uom"/>
-                        <field name="group_uos"/>
-                        <field name="group_product_variant"/>
+                            <separator string="Products" colspan="4"/>
+                            <field name="group_stock_packaging"/>
+                            <field name="group_stock_inventory_valuation"/>
+                            <field name="group_uom"/>
+                            <field name="group_uos"/>
+                            <field name="group_product_variant"/>
 
-                        <separator string="Partners" colspan="4"/>
-                        <field name="module_claim_from_delivery"/>
+                            <separator string="Partners" colspan="4"/>
+                            <field name="module_claim_from_delivery"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d9c8ccd8f39..0154af26d95 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -56,15 +56,17 @@
             <field name="model">stock.inventory.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Inventory Lines">
-                    <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" select="1" domain="[('type','&lt;&gt;','service')]"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom" groups="product.group_uom"/>
-                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
-                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+                <form string="Stock Inventory Lines" version="7.0">
+                    <group col="4">
+                        <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','&lt;&gt;','service')]"/>
+                        <field name="product_qty"/>
+                        <field name="product_uom" groups="product.group_uom"/>
+                        <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                        <field domain="[('usage','=','internal')]" name="location_id"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines" groups="stock.group_inventory_valuation"
+                            string="Split Inventory Line" groups="stock.group_inventory_valuation"
                             type="action" icon="terp-stock_effects-object-colorize"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -108,22 +110,27 @@
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Physical Inventory" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
                     <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
-                <sheet string="Physical Inventory" layout="auto">
-                <group class="oe_form_header">
-                    <field name="name" placeholder="Annual invetory 2013"/>
-                    <field name="date"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <notebook colspan="4">
+                <sheet>
+                <group>
+                    <label for="name" clas="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name" placeholder="Annual invetory 2013"/>
+                    </h1>
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <notebook>
                     <page string="General Informations">
-                        <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
+                        <field name="inventory_line_id">
                             <tree string="Products" editable="bottom">
                                 <field domain="[('usage','=','internal')]" name="location_id"/>
                                 <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
@@ -135,14 +142,13 @@
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft,confirm"/>
                                 <field name="state" invisible="True"/>
                             </tree>
-                            <form string="Products ">
-                                <field domain="[('usage','=','internal')]" name="location_id"/>
-                                <newline/>
-                                <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
-                                <field name="product_qty"/>
-                                <field name="product_uom" groups="product.group_uom"/>
-                                <group colspan="2" col="4">
-                                <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                            <form string="Products" version="7.0">
+                                <group col="4">
+                                    <field domain="[('usage','=','internal')]" name="location_id"/>
+                                    <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
+                                    <field name="product_qty"/>
+                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
                                         string="Split inventory lines" groups="stock.group_inventory_valuation"
                                         type="action" icon="terp-stock_effects-object-colorize"/>
@@ -150,30 +156,30 @@
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
-                             <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list" context="{'inventory_id':active_id}" >
-                                <tree string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                     <button name="%(track_line)d" string="Split in serial numbers" type="action"
-                                        icon="terp-stock_effects-object-colorize"
-                                        attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                                        states="draft,done,cancel"
-                                        context="{'inventory_id':parent.id}"
-                                        groups="stock.group_production_lot"/>
-                                     <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="stock.group_tracking_lot"
-                                        icon="terp-stock_effects-object-colorize"
-                                        context="{'inventory_id':parent.id}"
-                                        states="draft,done,cancel"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="date" string="Date"/>
-                                    <field name="state"  invisible="True"/>
-                                </tree>
-                             </field>
+                         <field name="move_ids" context="{'inventory_id':active_id}" >
+                            <tree string="Stock Moves">
+                                <field name="product_id"/>
+                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                                <field name="prodlot_id" groups="stock.group_production_lot"/>
+                                 <button name="%(track_line)d" string="Split in serial numbers" type="action"
+                                    icon="terp-stock_effects-object-colorize"
+                                    attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
+                                    states="draft,done,cancel"
+                                    context="{'inventory_id':parent.id}"
+                                    groups="stock.group_production_lot"/>
+                                 <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                 <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                    groups="stock.group_tracking_lot"
+                                    icon="terp-stock_effects-object-colorize"
+                                    context="{'inventory_id':parent.id}"
+                                    states="draft,done,cancel"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="location_dest_id" groups="stock.group_locations"/>
+                                <field name="date" string="Date"/>
+                                <field name="state"  invisible="True"/>
+                            </tree>
+                         </field>
                     </page>
                     </notebook>
                     </group>
@@ -207,26 +213,22 @@
             <field name="model">stock.tracking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packs">
-                    <group col="2" colspan="2" groups="product.group_stock_packaging">
-                        <separator string="Pack Identification" colspan="2"/>
-                        <field name="name"/>
-                        <field name="serial"/>
-                        <field name="date"/>
-                        <field name="active"/>
+                <form string="Packs" version="7.0">
+                    <group>
+                        <group groups="product.group_stock_packaging" string="Pack Identification">
+                            <field name="name"/>
+                            <field name="serial"/>
+                            <field name="date"/>
+                            <field name="active"/>
+                        </group>
+                        <group groups="stock.group_tracking_lot" string="Traceability">
+                            <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
+                                 colspan="2"/>
+                            <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+                                context="{'type': 'move_history_ids'}" colspan="2"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2" groups="stock.group_tracking_lot">
-                        <separator string="Traceability" colspan="4"/>
-                        <button name="action_traceability" icon="gtk-go-up" string="Upstream traceability" type="object"
-                             colspan="2"/>
-                        <button name="action_traceability" icon="gtk-go-down" string="Downstream traceability" type="object"
-                            context="{'type': 'move_history_ids'}" colspan="2"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <field name="move_ids"/>
                 </form>
             </field>
         </record>
@@ -291,15 +293,15 @@
             <field name="model">stock.production.lot.revision</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Serial Number Revisions">
-                    <field colspan="4" name="name"/>
-                    <field colspan="2" name="indice"/>
-                    <field colspan="2" name="date"/>
-                    <newline/>
-                    <field name="author_id" readonly="1"/>
-                    <newline/>
-                    <separator string="Description" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
+                <form string="Serial Number Revisions" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="indice"/>
+                        <field name="date"/>
+                        <field name="author_id"/>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </form>
             </field>
         </record>
@@ -321,27 +323,27 @@
             <field name="model">stock.production.lot</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Serial Number">
-                    <group col="4" colspan="2">
-                        <separator string="Serial Number Identification" colspan="4"/>
-                        <field name="product_id" colspan="4"/>
-                        <field name="prefix" colspan="2"/>
-                        <field name="name" colspan="2"/>
-                        <field name="ref" colspan="4"/>
-                        <field name="date" colspan="4"/>
+                <form string="Serial Number" version="7.0">
+                    <group>
+                        <group string="Serial Number Identification">
+                            <field name="product_id"/>
+                            <field name="prefix"/>
+                            <field name="name"/>
+                            <field name="ref"/>
+                            <field name="date"/>
+                        </group>
+                        <group string="Traceability">
+                            <field name="stock_available"/>
+                            <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
+                            <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
+                        </group>
                     </group>
-                    <group col="2" colspan="2">
-                        <separator string="Traceability" colspan="2"/>
-                        <field name="stock_available" colspan="2"/>
-                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
-                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
-                    </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Revisions">
-                            <field colspan="2" name="revisions" nolabel="1"/>
+                            <field name="revisions"/>
                         </page>
                         <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
+                            <field name="move_ids">
                                 <tree  string="Stock Moves">
                                     <field name="picking_id" string="Reference"/>
                                     <field name="origin"/>
@@ -502,42 +504,40 @@
             <field name="model">stock.location</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Location">
-                    <group col="2" colspan="2">
-                        <separator string="Location" colspan="2"/>
-                        <field name="name"/>
-                        <field name="usage"/>
-                        <field name="location_id" groups="stock.group_locations"/>
+                <form string="Stock Location" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="location_id" class="oe_form_readonly_hidden"/>
+                    <h2><field name="location_id"/></h2>
+                    <group>
+                        <group string="Additional Information">
+                            <field name="usage"/>
+                            <field name="partner_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="icon"/>
+                            <field name="scrap_location"/>
+                            <field name="active"/>
+                        </group>
+                        <group string="Chained Locations">
+                            <field name="chained_location_type"/>
+                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+                            <field name="chained_auto_packing"/>
+                            <field name="chained_delay"/>
+                            <field name="chained_journal_id"/>
+                            <field name="chained_picking_type"/>
+                            <field name="chained_company_id" widget="selection"/>
+                        </group>
+                        <group string="Localization">
+                            <field name="posx"/>
+                            <field name="posy"/>
+                            <field name="posz"/>
+                        </group><group string="Accounting Information">
+                            <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                            <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                        </group>
                     </group>
-                    <group col="4" colspan="2">
-                        <separator string="Additional Information" colspan="4"/>
-                        <field name="partner_id" colspan="4"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/>
-                        <field name="icon" colspan="4"/>
-                        <field name="scrap_location"/>
-                        <field name="active"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Chained Locations" colspan="2"/>
-                        <field name="chained_location_type"/>
-                        <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
-                        <field name="chained_auto_packing"/>
-                        <field name="chained_delay"/>
-                        <field name="chained_journal_id"/>
-                        <field name="chained_picking_type"/>
-                        <field name="chained_company_id" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Localization" colspan="2"/>
-                        <field name="posx"/>
-                        <field name="posy"/>
-                        <field name="posz"/>
-                        <separator string="Accounting Information" colspan="2"/>
-                        <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                        <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                    </group>
-                    <separator string="Additional Information" colspan="4"/>
-                    <field colspan="4" name="comment" nolabel="1"/>
+                    <separator string="Additional Information"/>
+                    <field name="comment"/>
                 </form>
             </field>
         </record>
@@ -620,14 +620,20 @@
             <field name="model">stock.warehouse</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Warehouse">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="lot_input_id"/>
-                    <field name="lot_stock_id"/>
-                    <field name="lot_output_id"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="partner_id"/>
+                <form string="Warehouse" version="7.0">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <group>
+                        <group>
+                            <field name="lot_input_id"/>
+                            <field name="lot_stock_id"/>
+                            <field name="lot_output_id"/>
+                        </group>
+                        <group>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="partner_id"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
@@ -704,7 +710,7 @@
             <field name="type">form</field>
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Internal Picking List" version="7.0">
                 <header>
                     <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
                     <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
@@ -714,26 +720,33 @@
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
                     <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
-                <sheet string="Internal Picking List" layout="auto">
-                    <group colspan="4" col="6">
-                        <group colspan="4" col="4">
-                            <field name="name" readonly="1"/>
-                            <field name="origin" placeholder="PO0032"/>
-                            <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
-                            <field name="invoice_state" string="Invoice Control"/>
+                <sheet>
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name" class="oe_form_inline"/>
+                        <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+                        <field name="origin" placeholder="PO0032" class="oe_form_inline"/>
+                    </h1>
+                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+                    <h2>
+                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
+                    </h2>
+                    <group>
+                        <group>
                             <field name="backorder_id" readonly="1"/>
+                            <field name="invoice_state" string="Invoice Control"/>
+                            <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
-                        <group colspan="2" col="2">
+                        <group>
                             <field name="date"/>
                             <field name="min_date" readonly="1"/>
-                            <field name="stock_journal_id" widget="selection"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id}">
+                            <field name="move_lines" context="{'address_in_id': partner_id}">
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -761,75 +774,86 @@
                                         groups="product.group_stock_packaging"
                                         icon="terp-stock_effects-object-colorize"
                                         states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id"/>
+                                    <field name="location_dest_id" groups="stock.group_locations"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
-                                <form string="Stock Moves">
-                                    <group colspan="2" col="4">
-                                        <separator colspan="4" string="Move Information"/>
-                                        <field name="name" invisible="1" colspan="4"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
-                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
-                                        <button name="%(stock.move_scrap)d"
-                                                string="Scrap" type="action"
-                                                icon="gtk-convert" context="{'scrap': True}"
-                                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
-                                        <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                                        <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
+                                <form string="Stock Moves" version="7.0">
+                                    <header>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                        <field name="state" widget="statusbar"/>
+                                    </header>
+                                    <group>
+                                    <group string="Move Information">
+                                        <field name="name" invisible="1"/>
+                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                        <label for="product_qty"/>
+                                        <div>
+                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                                            <button name="%(stock.move_scrap)d"
+                                                    string="Scrap" type="action"
+                                                    icon="gtk-convert" context="{'scrap': True}"
+                                                    states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                        </div>
+                                        <label for="product_uos_qty" groups="product.group_uos"/>
+                                        <div>
+                                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                        </div>
+                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
                                     </group>
 
-                                    <group colspan="2" col="2">
-                                        <separator string="Locations" colspan="2" />
+                                    <group string="Locations" groups="stock.group_locations">
                                         <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
                                         <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                                     </group>
 
-                                    <group colspan="2" col="2">
-                                        <separator string="Dates" colspan="2" />
+                                    <group string="Dates">
                                         <field name="create_date" invisible="1"/>
                                         <field name="date"/>
                                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                                     </group>
 
-                                    <group colspan="2" col="4" groups="stock.group_tracking_lot">
-                                        <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                                        <field name="tracking_id" groups="stock.group_tracking_lot"  colspan="3"/>
-                                        <button name="%(split_into)d" string="New Pack" type="action"
-                                              groups="product.group_stock_packaging"
-                                              icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed"  colspan="1"/>
-                                        <field name="prodlot_id" groups="stock.group_production_lot"
-                                            context="{'location_id':location_id, 'product_id':product_id}"
-                                            domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"  colspan="3"/>
-                                        <button name="%(track_line)d"
-                                            groups="stock.group_tracking_lot"
-                                            states="draft,waiting,confirmed,assigned"
-                                            string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+                                    <group groups="stock.group_tracking_lot" string="Traceability">
+                                        <label for="tracking_id"/>
+                                        <div>
+                                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                            <button name="%(split_into)d" string="New Pack" type="action"
+                                                  groups="product.group_stock_packaging"
+                                                  icon="terp-stock_effects-object-colorize"
+                                                  states="draft,assigned,confirmed"/>
+                                        </div>
+
+                                        <label for="prodlot_id"/>
+                                        <div>
+                                            <field name="prodlot_id" groups="stock.group_production_lot"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+                                            <button name="%(track_line)d"
+                                                groups="stock.group_tracking_lot"
+                                                states="draft,waiting,confirmed,assigned"
+                                                string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                        </div>
                                     </group>
-                                    <label string="" colspan="4"/>
-                                    <field name="state"/>
-                                    <group col="4" colspan="2">
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
                                     </group>
                                 </form>
                             </field>
                         </page>
                         <page string="Additional info">
-                            <field name="auto_picking"/>
-                            <field name="date_done"/>
-                            <field name="move_type"/>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group col="4">
+                                <field name="auto_picking"/>
+                                <field name="date_done"/>
+                                <field name="move_type"/>
+                                <field name="type"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
                         </page>
                         <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1" placeholder="Quality test ok..."/>
+                            <field name="note" placeholder="Quality test ok..."/>
                         </page>
                     </notebook>
                 </sheet>
@@ -910,7 +934,7 @@
                     <field name="origin"/>
                     <field name="min_date"/>
                     <field name="backorder_id"/>
-                    <field name="stock_journal_id"/>
+                    <field name="stock_journal_id" groups="account.group_account_user"/>
                     <field name="invoice_state"/>
                     <field name="state"/>
                 </tree>
@@ -934,16 +958,16 @@
                     <xpath expr="/form/header/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
                     </xpath>
-                    <xpath expr="/form/header/div[@class='oe_right']/field[@name='state']" position="replace">
+                    <xpath expr="/form/header/field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
-                    <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
+                    <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <div class="oe_form_bottom">
+                        <footer>
                             <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                        </div>
+                        </footer>
                     </xpath>
                 </data>
             </field>
@@ -1043,16 +1067,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="//button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
-                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
+                    <xpath expr="//button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object"/>
                     </xpath>
-                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
+                    <xpath expr="//button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Receive" type="object"/>
                     </xpath>
-                    <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
+                    <xpath expr="//field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
@@ -1181,64 +1205,66 @@
             <field name="type">form</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Stock Moves" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Stock Moves" layout="auto">
-                    <group colspan="4" col="7">
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/>
-                        <button name="%(stock.move_scrap)d"
-                                string="Scrap" type="action"
-                                icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <newline/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" context="{'contact_display':'partner'}"/>
-
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator colspan="2" string="Move Information"/>
-                        <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                        <field name="product_uos" groups="product.group_uos" colspan="4"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
-                        <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" />
-                        <field name="create_date" groups="base.group_no_one" />
-                        <field name="date" groups="base.group_no_one" />
-                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                    </group>
-
-                    <group colspan="2" col="4">
-                        <separator string="Traceability" colspan="4"/>
-                        <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
-                        <button name="%(split_into)d" string="New Pack" type="action"
-                              groups="product.group_stock_packaging"
-                              icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed" colspan="1"/>
-                        <field name="prodlot_id" groups="stock.group_production_lot"
-                            context="{'location_id':location_id, 'product_id':product_id}"
-                            domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                        <button name="%(track_line)d"
-                              groups="stock.group_tracking_lot"
-                              states="draft,waiting,confirmed,assigned"
-                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
+                                <button name="%(stock.move_scrap)d"
+                                        string="Scrap" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                            </div>
+                            <field name="location_id" groups="stock.group_locations"/>
+                            <field name="location_dest_id" groups="stock.group_locations"/>
+                            <field name="partner_id" context="{'contact_display':'partner'}"/>
+                        </group>
+                        <group string="Move Information">
+                            <field name="name" string="Reason"/>
+                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
+                            <field name="product_uos" groups="product.group_uos" colspan="4"/>
+                        </group>
+                        <group string="Picking" name="picking">
+                            <field name="picking_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group string="Dates">
+                            <field name="create_date" groups="base.group_no_one" />
+                            <field name="date" groups="base.group_no_one" />
+                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                        </group>
+                        <group string="Traceability">
+                            <label for="tracking_id"/>
+                            <div>
+                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                <button name="%(split_into)d" string="New Pack" type="action"
+                                      groups="product.group_stock_packaging"
+                                      icon="terp-stock_effects-object-colorize"
+                                      states="draft,assigned,confirmed"/>
+                            </div>
+                            <label for="prodlot_id"/>
+                            <div>
+                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                    domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
+                                <button name="%(track_line)d"
+                                    groups="stock.group_tracking_lot"
+                                    states="draft,waiting,confirmed,assigned"
+                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                            </div>
+                        </group>
                     </group>
                 </sheet>
                 </form>
@@ -1364,7 +1390,7 @@
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Receive Products" version="7.0">
                 <header>
                     <button name="action_confirm" states="draft" string="Process Later" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
@@ -1372,57 +1398,63 @@
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
-                <sheet string="Receive Products" layout="auto">
-                    <group colspan="4" col="7">
+                <sheet>
+                <group>
+                    <group>
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                        <field name="product_uom" string="Unit Of Measure" groups="product.group_uom"/>
-                        <button name="%(stock.move_scrap)d"
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                            <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <newline/>
+                                states="draft,waiting,confirmed,assigned"/>
+                        </div>
+                        <label for="product_uos_qty"/>
+                        <div>
+                            <field name="product_uos_qty" groups="product.group_uos" class="oe_form_inline"
+                                on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+                            <field name="product_uos" groups="product.group_uos"/>
+                        </div>
+                        <field name="name" string="Reason"/>
+                    </group><group>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
                         <field name="partner_id"/>
-
                     </group>
-                    <group colspan="2" col="2">
-                        <separator colspan="2" string="Move Information"/>
-                        <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Picking" colspan="2" />
+                    <group name="picking">
                         <field name="picking_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" />
+                    <group>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
-                    <group colspan="2" col="4">
-                        <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                        <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
-                        <button name="%(split_into)d" string="New Pack" type="action"
+                    <group>
+                        <label name="tracking_id"/>
+                        <div>
+                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                            <button name="%(split_into)d" string="New Pack" type="action"
                               groups="product.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
                               states="draft,assigned,confirmed,done" colspan="1"/>
-                        <field name="prodlot_id" groups="stock.group_production_lot"
-                            context="{'location_id':location_id, 'product_id':product_id}"
-                            domain="[('product_id','=?',product_id)]"
-                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                        <button name="%(track_line)d"
-                              groups="stock.group_tracking_lot"
-                              states="draft,waiting,confirmed,assigned,done"
-                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
+                        </div>
+                        <label name="prodlot_id"/>
+                        <div>
+                            <field name="prodlot_id" groups="stock.group_production_lot"
+                                context="{'location_id':location_id, 'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]" class="oe_form_inline"
+                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
+                            <button name="%(track_line)d"
+                                  groups="stock.group_tracking_lot" class="oe_form_inline"
+                                  states="draft,waiting,confirmed,assigned,done"
+                                  string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                        </div>
                     </group>
+                </group>
                 </sheet>
                 </form>
             </field>
@@ -1535,10 +1567,12 @@
             <field name="model">stock.incoterms</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Incoterms">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="active" select="1"/>
+                <form string="Incoterms" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -1681,9 +1715,11 @@
             <field name="model">stock.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Journal">
-                    <field name="name"/>
-                    <field name="user_id"/>
+                <form string="Stock Journal" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="user_id"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 6bedd7605e6..057f0674a64 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -6,19 +6,16 @@
             <field name="model">stock.change.product.qty</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Change Product Quantity">
-                    <separator string="Select Quantity" colspan="4"/>
-                    <newline/>
-                    <field name="new_quantity" />
-                    <newline/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="location_id" />
-                    <field name="prodlot_id" />
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                <form string="Change Product Quantity" version="7.0">
+                    <header>
                         <button name="change_product_qty" string="_Apply" type="object" icon="gtk-apply"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <group string="Select Quantity">
+                        <field name="new_quantity" />
+                        <field name="product_id" invisible="1"/>
+                        <field name="location_id" />
+                        <field name="prodlot_id" />
                     </group>
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index b46829b1a0a..a18f5b63f86 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-   		<record id="view_change_standard_price" model="ir.ui.view">
+        <record id="view_change_standard_price" model="ir.ui.view">
             <field name="name">Change Standard Price</field>
             <field name="model">stock.change.standard.price</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Change Standard Price">
-                    <separator string="Change Price" colspan="4"/>
-                    <newline/>
-             		<field name="new_price" string="Cost Price"/>              		
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-              		<group col="2" colspan="2">                        
-	              		<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-	              		<button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
-              		</group>
+              <form string="Change Standard Price" version="7.0">
+                  <header>
+                      <button name="change_price" string="_Apply" type="object" icon="gtk-apply"/>
+                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                  </header>
+                  <separator string="Change Price"/>
+                  <group>
+                      <field name="new_price" string="Cost Price"/>
+                  </group>
               </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_view_change_standard_price" model="ir.actions.act_window">
+        <record id="action_view_change_standard_price" model="ir.actions.act_window">
             <field name="name">Change Standard Price</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.change.standard.price</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_change_standard_price"/>
-            <field name="target">new</field>            
+            <field name="target">new</field>
         </record>
 
     </data>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index c97a662c846..527b0de2e9a 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -6,28 +6,29 @@
             <field name="model">stock.fill.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Import Inventory">
-                     <separator string="Import current product inventory from the following location" colspan="4" />
-                    <field name="location_id"/>
-                    <newline/>
-                    <field name="recursive"/>
-                    <newline/>
-                    <field name="set_stock_zero"/>
-                    <separator string="" colspan="4" />
-                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                    <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
-             </form>
+              <form string="Import Inventory" version="7.0">
+                  <header>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
+                      <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                  </header>
+                  <separator string="Import current product inventory from the following location"/>
+                  <group>
+                      <field name="location_id"/>
+                      <field name="recursive"/>
+                      <field name="set_stock_zero"/>
+                  </group>
+              </form>
             </field>
         </record>
 
-         <act_window name="Import Inventory"            
+         <act_window name="Import Inventory"
             res_model="stock.fill.inventory"
             src_model="stock.inventory"
             view_mode="form"
             target="new"
-            context="{'search_default_in_location':1}" 
-            key2="client_action_multi"    
-            id="action_view_stock_fill_inventory"/>    
+            context="{'search_default_in_location':1}"
+            key2="client_action_multi"
+            id="action_view_stock_fill_inventory"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index fc188184c42..e8b31d94541 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -2,68 +2,60 @@
 <openerp>
     <data>
         <record id="view_split_in_lots_inherit" model="ir.ui.view">
-	        <field name="name">Split Inventory Line</field>
-	        <field name="model">stock.inventory.line.split</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-                <form string="Split in lots">
-                    <group width="660" height="275">
+            <field name="name">Split Inventory Line</field>
+            <field name="model">stock.inventory.line.split</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Split in Lots" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+                    </header>
+                    <group>
                         <field name="product_id" colspan="4" readonly="1"/>
-                        <newline/>
-						<group colspan="4" col="4">
-						    <group colspan="1" col="2">
-						        <field name="use_exist"/>
-						    </group>
-							<group colspan="1" col="2">
-							    <field name="qty" readonly="1"/>
-							</group>
-							<group colspan="1" col="2">
-							    <field name="product_uom" readonly="1"/>
-							</group>
-	                    </group>
-	                    <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
-	                        <field name="line_ids" colspan="4" nolabel="1">
-	                            <tree string="Lots Number" editable="bottom">
-	                                <field name="name" string="Lots"/>
-	                                <field name="quantity" />
-	                            </tree>
-	                            <form string="Lots Number">
-	                                <field name="name" string="Lots"/>
-	                                <field name="quantity" />
-	                            </form>
-	                        </field>
-	                    </group>
-	                    <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
-	                        <field name="line_exist_ids" colspan="4" nolabel="1">
-	                            <tree string="Lots Number" editable="bottom">
-	                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
-	                                <field name="quantity" />
-	                            </tree>
-	                            <form string="Lots Number">
-	                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
-	                                <field name="quantity" />
-	                            </form>
-	                        </field>
-	                    </group>
-	                    <separator string="" colspan="4" />
-	                    <label string="" colspan="2" />
-	                    <button icon='gtk-cancel' special="cancel"
-	                        string="Cancel" />
-	                    <button name="split_lot" string="Ok"
-	                        type="object" icon="gtk-ok" />
+                        <label for="qty"/>
+                        <div>
+                            <field name="qty" readonly="1"/>
+                            <field name="product_uom" readonly="1"/>
+                        </div>
+                        <field name="use_exist"/>
                     </group>
+                    <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
+                        <tree string="Lots Number" editable="bottom">
+                            <field name="name" string="Lots"/>
+                            <field name="quantity" />
+                        </tree>
+                        <form string="Lots Number" version="7.0">
+                            <group>
+                                <field name="name" string="Lots"/>
+                                <field name="quantity" />
+                            </group>
+                        </form>
+                    </field>
+                    <field name="line_exist_ids" attrs="{'invisible':[('use_exist','!=',True)]}">
+                        <tree string="Lots Number" editable="bottom">
+                            <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
+                            <field name="quantity" />
+                        </tree>
+                        <form string="Lots Number" version="7.0">
+                            <group>
+                                <field name="prodlot_id" string="Lots" domain="[('product_id','=',parent.product_id)]"/>
+                                <field name="quantity" />
+                            </group>
+                        </form>
+                    </field>
                 </form>
             </field>
         </record> 
-		
-		<record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
+        
+        <record id="action_view_stock_inventory_line_split" model="ir.actions.act_window">
             <field name="name">Split inventory lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory.line.split</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index d9c1dd58b9a..9e6dd45d114 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-	
-		<record id="name_form" model="ir.ui.view">
-		        <field name="name">stock.inventory.merge.form</field>
-		        <field name="model">stock.inventory.merge</field>
-		        <field name="type">form</field>
-		        <field name="arch" type="xml">
-					<form string="Merge Inventories">
-				    	<separator colspan="4" string="Merge Inventories" />
-				    	<label string="Do you want to merge theses inventories?"/>
-				 <separator colspan="4"/>
-    				<group colspan="4" col="6">
-					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-					<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
-					</group>			
-				</form>
-			</field>
-		</record>
-		 <act_window name="Merge inventories"		    
-			res_model="stock.inventory.merge"
-			src_model="stock.inventory"
-			view_mode="form"
+    <data>
+
+        <record id="name_form" model="ir.ui.view">
+            <field name="name">stock.inventory.merge.form</field>
+            <field name="model">stock.inventory.merge</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Merge Inventories" version="7.0">
+                    <header>
+                        <button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
+                        <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                    </header>
+                    <separator string="Merge Inventories" />
+                    <label string="Do you want to merge theses inventories?"/>
+                </form>
+            </field>
+        </record>
+        <act_window name="Merge inventories"
+            res_model="stock.inventory.merge"
+            src_model="stock.inventory"
+            view_mode="form"
                         multi="True"
-			target="new"        
-			key2="client_action_multi"    
-			id="action_view_stock_merge_inventories"/>	
-		
-	</data>
+            target="new"
+            key2="client_action_multi"
+            id="action_view_stock_merge_inventories"/>
+
+    </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 5095a40fa50..ba158bba1e4 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -6,16 +6,16 @@
             <field name="model">stock.invoice.onshipping</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create invoice">
-                    <separator colspan="4" string="Create Invoice" />
-                    <field name="journal_id"/>
-                    <newline/>
-                    <field name="group"/>
-                    <newline/>
-                    <field name="invoice_date" />
-                    <separator string="" colspan="4" />
-                    <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-                    <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+              <form string="Create invoice" version="7.0">
+                  <header>
+                      <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+                      <button name="open_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
+                  </header>
+                  <group string="Create Invoice">
+                      <field name="journal_id"/>
+                      <field name="group"/>
+                      <field name="invoice_date" />
+                  </group>
              </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 2459daac189..09ac798ea1c 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_stock_location_product" model="ir.ui.view">
+        <record id="view_stock_location_product" model="ir.ui.view">
             <field name="name">Products by Location</field>
             <field name="model">stock.location.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="View Stock of Products">
-        			<separator string="Stock Location Analysis" colspan="4"/>
-       				<field name="from_date" colspan="4"/>
-       				<newline/>
-       				<field name="to_date" colspan="4"/>
-       				<newline/>
-       				<label string=""/>
-       				<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
-        			<separator string="" colspan="4" />
-        			<label string=""/>
-					<button special="cancel" string="_Cancel" icon="gtk-cancel" />
-           	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
-    			</form>
+               <form string="View Stock of Products" version="7.0">
+                    <header>
+                        <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel" />
+                    </header>
+                    <separator string="Stock Location Analysis"/>
+                    <group>
+                        <field name="from_date"/>
+                        <field name="to_date"/>
+                    </group>
+                    <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)"/>
+                </form>
             </field>
-		</record>
+        </record>
 
 
-        <act_window name="Products by Location"		    
-		    res_model="stock.location.product"
-		    src_model="stock.location"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_view_stock_location_product"/>			
+        <act_window name="Products by Location"
+            res_model="stock.location.product"
+            src_model="stock.location"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_view_stock_location_product"/>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 577411e3c09..1cf08d8cadf 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -8,21 +8,21 @@
             <field name="model">stock.move.consume</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Consume Move">
-                    <separator string="Consume Products" colspan="4"/>
-                    <field name="product_id" colspan="4" readonly="1"/>
-                    <field name="location_id" colspan="4" />
-                    <field name="product_qty" colspan="2"/>
-                    <field name="product_uom" nolabel="1" readonly="1"/>
-                    <newline/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <group col="2" colspan="1">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
-                        <button name="do_move_consume" string="Ok"
-                            colspan="1" type="object" icon="gtk-ok" />
-                    </group>
+                <form string="Consume Move" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" />
+                    </header>
+                    <separator string="Consume Products"/>
+                    <div>
+                        <field name="product_id" readonly="1"/>
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty"/>
+                            <field name="product_uom" nolabel="1" readonly="1"/>
+                        </div>
+                        <field name="location_id"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -41,20 +41,20 @@
             <field name="model">stock.move.scrap</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scrap Move">
-                    <separator string="Scrap Products" colspan="4"/>
-                    <field name="product_id" colspan="4" readonly="1"/>
-                    <field name="location_id" colspan="4" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
-                    <field name="product_qty" colspan="2"/>
-                    <field name="product_uom" nolabel="1" readonly="1"/>
-                    <newline/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <group col="2" colspan="1">
-                        <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
-                        <button name="move_scrap" string="Ok"
-                            colspan="1" type="object" icon="gtk-ok" />
+                <form string="Scrap Move" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="move_scrap" string="Ok" type="object" icon="gtk-ok" />
+                    </header>
+                    <separator string="Scrap Products"/>
+                    <group>
+                        <field name="product_id"  readonly="1"/>
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" class="oe_form_inline"/>
+                            <field name="product_uom" class="oe_form_inline" readonly="1"/>
+                        </div>
+                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
                 </form>
             </field>
@@ -70,70 +70,61 @@
         </record>
 
         <record id="view_split_in_lots" model="ir.ui.view">
-	            <field name="name">Split in lots</field>
-	            <field name="model">stock.move.split</field>
-	            <field name="type">form</field>
-	            <field name="arch" type="xml">
-				<form string="Split in lots">
-				<group width="660" height="275">
-                  <field name="product_id" colspan="4" readonly="1"/>
-                  <newline/>
-                  <group colspan="4" col="4">
-                      <group colspan="1" col="2">
-                          <field name="use_exist"/>
-                      </group>
-                      <group colspan="1" col="2">
-                          <field name="qty" readonly="1"/>
-                       </group>
-                      <group colspan="1" col="2">
-                          <field name="product_uom" readonly="1"/>
-                      </group>
-                  </group>
-                  <field name="location_id" invisible="1"/>
-
-                  <group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
-                        <field name="line_ids" colspan="4" nolabel="1">
-                            <tree string="Serial Numbers" editable="bottom">
-                                <field name="name" string="Lots"/>
-                                <field name="quantity" />
-                            </tree>
-                            <form string="Serial Number">
+                <field name="name">Split in lots</field>
+                <field name="model">stock.move.split</field>
+                <field name="type">form</field>
+                <field name="arch" type="xml">
+                <form string="Split in Lots" version="7.0">
+                    <header>
+                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" />
+                    </header>
+                    <group>
+                        <field name="product_id" readonly="1"/>
+                        <label for="qty"/>
+                        <div>
+                            <field name="qty" readonly="1" class="oe_form_inline"/>
+                            <field name="product_uom" readonly="1" class="oe_form_inline"/>
+                        </div>
+                        <field name="location_id" invisible="1"/>
+                        <field name="use_exist"/>
+                    </group>
+                    <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
+                        <tree string="Serial Numbers" editable="bottom">
+                            <field name="name" string="Lots"/>
+                            <field name="quantity" />
+                        </tree>
+                        <form string="Serial Number" version="7.0">
+                            <group>
                                 <field name="name" string="Lot number"/>
                                 <field name="quantity" />
-                            </form>
-                        </field>
-                    </group>
-                  <group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
-                        <field name="line_exist_ids" colspan="4" nolabel="1">
-                            <tree string="Serial Numbers" editable="bottom">
+                            </group>
+                        </form>
+                    </field>
+                    <field name="line_exist_ids" attrs="{'invisible':[('use_exist','!=',True)]}">
+                        <tree string="Serial Numbers" editable="bottom">
+                            <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
+                            <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
+                        </tree>
+                        <form string="Serial Number" version="7.0">
+                            <group>
                                 <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
                                 <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
-                            </tree>
-                            <form string="Serial Number">
-                                <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
-                                <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
-                            </form>
-                        </field>
-                    </group>
-	                	<separator string="" colspan="4" />
-	                	<label string="" colspan="2" />
-	                	<button icon='gtk-cancel' special="cancel"
-	                		string="Cancel" />
-	                	<button name="split_lot" string="Ok"
-	                		type="object" icon="gtk-ok" />
-					</group>
-	                </form>
-	            </field>
-	        </record>
+                            </group>
+                        </form>
+                    </field>
+                </form>
+                </field>
+            </record>
 
-	        <record id="track_line" model="ir.actions.act_window">
-	            <field name="name">Split in lots</field>
-	            <field name="type">ir.actions.act_window</field>
-	            <field name="res_model">stock.move.split</field>
-	            <field name="view_type">form</field>
-	            <field name="view_mode">form</field>
-	            <field name="target">new</field>
-	        </record>
+            <record id="track_line" model="ir.actions.act_window">
+                <field name="name">Split in lots</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">stock.move.split</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">form</field>
+                <field name="target">new</field>
+            </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 12b20f0d1aa..722486c81fa 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -20,15 +20,13 @@
             <field name="model">stock.partial.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <separator colspan="4" string="Products"/>
-                    <field name="move_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
+                <form version="7.0">
+                    <header>
+                        <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" />
                         <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                        <button name="do_partial" string="_Validate" colspan="1" type="object" icon="gtk-go-forward" />
-                    </group>
+                    </header>
+                    <separator string="Products"/>
+                    <field name="move_ids"/>
                 </form>
             </field>
         </record>
@@ -57,16 +55,18 @@
             <field name="model">stock.partial.move.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="location_id" />
-                    <field name="location_dest_id" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
-                    <field name="update_cost" invisible="1"/>
-                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                <form version="7.0">
+                    <group>
+                        <field name="product_id" />
+                        <field name="quantity" />
+                        <field name="product_uom" />
+                        <field name="location_id" />
+                        <field name="location_dest_id" />
+                        <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
+                        <field name="update_cost" invisible="1"/>
+                        <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    </group>
                  </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c57c6c400e4..76f457e364a 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -15,28 +15,26 @@
             <field name="model">stock.partial.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="hide_tracking" invisible="1"/>
-                    <separator colspan="4" string="Transfer Products" name="product_separator"/>
-                    <field name="move_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200" context="{'hide_tracking': hide_tracking}">
+                <form version="7.0">
+                    <header>
+                        <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" />
+                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <field name="hide_tracking" invisible="1"/>
+                    </header>
+                    <separator string="Transfer Products" name="product_separator"/>
+                    <field name="move_ids" context="{'hide_tracking': hide_tracking}">
                         <tree editable="bottom" string="Product Moves">
                             <field name="product_id" />
                             <field name="quantity" />
                             <field name="product_uom" />
                             <field name="tracking" invisible="1"/>
-                            <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}"/>
+                            <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                             <field name="update_cost" invisible="1"/>
                             <field name="cost"  invisible="1"/>
                             <field name="currency"  invisible="1"/>
                         </tree>
                     </field>
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2"/>
-                    <group col="2" colspan="2">
-                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
-                        <button name="do_partial" string="_Transfer" colspan="1" type="object" icon="gtk-go-forward" />
-                    </group>
                 </form>
             </field>
         </record>
@@ -64,17 +62,19 @@
             <field name="model">stock.partial.picking.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
-                    <field name="product_uom" />
-                    <field name="location_id" />
-                    <field name="location_dest_id" />
-                    <field name="tracking" invisible="1"/>
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
-                    <field name="update_cost" invisible="1"/>
-                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                <form version="7.0">
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="quantity" />
+                        <field name="product_uom" />
+                        <field name="location_id" />
+                        <field name="location_dest_id" />
+                        <field name="tracking" invisible="1"/>
+                        <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
+                        <field name="update_cost" invisible="1"/>
+                        <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    </group>
                  </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 7735801624d..63f85d79945 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -44,9 +44,11 @@
             <field name="model">stock.return.picking.memory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
-                    <field name="product_id" />
-                    <field name="quantity" />
+                <form version="7.0">
+                    <group col="4">
+                        <field name="product_id" />
+                        <field name="quantity" />
+                    </group>
                  </form>
             </field>
         </record>   
@@ -56,15 +58,15 @@
             <field name="model">stock.return.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Return lines">
-                    <label string="Provide the quantities of the returned products." colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <field name="product_return_moves"  nolabel="1" colspan="6"/>
-                    <field name="invoice_state" />
-                    <separator string="" colspan="4" />
-                    <group col="2" colspan="4">
+                <form string="Return lines" version="7.0">
+                    <header>
+                        <button name="create_returns" string="Return" type="object" icon="gtk-apply" />
                         <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                        <button name="create_returns" string="Return" colspan="1" type="object" icon="gtk-apply" />
+                    </header>
+                    <label string="Provide the quantities of the returned products."/>
+                    <group>
+                        <field name="product_return_moves"/>
+                        <field name="invoice_state" />
                     </group>
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 131511d0b10..35329230aee 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -6,13 +6,15 @@
             <field name="model">stock.split.into</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Split Move">
-                <separator string="Quantity to Leave in the Current Pack" colspan="4"/>
-                <field name="quantity"/>
-                <button icon='gtk-cancel' special="cancel"
-                    string="_Cancel" />
-                <button name="split" string="Ok"
-                    type="object" icon="gtk-ok" />
+            <form string="Split Move" version="7.0">
+                <header>
+                    <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                    <button name="split" string="Ok" type="object" icon="gtk-ok" />
+                </header>
+                <separator string="Quantity to Leave in the Current Pack"/>
+                <group>
+                    <field name="quantity"/>
+                </group>
             </form>
             </field>
         </record>
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 5f2bacd565f..b37c18cc876 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -20,15 +20,17 @@
             <field name="model">stock.location.path</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Location Paths">
-                    <field name="name"/>
-                    <newline/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="location_from_id"/>
-                    <field name="location_dest_id"/>
-                    <field name="auto"/>
-                    <field name="delay"/>
+                <form string="Location Paths" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <newline/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="location_from_id"/>
+                        <field name="location_dest_id"/>
+                        <field name="auto"/>
+                        <field name="delay"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -49,16 +51,18 @@
                                 <field name="journal_id"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </tree>
-                            <form string="Pulled Paths">
-                                <separator string="Conditions" colspan="4"/>
-                                <field name="name" colspan="4" placeholder="Fulfill needs on location X from location Y "/>
-                                <field name="location_id"/>
-                                <separator string="Action Type" colspan="4"/>
-                                <field name="type_proc"/>
-                                <separator string="Parameters" colspan="4"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                                <newline/>
-                                <group col="4" colspan="4" attrs="{'invisible':[('type_proc','!=','move')]}">
+                            <form string="Pulled Paths" version="7.0">
+                                <group>
+                                    <group string="Conditions">
+                                        <field name="name" placeholder="Fulfill needs on location X from location Y "/>
+                                        <field name="location_id"/>
+                                    </group>
+                                    <group string="Action Type">
+                                        <field name="type_proc"/>
+                                        <field name="company_id"/>
+                                    </group>
+                                </group>
+                                <group col="4" attrs="{'invisible':[('type_proc','!=','move')]}">
                                     <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                     <field name="picking_type"/>
                                     <field name="partner_address_id"/>
@@ -69,7 +73,7 @@
                                 </group>
                             </form>
                         </field>
-                        <field name="path_ids" colspan="4" nolabel="1">
+                        <field name="path_ids">
                         <field name="name"/>
                             <tree string="Pushed flows">
                                 <field name="location_from_id"/>
@@ -79,18 +83,18 @@
                                 <field name="invoice_state"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </tree>
-                            <form string="Pushed flows">
-                                <group colspan="4" col="6">
+                            <form string="Pushed flows" version="7.0">
+                                <group col="4">
                                     <field name="name" placeholder="When receiving at location X, move to location Y"/>
                                     <field name="location_from_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="auto"/>
                                     <field name="delay"/>
                                     <field name="journal_id"/>
+                                    <field name="picking_type"/>
+                                    <field name="invoice_state"/>
+                                    <field name="company_id" groups="base.group_multi_company"/>
                                 </group>
-                                <field name="picking_type"/>
-                                <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
                             </form>
                         </field>
                     </page>
@@ -99,5 +103,3 @@
        </record>
     </data>
 </openerp>
-
-   
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 1b5cd953027..97f1028b59f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -12,20 +12,20 @@
             <field name="model">stock.period</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
-                <header>
-                    <button name="button_open" string="Open" states="draft" type="object"/>
-                    <button name="button_close" string="Close" states="open" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
-                </header>
-                <sheet string="Stock Periods" layout="auto">
-                    <group class="oe_form_header">
-                        <field name="name" colspan="2"/>
-                        <newline/>
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                    </group>
-                </sheet>
+                <form>
+                    <header>
+                        <button name="button_open" string="Open" states="draft" type="object"/>
+                        <button name="button_close" string="Close" states="open" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
+                    </header>
+                    <sheet string="Stock Periods">
+                        <group col="4">
+                            <field name="name"/>
+                            <newline/>
+                            <field name="date_start"/>
+                            <field name="date_stop"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index c2658a7b5a5..bdfe240b106 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -8,15 +8,16 @@
             <field name="model">stock.period.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Stock Periods">
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    <separator colspan="4" string=""/>
-                    <group col="4" colspan="4">
+                <form string="Stock Periods" version="7.0">
+                    <header>
                         <button string="Cancel" special="cancel" icon="gtk-cancel"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Daily Periods" type="object"/>
                         <button name="create_stock_periods" icon="gtk-dnd"  string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}"/>
                         <button name="create_stock_periods" icon="gtk-dnd" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}"/>
+                    </header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
                     </group>
                 </form>
             </field>
@@ -28,14 +29,14 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_stock_period_createlines_form"/>
-           <field name="help">This wizard helps with the creation of stock planning periods. These periods are independent of financial periods. If you need periods other than day-, week- or month-based, you may also add then manually.</field>
+            <field name="help">This wizard helps with the creation of stock planning periods. These periods are independent of financial periods. If you need periods other than day-, week- or month-based, you may also add then manually.</field>
             <field name="target">new</field>
         </record>
 
         <menuitem id="menu_stock_period_creatlines"
-                  name="Create Stock Periods"
-                  parent="stock.menu_stock_configuration"
-                  action="action_stock_period_createlines_form"
-                  sequence = "20"/>
+            name="Create Stock Periods"
+            parent="stock.menu_stock_configuration"
+            action="action_stock_period_createlines_form"
+            sequence = "20"/>
     </data>
 </openerp>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index b0da05b24ab..2ebddb89212 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -7,15 +7,17 @@
             <field name="model">stock.planning.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Stock Planning Lines">
-                    <field name="period_id" widget="selection"/>
-                    <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                    <field name="forecasted_products"/>
-                    <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
-                    <group colspan="4">
+                <form string="Create Stock Planning Lines" version="7.0">
+                    <header>
                         <button icon="gtk-cancel" special="cancel" string="Close"/>
                         <button icon="gtk-ok" name="create_planning" string="Create" type="object"/>
+                    </header>
+                    <group col="4">
+                        <field name="period_id" widget="selection"/>
+                        <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+                        <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                        <field name="forecasted_products"/>
+                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
                     </group>
                 </form>
             </field>
@@ -35,6 +37,6 @@
         <menuitem
             id="menu_stock_planning_createlines"
             parent="menu_stock_planning_manual"
-            action="action_stock_planning_createlines_form" sequence = "5"/>
+            action="action_stock_planning_createlines_form" sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 4df396b73f2..72c94abf128 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -8,15 +8,17 @@
             <field name="model">stock.sale.forecast.createlines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Forecasts Lines">
-                    <field name="period_id"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                    <field name="copy_forecast"/>
-                    <field name="product_categ_id" widget="selection"/>
-                    <group colspan="4">
-                        <button icon="gtk-cancel"  special="cancel" string="Close"/>
+                <form string="Create Forecasts Lines" version="7.0">
+                    <header>
                         <button icon="gtk-execute" name="create_forecast" string="Create" type="object" />
+                        <button icon="gtk-cancel"  special="cancel" string="Close"/>
+                    </header>
+                    <group col="4">
+                        <field name="period_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
+                        <field name="copy_forecast"/>
+                        <field name="product_categ_id" widget="selection"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b4c992dcbc4..c2cffdc1bfa 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -13,40 +13,39 @@
             <field name="model">subscription.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Subscriptions" version="7.0">
                 <header>
                     <button name="set_process" states="draft" string="Process" type="object"/>
                     <button name="set_done" states="running" string="Stop" type="object"/>
                     <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </header>
-                <sheet string="Subscriptions" layout="auto">
-                    <group col="6" colspan="4" class="oe_form_header">
-                        <field name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="user_id" select="1"/>
-                        <field name="active" select="1"/>
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="active"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Subsription Data">
-                            <newline/>
-                            <field name="interval_number"/>
-                            <field name="interval_type"/>
-                            <field name="exec_init"/>
-                            <field name="date_init"/>
-                            <field colspan="4" name="doc_source" widget="reference"/>
-                            <separator string="Notes"  colspan="4"/>
-                            <field colspan="4" name="notes" nolabel="1"/>
-                            <separator colspan="4"/>
-                            <field colspan="4" name="cron_id" readonly="1"/>
+                            <group col="4">
+                                <field name="interval_number"/>
+                                <field name="interval_type"/>
+                                <field name="exec_init"/>
+                                <field name="date_init"/>
+                                <field name="doc_source" widget="reference"/>
+                                <field name="cron_id"/>
+                            </group>
+                            <separator string="Notes"/>
+                            <field name="notes"/>
                         </page>
                         <page string="Documents created">
-                            <field colspan="4" name="doc_lines" nolabel="1" widget="one2many_list"/>
+                            <field name="doc_lines" widget="one2many_list"/>
                         </page>
                         <page string="Notes">
-                            <separator string="Notes" colspan="4"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                    </page>
+                            <field name="note"/>
+                        </page>
                     </notebook>
                     </sheet>
                 </form>
@@ -62,7 +61,7 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="active"/>
-                    <field name="user_id" select="1"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -125,9 +124,11 @@
             <field name="model">subscription.subscription.history</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription History">
-                    <field name="date"/>
-                    <field colspan="4" name="document_id"/>
+                <form string="Subscription History" version="7.0">
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="document_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -137,14 +138,13 @@
             <field name="model">subscription.document</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription Document">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="model" select="1"/>
-                        <field name="active" select="1"/>
+                <form string="Subscription Document" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="model"/>
+                        <field name="active"/>
                     </group>
-                    <newline/>
-                    <field colspan="4" name="field_ids" nolabel="1"/>
+                    <field name="field_ids"/>
                 </form>
             </field>
         </record>
@@ -181,10 +181,11 @@
             <field name="model">subscription.document.fields</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Subscription Document Fields">
-                    <field name="field" select="1"/>
-                    <newline/>
-                    <field name="value"/>
+                <form string="Subscription Document Fields" version="7.0">
+                    <group>
+                        <field name="field"/>
+                        <field name="value"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 96dc60ff447..82540d702b2 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -18,16 +18,16 @@
             <field name="model">survey</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Survey">
                 <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
-                <sheet string="Survey" layout="auto">
-                    <field name="title" select="1"/>
+                <sheet>
                     <group col="6" colspan="6">
+                    <field name="title" select="1"/>
                         <field name="responsible_id"/>
                         <field name="id" invisible="1"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
@@ -38,7 +38,7 @@
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                             string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Survey Page">
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index b5485bf6370..004ed043ab6 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!--
-			Survey Question Wizard
-		 -->
+        <!--
+            Survey Question Wizard
+         -->
 
-		<record id="view_survey_question_message" model="ir.ui.view">
-			<field name="name">Survey Question</field>
-			<field name="model">survey.question.wiz</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Your Messages">
-					<field name="name" nolabel="1" colspan="4" />
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_question_message" model="ir.ui.view">
+            <field name="name">Survey Question</field>
+            <field name="model">survey.question.wiz</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Your Messages" version="7.0">
+                    <field name="name" nolabel="1" colspan="4" />
+                </form>
+            </field>
+        </record>
 
-		<record id="view_survey_question_message1" model="ir.ui.view">
-			<field name="name">Survey Search</field>
-			<field name="model">survey.question.wiz</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Your Messages">
-					<field name="name"/>
-				</search>
-			</field>
-		</record>
+        <record id="view_survey_question_message1" model="ir.ui.view">
+            <field name="name">Survey Search</field>
+            <field name="model">survey.question.wiz</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Your Messages">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
 
-		<record id="action_view_survey_question_message" model="ir.actions.act_window">
-			<field name="name">Survey Question</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.question.wiz</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_question_message" model="ir.actions.act_window">
+            <field name="name">Survey Question</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">survey.question.wiz</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index b99b7f9cc92..a2069cfdb9a 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -1,41 +1,43 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-		<!--
-			Browse Response Wizard (Survey Browse answer) 
-		 -->
-		 
-		<record id="view_survey_answer" model="ir.ui.view">
-			<field name="name">Survey</field>
-			<field name="model">survey.browse.answer</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey">
-					<separator colspan="4"  string =  "Select Survey and Related Answer"/>
-					<field name="survey_id" width="250"/>
-					<field name="response_id" domain="[('survey_id','=', survey_id)]"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
-				</form>
-			</field>
-		</record>
+    <data>
+    
+        <!--
+            Browse Response Wizard (Survey Browse answer) 
+         -->
+         
+        <record id="view_survey_answer" model="ir.ui.view">
+            <field name="name">Survey</field>
+            <field name="model">survey.browse.answer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey" version="7.0">
+                    <header>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <group col="4">
+                        <separator colspan="4"  string =  "Select Survey and Related Answer"/>
+                        <field name="survey_id"/>
+                        <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_browse_survey_response"
-			model="ir.actions.act_window">
-			<field name="name">Answer Survey</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.browse.answer</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_browse_survey_response"
+            model="ir.actions.act_window">
+            <field name="name">Answer Survey</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">survey.browse.answer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem name="Browse Answers" id="menu_browse_survey_response"
-			action="action_browse_survey_response" parent="menu_reporting"
-			groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
+        <menuitem name="Browse Answers" id="menu_browse_survey_response"
+            action="action_browse_survey_response" parent="menu_reporting"
+            groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index c6188689fe6..bbafb79ab61 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -1,43 +1,45 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- Survey Print Form View -->
+        <!-- Survey Print Form View -->
 
-		<record id="view_survey_print" model="ir.ui.view">
-			<field name="name">Survey Print</field>
-			<field name="model">survey.print</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey Print">
-				    <separator string="Survey" colspan="4"/>
-				    <field name="survey_ids" nolabel="1" colspan="4" />
-				    <separator string="Print Option" colspan="4"/>
-				    <field name="orientation" colspan="4"/>
-				    <field name="paper_size" colspan="4"/>
-				    <field name="page_number" colspan="4"/>
-				    <field name="without_pagebreak" colspan="4"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_print" model="ir.ui.view">
+            <field name="name">Survey Print</field>
+            <field name="model">survey.print</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Print" version="7.0">
+                    <header>
+                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
+                        <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <group col="4">
+                        <separator string="Survey" colspan="4"/>
+                        <field name="survey_ids" nolabel="1" colspan="4" />
+                        <separator string="Print Option" colspan="4"/>
+                        <field name="orientation" colspan="4"/>
+                        <field name="paper_size" colspan="4"/>
+                        <field name="page_number" colspan="4"/>
+                        <field name="without_pagebreak" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey Print action -->
+        <!-- Survey Print action -->
 
-		<record id="action_view_survey_print" model="ir.actions.act_window">
-			<field name="name">Print Survey</field>
-			<field name="res_model">survey.print</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_print" model="ir.actions.act_window">
+            <field name="name">Print Survey</field>
+            <field name="res_model">survey.print</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
         <menuitem name="Print Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
             groups="base.group_tool_manager" icon="STOCK_PRINT"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 9a0ea6dd83f..265c56ee1c6 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -1,43 +1,45 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- Survey Print answer Form View -->
+        <!-- Survey Print answer Form View -->
 
-		<record id="view_survey_print_answer" model="ir.ui.view">
-			<field name="name">Survey Print Answer</field>
-			<field name="model">survey.print.answer</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Print Answer">
-					<separator string="Answer" colspan="4"/>
-					<field name="response_ids" nolabel="1" colspan="4" />
-				    <separator string="Print Option" colspan="4"/>
-				    <field name="orientation" colspan="4"/>
-				    <field name="paper_size" colspan="4"/>
-				    <field name="page_number" colspan="4"/>
-				    <field name="without_pagebreak" colspan="4"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_print_answer" model="ir.ui.view">
+            <field name="name">Survey Print Answer</field>
+            <field name="model">survey.print.answer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Print Answer" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+                    </header>
+                    <group col="4">
+                        <separator string="Answer" colspan="4"/>
+                        <field name="response_ids" nolabel="1" colspan="4" />
+                        <separator string="Print Option" colspan="4"/>
+                        <field name="orientation" colspan="4"/>
+                        <field name="paper_size" colspan="4"/>
+                        <field name="page_number" colspan="4"/>
+                        <field name="without_pagebreak" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey Print answer action -->
+        <!-- Survey Print answer action -->
 
-		<record id="action_view_survey_print_answer"
-			model="ir.actions.act_window">
-			<field name="name">Print Answer</field>
-			<field name="res_model">survey.print.answer</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_print_answer"
+            model="ir.actions.act_window">
+            <field name="name">Print Answer</field>
+            <field name="res_model">survey.print.answer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
+        <menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
+            parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 9bd729db010..e2c064c6a14 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- Survey Print Statistics Form View -->
+        <!-- Survey Print Statistics Form View -->
 
-		<record id="view_survey_print_statistics" model="ir.ui.view">
-			<field name="name">Survey Print Statistics</field>
-			<field name="model">survey.print.statistics</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey Print Statistics">
-					<field name="survey_ids" nolabel="1" colspan="4" />
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_print_statistics" model="ir.ui.view">
+            <field name="name">Survey Print Statistics</field>
+            <field name="model">survey.print.statistics</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Print Statistics" version="7.0">
+                    <header>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <field name="survey_ids"/>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey Print Statistics action -->
+        <!-- Survey Print Statistics action -->
 
-		<record id="action_view_survey_print_statistics"
-			model="ir.actions.act_window">
-			<field name="name">Survey Print Statistics</field>
-			<field name="res_model">survey.print.statistics</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_print_statistics"
+            model="ir.actions.act_window">
+            <field name="name">Survey Print Statistics</field>
+            <field name="res_model">survey.print.statistics</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
+        <menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
+            parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index a72566f7888..940ac7833b2 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -1,46 +1,36 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-		<!--
-			Display Survey List 
-		 -->
-		 
-		<record id="view_survey_name" model="ir.ui.view">
-			<field name="name">Survey</field>
-			<field name="model">survey.name.wiz</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey">
-					<separator colspan="4" string="Select Survey" />
-					<newline />
-					<field name="survey_id" colspan="4"
-						on_change="on_change_survey(survey_id)" width="250"/>
-					<group col="1" colspan="4"
-						attrs="{'readonly': [('survey_id','=',False)]}">
-						<separator colspan="4" string="Survey Details" />
-						<field name="note" colspan="4" nolabel="1" readonly="1"/>
-						<newline />
-					</group>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel"
-						special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-go-forward"
-						name="action_next" string="Start" type="object"/>
-				</form>
-			</field>
-		</record>
+    <data>
+        <!--
+            Display Survey List
+         -->
 
-		<record id="action_view_survey_name"
-			model="ir.actions.act_window">
-			<field name="name">Give Survey Answer</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.name.wiz</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-		
-	</data>
-</openerp>
\ No newline at end of file
+        <record id="view_survey_name" model="ir.ui.view">
+            <field name="name">Survey</field>
+            <field name="model">survey.name.wiz</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+                    </header>
+                    <group string="Select Survey">
+                        <field name="survey_id" on_change="on_change_survey(survey_id)"/>
+                    </group>
+                    <field name="note" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_survey_name"
+            model="ir.actions.act_window">
+            <field name="name">Give Survey Answer</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">survey.name.wiz</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 72ec794d66e..12c4df8bd69 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -1,77 +1,78 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-		<!-- Survey send invitation Form View -->
+    <data>
+    
+        <!-- Survey send invitation Form View -->
 
-		<record id="view_survey_send_invitation" model="ir.ui.view">
-			<field name="name">Send Invitation</field>
-			<field name="model">survey.send.invitation</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Send Invitation">
-				    <separator string="Select Partner" colspan="4"/>
-				    <field name="partner_ids" nolabel="1"  colspan="4"/>
-				    <separator colspan="4" string="Send Mail for New User"/>
-			        <field name="send_mail" nolabel="1"/>
-			        <field name="mail_subject" colspan="3"/>
-			        <separator colspan="4" string="Send Reminder for Existing User"/>
-			        <field name="send_mail_existing" nolabel="1"/>
-			        <field name="mail_subject_existing" colspan="3"/>
-				    <separator colspan="4"/>
-			        <field name="mail_from" colspan="4"/>
-				    <separator string="Message" colspan="4"/>
-				    <field name="mail" nolabel="1" colspan="4"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="_Cancel"/>
-					<button colspan="1" icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_send_invitation" model="ir.ui.view">
+            <field name="name">Send Invitation</field>
+            <field name="model">survey.send.invitation</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send Invitation" version="7.0">
+                    <header>
+                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    </header>
+                    <group col="4">
+                        <separator string="Select Partner" colspan="4"/>
+                        <field name="partner_ids" nolabel="1"  colspan="4"/>
+                        <separator colspan="4" string="Send Mail for New User"/>
+                        <field name="send_mail" nolabel="1"/>
+                        <field name="mail_subject" colspan="3"/>
+                        <separator colspan="4" string="Send Reminder for Existing User"/>
+                        <field name="send_mail_existing" nolabel="1"/>
+                        <field name="mail_subject_existing" colspan="3"/>
+                        <separator colspan="4"/>
+                        <field name="mail_from" colspan="4"/>
+                        <separator string="Message" colspan="4"/>
+                        <field name="mail" nolabel="1" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey send invitation action -->
+        <!-- Survey send invitation action -->
 
-		<record id="action_view_survey_send_invitation" model="ir.actions.act_window">
-			<field name="name">Send Invitation</field>
-			<field name="res_model">survey.send.invitation</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_send_invitation" model="ir.actions.act_window">
+            <field name="name">Send Invitation</field>
+            <field name="res_model">survey.send.invitation</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-    	<act_window id="action_act_view_survey_send_invitation"
-    		key2="client_action_multi" name="Send Invitations"
-    		res_model="survey.send.invitation" src_model="survey"
-    		view_mode="form" target="new" view_type="form" />
+        <act_window id="action_act_view_survey_send_invitation"
+            key2="client_action_multi" name="Send Invitations"
+            res_model="survey.send.invitation" src_model="survey"
+            view_mode="form" target="new" view_type="form" />
 
-		<!-- Survey send invitation Display Log Form View -->
+        <!-- Survey send invitation Display Log Form View -->
 
-		<record id="view_survey_send_invitation_log" model="ir.ui.view">
-			<field name="name">survey send invitation log</field>
-			<field name="model">survey.send.invitation.log</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="User creation">
-				    <separator string="Results :" colspan="4"/>
-    				<field name="note" colspan="4" nolabel="1" width="300"/>
-    				<separator string="" colspan="4"/>
-    				<group col="4" colspan="4">
-						<label align="0.0" colspan="3" string="" />
-						<button colspan="1" icon="gtk-ok" special="cancel" string="_Ok"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_send_invitation_log" model="ir.ui.view">
+            <field name="name">survey send invitation log</field>
+            <field name="model">survey.send.invitation.log</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="User creation" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" special="cancel" string="_Ok"/>
+                    </header>
+                    <group string="Results :">
+                        <field name="note"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey send invitation action -->
+        <!-- Survey send invitation action -->
 
-		<record id="action_view_survey_send_invitation_log" model="ir.actions.act_window">
-			<field name="name">survey.send.invitation.log</field>
-			<field name="res_model">survey.send.invitation.log</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-	</data>
+        <record id="action_view_survey_send_invitation_log" model="ir.actions.act_window">
+            <field name="name">survey.send.invitation.log</field>
+            <field name="res_model">survey.send.invitation.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/users_ldap/user_ldap_installer.xml b/addons/users_ldap/user_ldap_installer.xml
index 4dd65807a4b..1f652f69699 100644
--- a/addons/users_ldap/user_ldap_installer.xml
+++ b/addons/users_ldap/user_ldap_installer.xml
@@ -7,30 +7,28 @@
             <field name="model">res.company.ldap</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="LDAP Configuration">
-                    <field name="company"/>
-                    <newline/>
-                    <group col="2" colspan="2">
-                          <separator string="Server Information" colspan="2"/>
-                          <field name="ldap_server"/>
-                          <field name="ldap_server_port"/>
-                          <field name="ldap_tls"/>
-                    </group>
-                    <group col="2" colspan="2">
-                          <separator string="Login Information" colspan="2"/>
-                          <field name="ldap_binddn"/>
-                          <field name="ldap_password"/>
-                    </group>
-                    <group col="2" colspan="2">
-                         <separator string="Process Parameter" colspan="2"/>
-                         <field name="ldap_base"/>
-                         <field name="ldap_filter"/>
-                         <field name="sequence"/>
-                    </group>
-                    <group col="2" colspan="2">
-                         <separator string="User Information" colspan="2"/>
-                         <field name="create_user"/>
-                         <field name="user"/>
+                <form string="LDAP Configuration" version="7.0">
+                    <group>
+                        <field name="company"/>
+                        <newline/>
+                        <group string="Server Information">
+                              <field name="ldap_server"/>
+                              <field name="ldap_server_port"/>
+                              <field name="ldap_tls"/>
+                        </group>
+                        <group string="Login Information">
+                              <field name="ldap_binddn"/>
+                              <field name="ldap_password"/>
+                        </group>
+                        <group string="Process Parameter">
+                             <field name="ldap_base"/>
+                             <field name="ldap_filter"/>
+                             <field name="sequence"/>
+                        </group>
+                        <group string="User Information">
+                             <field name="create_user"/>
+                             <field name="user"/>
+                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 8747609f321..40d01f43bf3 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,20 +7,22 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Configuration']" position="inside">                    
+                <xpath expr="//page[@string='Configuration']" position="inside">
                     <field name="ldaps" nolabel="1" colspan="4">
-                        <form string="LDAP Configuration">
-                            <field name="ldap_server"/>
-                            <field name="ldap_server_port"/>
-                            <field name="ldap_binddn"/>
-                            <field name="ldap_password"/>
-                            <field name="ldap_base"/>
-                            <field name="ldap_filter"/>
-                            <field name="create_user"/>
-                            <field name="user"/>
-                            <newline/>
-                            <field name="sequence"/>
-                            <field name="ldap_tls"/>
+                        <form string="LDAP Configuration" version="7.0">
+                            <group col="4">
+                                <field name="ldap_server"/>
+                                <field name="ldap_server_port"/>
+                                <field name="ldap_binddn"/>
+                                <field name="ldap_password"/>
+                                <field name="ldap_base"/>
+                                <field name="ldap_filter"/>
+                                <field name="create_user"/>
+                                <field name="user"/>
+                                <newline/>
+                                <field name="sequence"/>
+                                <field name="ldap_tls"/>
+                            </group>
                         </form>
                         <tree string="LDAP Configuration">
                             <field name="sequence"/>
diff --git a/addons/web_livechat/i18n/sv.po b/addons/web_livechat/i18n/sv.po
new file mode 100644
index 00000000000..dd3ae799443
--- /dev/null
+++ b/addons/web_livechat/i18n/sv.po
@@ -0,0 +1,28 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 15:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid "That contract is already registered in the system."
+msgstr "Det kontraktet har redan registrerats i systemet."
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr "publisher_warranty.contract"
diff --git a/addons/web_uservoice/i18n/sv.po b/addons/web_uservoice/i18n/sv.po
new file mode 100644
index 00000000000..cf2af514acf
--- /dev/null
+++ b/addons/web_uservoice/i18n/sv.po
@@ -0,0 +1,23 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-04 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/web_uservoice/static/src/xml/web_uservoice.xml:6
+msgid "feedback"
+msgstr "återkoppling"
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index c8f46619235..fbdffb23e0a 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -4,26 +4,26 @@
 
 <!-- Create Menu From view -->
 
-		<record id="view_wiki_create_menu" model="ir.ui.view">
+        <record id="view_wiki_create_menu" model="ir.ui.view">
             <field name="name">Create Menu</field>
             <field name="model">wiki.create.menu</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create Menu">
-             		<separator string="Menu Information" colspan="4" />
-                	<field name="menu_name" />
-                	<field name="menu_parent_id" />
-	                <separator string="" colspan="4" />
-    	            <label string="" colspan="2" />
-        	        <button special="cancel" string="Cancel" />
-            	    <button name="wiki_menu_create" string="Create Menu" type="object"/>
+                     <separator string="Menu Information" colspan="4" />
+                    <field name="menu_name" />
+                    <field name="menu_parent_id" />
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2" />
+                    <button special="cancel" string="Cancel" />
+                    <button name="wiki_menu_create" string="Create Menu" type="object"/>
              </form>
             </field>
-		</record>
+        </record>
 
 <!-- Create Menu Action -->
 
-		<record id="action_wiki_create_menu" model="ir.actions.act_window">
+        <record id="action_wiki_create_menu" model="ir.actions.act_window">
             <field name="name">Create Menu</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wiki.create.menu</field>
@@ -33,4 +33,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index f9b0acbf273..28b0d8427b0 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -4,41 +4,41 @@
 
 <!-- Create Index Form view  -->
 
-    	<record id="view_wiki_make_index" model="ir.ui.view">
+        <record id="view_wiki_make_index" model="ir.ui.view">
             <field name="name">Create Index</field>
             <field name="model">wiki.make.index</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create Menu">
-    			<separator string="Menu Information" colspan="4"/>
-    			<label string="Want to create a Index on Selected Pages ? "/>
-    			<separator string="" colspan="6" />
-    	        <label string="" colspan="2"/>
-    	        <group>
-        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
-            	<button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
-            	</group>
-			</form>
+                <separator string="Menu Information" colspan="4"/>
+                <label string="Want to create a Index on Selected Pages ? "/>
+                <separator string="" colspan="6" />
+                <label string="" colspan="2"/>
+                <group>
+                <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
+                </group>
+            </form>
             </field>
-		</record>
+        </record>
 
 <!-- Create Index Action  -->
 
-		<record id="action_view_wiki_make_index" model="ir.actions.act_window">
+        <record id="action_view_wiki_make_index" model="ir.actions.act_window">
             <field name="name">Create Index</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wiki.make.index</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
 <!-- Create Index Action Window  -->
 
-		<act_window id="action_view_wiki_make_index_values"
-    		key2="client_action_multi" name="Create Index"
-    		res_model="wiki.make.index" src_model="wiki.wiki"
-    		view_mode="form" target="new" view_type="form" />
+        <act_window id="action_view_wiki_make_index_values"
+            key2="client_action_multi" name="Create Index"
+            res_model="wiki.make.index" src_model="wiki.wiki"
+            view_mode="form" target="new" view_type="form" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index b9a8264cc81..8cc394986d8 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -4,39 +4,39 @@
 
 <!-- Create Index Form view  -->
 
-    	<record id="view_wiki_show_diff" model="ir.ui.view">
+        <record id="view_wiki_show_diff" model="ir.ui.view">
             <field name="name">Show Difference</field>
             <field name="model">wizard.wiki.history.show_diff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Difference">
-    			 <separator colspan="4" string="Notes"/>
-    			  <field name="file_path" colspan="4" width="300"/>
-    	        <label string="" colspan="2" />
-    	        <group>
-        	    <button special="cancel" string="Close" icon="gtk-close" />
-            	</group>
-			</form>
+                 <separator colspan="4" string="Notes"/>
+                  <field name="file_path" colspan="4" width="300"/>
+                <label string="" colspan="2" />
+                <group>
+                <button special="cancel" string="Close" icon="gtk-close" />
+                </group>
+            </form>
             </field>
-		</record>
+        </record>
 
 <!-- Create Index Action  -->
 
-		<record id="action_view_wiki_show_diff" model="ir.actions.act_window">
+        <record id="action_view_wiki_show_diff" model="ir.actions.act_window">
             <field name="name">Difference</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wizard.wiki.history.show_diff</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
 <!-- Create Index Action Window  -->
 
-		 <act_window id="action_view_wiki_show_diff_values"
-    		key2="client_action_multi" name="Difference"
-    		res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
-    		view_mode="form" target="new" view_type="form" />
+         <act_window id="action_view_wiki_show_diff_values"
+            key2="client_action_multi" name="Difference"
+            res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
+            view_mode="form" target="new" view_type="form" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index bc876416caa..a625d15e92a 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -4,33 +4,33 @@
 
 <!-- Open Page Form view  -->
 
-    	<record id="view_wiki_wiki_page_open" model="ir.ui.view">
+        <record id="view_wiki_wiki_page_open" model="ir.ui.view">
             <field name="name">Open Page</field>
             <field name="model">wiki.wiki.page.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Open Page">
-             	<separator string="" colspan="6" />
-              	<label string="Want to open a wiki page? "/>
-              	<separator string="" colspan="6" />
-    	        <label string="" colspan="2" />
-    	        <group>
-        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
-               	<button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
-               	</group>
+                 <separator string="" colspan="6" />
+                  <label string="Want to open a wiki page? "/>
+                  <separator string="" colspan="6" />
+                <label string="" colspan="2" />
+                <group>
+                <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                   <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
+                   </group>
              </form>
             </field>
-		</record>
+        </record>
 
 <!-- Open Page Action  -->
 
-		<record id="action_view_wiki_wiki_page_open" model="ir.actions.act_window">
+        <record id="action_view_wiki_wiki_page_open" model="ir.actions.act_window">
             <field name="name">Open Page</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wiki.wiki.page.open</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
     </data>
 </openerp>