[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120612065329-oys1eh8q3gitdx06
2012-06-12 12:23:29 +05:30 · 2012-06-12 12:23:29 +05:30 · 0b188a31cc
parent 3cca57fbcc b871639070
commit 0b188a31cc
31 changed files with 3990 additions and 5677 deletions
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@ -287,8 +287,10 @@
                </header>
                <sheet string="Invoice">
                    <h1>
-                        <field name="state" class="oe_form_inline"/>
-                        <field name="number"/>
+                        <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                        <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
+                        <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                        <field name="number" readonly="1" class="oe_form_inline"/>
                    </h1>
                    <label string="Concerns" for="name" class="oe_form_readonly_hidden"/>
                    <h2>
@ -333,8 +335,8 @@
                        <page string="Invoice">
                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
                            <group>
-                                <group>
-                                    <field name="tax_line">
+                                <div>
+                                    <field name="tax_line" nolabel="1">
                                        <tree editable="bottom" string="Taxes">
                                            <field name="name"/>
                                            <field name="account_id" groups="account.group_account_invoice"/>
@ -349,7 +351,7 @@
                                    <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
                                        type="object" groups="account.group_account_user" 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"/>
--- 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-08 01:32+0000\n"
+"PO-Revision-Date: 2012-06-12 01:28+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"
+"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"

 #. module: account
 #: view:account.invoice.report:0
@ -5512,7 +5512,7 @@ msgstr "有効な最大値"
 #. module: account
 #: view:account.journal:0
 msgid "Invoicing Data"
-msgstr "請求日"
+msgstr "請求書データ"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@ -75,21 +75,21 @@
            <field name="inherit_id" ref="base.view_partner_form"/>
            <field name="arch" type="xml">
                <page string="History" position="before" version="7.0">
-                <page string="Accounting">
-                    <group>
-                        <group string="Customer Accounting Properties">
+                <page string="Accounting" col="4">
+                    <group col="4">
+                        <group string="Customer Accounting Properties" col="4">
                            <field name="property_account_receivable" groups="account.group_account_invoice" />
                            <field name="property_account_position" widget="selection"/>
                            <field name="property_payment_term" widget="selection"/>
                        </group>
-                        <group string="Supplier Accounting Properties">
+                        <group string="Supplier Accounting Properties" col="4">
                            <field name="property_account_payable" groups="account.group_account_invoice"/>
                        </group>
-                        <group string="Customer Credit">
+                        <group string="Customer Credit" col="4">
                            <field name="credit"/>
                            <field name="credit_limit"/>
                        </group>
-                        <group string="Supplier Debit">
+                        <group string="Supplier Debit" col="4">
                            <field name="debit"/>
                        </group>
                        <field name="bank_ids">
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/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-18 05:50+0000\n"
+"PO-Revision-Date: 2012-06-12 00:29+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-19 04:38+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"

 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
@ -159,7 +159,7 @@ msgstr "残り時間"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
 msgid "Contracts to Renew"
-msgstr "更新する契約"
+msgstr "更新契約"

 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@ -182,7 +182,7 @@ msgstr "全てのそれらのコストが価格表によって提供される通
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr "保留中"
+msgstr "保留"

 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@ -253,7 +253,7 @@ msgstr "月別時間数合計"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "エラー。反復した分析アカウントを作ることはできません"
+msgstr "エラー。再帰的な分析アカウントを作ることはできません。"

 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@ -288,15 +288,13 @@
                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
                                    <field name="percentage"/>
                                </tree>
-                                <form string="Budget Lines" version="7.0">
-                                    <group col="4">
-                                        <field name="crossovered_budget_id"/>
-                                        <field name="general_budget_id"/>
-                                        <field name="date_from"/>
-                                        <field name="date_to"/>
-                                        <field name="paid_date"/>
-                                        <field name="planned_amount"/>
-                                    </group>
+                                <form string="Budget Lines">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
                                </form>
                                <graph type="bar" string="Lines">
                                    <field name="general_budget_id" />
--- a/addons/auction/i18n/ja.po
+++ b/addons/auction/i18n/ja.po
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@ -7,7 +7,7 @@
            <field name="model">res.partner</field>
            <field name="inherit_id" ref="account.view_partner_property_form"/>
            <field name="arch" type="xml">
-                <field name="property_account_payable" position="after">
+                <field name="property_account_payable" position="after" version="7.0">
                    <label for="vat"/>
                    <div>
                        <field name="vat" on_change="vat_change(vat)" placeholder="BE0477472702" class="oe_form_inline"/>
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/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-04-27 00:52+0000\n"
+"PO-Revision-Date: 2012-06-11 07:49+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-05-11 04:45+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"

 #. module: crm
 #: view:crm.lead.report:0
@ -56,7 +56,7 @@ msgstr "役職"
 #. module: crm
 #: field:crm.meeting,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "として表示"

 #. module: crm
 #: field:crm.meeting,day:0 selection:crm.meeting,select1:0
@ -71,13 +71,13 @@ msgstr "本日"
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "オポチュニティを選択"

 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
 #: view:crm.phonecall2phonecall:0
 msgid " "
-msgstr ""
+msgstr " "

 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
@ -87,29 +87,29 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "前のステージ"

 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "注記を追加することは出来ません。"

 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "ステージ名"

 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRMリード分析"

 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"

 #. module: crm
 #: sql_constraint:crm.case.section:0
@ -151,7 +151,7 @@ msgstr "ルール名"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "設定"

 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
@ -163,7 +163,7 @@ msgstr "キャンペーン"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "オポチュニティを検索"

 #. module: crm
 #: help:crm.lead.report,deadline_month:0
@ -196,7 +196,7 @@ msgstr "パートナ"
 #. module: crm
 #: field:crm.meeting,organizer:0 field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "主催者"

 #. module: crm
 #: view:crm.phonecall:0
@ -249,7 +249,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr ""
+msgstr "回答を除く"

 #. module: crm
 #: field:crm.case.stage,section_ids:0
@ -266,18 +266,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr ""
+msgstr "リード分析"

 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "公開"

 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "キャンペーン"

 #. module: crm
 #: view:crm.lead:0 field:crm.lead,state:0 view:crm.lead.report:0
@ -285,19 +285,19 @@ msgstr ""
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "状態"

 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Categories"
-msgstr ""
+msgstr "分類"

 #. module: crm
 #: view:crm.lead:0
 msgid "Dates"
-msgstr ""
+msgstr "日付"

 #. module: crm
 #: help:crm.lead,optout:0
@ -315,7 +315,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "無題"

 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@ -341,7 +341,7 @@ msgstr "連絡先"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "委任"

 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@ -362,7 +362,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "オポチュニティ ミーティング"

 #. module: crm
 #: help:crm.lead.report,delay_close:0 help:crm.phonecall.report,delay_close:0
@ -377,33 +377,33 @@ msgstr ""
 #. module: crm
 #: view:res.partner:0 field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "リードとオポチュニティ"

 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr ""
+msgstr "コミュニケーション"

 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "火曜日"

 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "更新日"

 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "チームリーダー"

 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "アクションを選択"

 #. module: crm
 #: help:crm.case.stage,probability:0
@ -420,17 +420,17 @@ msgstr ""
 #: field:crm.phonecall.report,categ_id:0
 #: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分類"

 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "オポチュニティ / 顧客"

 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#オポチュニティ"

 #. module: crm
 #: view:crm.meeting:0
@ -483,7 +483,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 msgid "Create Opportunity"
-msgstr ""
+msgstr "オポチュニティ作成"

 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@ -496,7 +496,7 @@ msgstr "8月"
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "拡大"

 #. module: crm
 #: view:crm.lead:0
@ -506,7 +506,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "ToDo"

 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@ -528,7 +528,7 @@ msgstr "メール"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "過去7日間の通話"

 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@ -540,7 +540,7 @@ msgstr "10月"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr ""
+msgstr "回答を含む："

 #. module: crm
 #: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
@ -550,7 +550,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "要約"

 #. module: crm
 #: view:crm.segmentation:0
@ -560,7 +560,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "ケース分類"

 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@ -582,12 +582,12 @@ msgstr "終了日"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "スケジュール / 通話記録"

 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "エラー：メールをフォーマットできませんでした。"

 #. module: crm
 #: view:crm.segmentation:0
@ -597,7 +597,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "#通話"

 #. module: crm
 #: help:crm.segmentation,categ_id:0
@ -627,13 +627,13 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "作成月"

 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr ""
+msgstr "作業時間"

 #. module: crm
 #: view:crm.segmentation.line:0
@ -695,12 +695,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,probability:0 field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "確率 (%)"

 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "会社の通貨"

 #. module: crm
 #: view:crm.lead:0
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@ -10,8 +10,6 @@
            <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."/>
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@ -77,7 +77,7 @@
        <field name="inherit_id" ref="document.view_document_directory_form" />
        <field name="type">form</field>
        <field name="arch" type="xml">
-        <page string="Dynamic context" position="after">
+        <page string="Dynamic context" position="after" version="7.0">
        <page string="WebDAV properties">
            <label string="These properties will be added to WebDAV requests" colspan="4" />

--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@ -256,7 +256,7 @@
            <field name="model">hr.payslip</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                <form string="Payslip">
+                <form string="Payslip" version="7.0">
                <header>
                    <button string="Confirm" name="hr_verify_sheet" states="draft"/>
                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
@ -587,7 +587,7 @@
            <field name="model">hr.salary.rule</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                <form string="Salary Rules">
+                <form string="Salary Rules" version="7.0">
                    <label for="name" class="oe_form_readonly_hidden"/>
                    <h1><field name="name"/></h1>
                    <label for="category_id" class="oe_form_readonly_hidden"/>
@ -719,7 +719,7 @@
            <field name="model">hr.payslip.run</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                <form string="Payslips Batches">
+                <form string="Payslips Batches" version="7.0">
                <header>
                    <button name="close_payslip_run" type="object" string="Close" states="draft"/>
                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@ -7,7 +7,7 @@
            <field name="model">l1on_be.vat.declaration</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                <form string="Periodical VAT Declaration">
+                <form string="Periodical VAT Declaration" version="7.0">
                    <header>
                        <button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
                        <button special="cancel" string="Close" icon="gtk-cancel"/>
@ -34,7 +34,7 @@
            <field name="model">l1on_be.vat.declaration</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="Ok" icon="gtk-ok"/>
                    </header>
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@ -50,9 +50,6 @@
            <field name="priority">30</field>
            <field name="arch" type="xml">
            <data>
-                <!-- <xpath expr="/form/notebook/page/group/field[@name='birthday']" position="after">
-                    <field name="marital" required="True"/>
-                </xpath> -->
                <xpath expr="//field[@name='gender']" position="before">
                    <field name="resident_bool" eval="False"/> 
                </xpath>
--- 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-08 02:54+0000\n"
+"PO-Revision-Date: 2012-06-12 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-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"

 #. module: mrp_repair
 #: view:mrp.repair:0
@ -749,7 +749,7 @@ msgstr "修理後"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr "請求中"
+msgstr "請求"

 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@ -16,13 +16,11 @@
                             <field name="product_qty"/>
                             <field name="subproduct_type"/>
                         </tree>
-                         <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 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>
                    </field>
                </page>
--- a/addons/project/i18n/ja.po
+++ b/addons/project/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-09 21:05+0000\n"
+"PO-Revision-Date: 2012-06-11 23:07+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"
+"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"

 #. module: project
 #: view:report.project.task.user:0
@ -1168,7 +1168,7 @@ 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
@ -1614,7 +1614,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
@ -1737,7 +1737,7 @@ msgstr "2月"
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days view:task.by.days:0
 msgid "Task By Days"
-msgstr "日毎のタスク"
+msgstr "日別タスク"

 #. module: project
 #: sql_constraint:res.company:0
@ -1884,10 +1884,10 @@ msgid ""
 "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
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/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-09 20:46+0000\n"
+"PO-Revision-Date: 2012-06-11 23:10+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"
+"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"

 #. module: project_issue
 #: view:project.issue.report:0
@ -144,7 +144,7 @@ msgstr "タスク"
 #. module: project_issue
 #: view:board.board:0
 msgid "Issues By Stage"
-msgstr "工程ごとの問題"
+msgstr "工程別問題"

 #. module: project_issue
 #: field:project.issue,message_ids:0
@ -961,4 +961,4 @@ msgstr "期間"
 #. module: project_issue
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
-msgstr "作成日順の私の開いている問題"
+msgstr "作成日別の私の開いている問題"
--- a/addons/project_issue/i18n/lt.po
+++ b/addons/project_issue/i18n/lt.po
@ -0,0 +1,952 @@
+# Lithuanian 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-11 15:04+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-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+msgid "To Do"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr ""
+
+#. 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 ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. 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 ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:70
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr ""
+
+#. 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 ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:85
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr ""
+
+#. 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 ""
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@ -7,7 +7,7 @@
            <field name="model">project.compute.tasks</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                 <form string="Schedule Tasks">
+                 <form string="Schedule Tasks" version="7.0">
                     <header>
                         <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
--- a/addons/project_messages/i18n/ja.po
+++ b/addons/project_messages/i18n/ja.po
@ -1,112 +0,0 @@
-# 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-11 04:46+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 "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
--- a/addons/project_messages/i18n/sv.po
+++ b/addons/project_messages/i18n/sv.po
@ -1,113 +0,0 @@
-# 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."
--- a/addons/project_planning/i18n/ja.po
+++ b/addons/project_planning/i18n/ja.po
@ -0,0 +1,565 @@
+# 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-11 22:28+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-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\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 "この値は日数で表され、タスク割当済のチェックボックスをFalseにセットした時間割当の合計です。"
+
+#. 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 "この値は日数で表され、タスク割当済のチェックボックスをTrueにセットした時間割当の合計です。"
+
+#. 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 "この値は日数で表され、タスクにリンクされている時間割当の合計です。"
--- a/addons/project_timesheet/i18n/ja.po
+++ b/addons/project_timesheet/i18n/ja.po
@ -0,0 +1,450 @@
+# 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-12 02:02+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-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
+msgid ""
+"You will find here all works made on tasks that you can invoice.\n"
+"In order to invoice the time spent on a project, you must define the\n"
+"pricelist and the field 'Invoice Task Work' on the tab 'Billing' of\n"
+"the project form."
+msgstr ""
+"ここで、請求するタスクの上でなされた作業を見つけることができます。\n"
+"プロジェクト上で費やされた時間の請求のため、価格リストとプロジェクト\n"
+"フォームの請求タブのタスク作業の請求項目を定義する必要があります。"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:55
+#, python-format
+msgid "No employee defined for user \"%s\". You must create one."
+msgstr "ユーザ %s のための従業員が定義されていません。それを作成する必要があります。"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:63
+#, python-format
+msgid ""
+"No journal defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"仕訳帳が関連する従業員に定義されていません。\n"
+"従業員フォームの勤務表タブを埋めて下さい。"
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_timesheettask0
+msgid "Timesheet task"
+msgstr "勤務表タスク"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group by year of date"
+msgstr "日付の年度でグループ化"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task Hours in current month"
+msgstr "今月のタスク時間数"
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
+
+#. module: project_timesheet
+#: field:project.task.work,hr_analytic_timesheet_id:0
+msgid "Related Timeline Id"
+msgstr "関連した時間帯ID"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Tasks by User"
+msgstr "ユーザ別タスク"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task_work
+msgid "Project Task Work"
+msgstr "プロジェクトタスク作業"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:231
+#, python-format
+msgid ""
+"You cannot delete a partner which is assigned to project, we suggest you to "
+"uncheck the active box!"
+msgstr "プロジェクトに割当られているパートナの削除はできません。アクティブボックスのチェックを外すことを推奨します。"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
+msgstr "受注オーダーが起因となる請求書"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr "勤務表 / タスク時間の月間レポート"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Billable"
+msgstr "請求可能"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
+msgid ""
+"You will find here the contracts related to your customer projects in order "
+"to track the invoicing progress."
+msgstr "請求の進行状況を追跡するために、顧客プロジェクトに関連する契約をここで見つけることができます。"
+
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Analytic account/project"
+msgstr "分析アカウント / プロジェクト"
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr "タスク時間数"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: project_timesheet
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
+msgid "Customer Projects"
+msgstr "顧客のプロジェクト"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "分析行"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
+msgid "Task invoice"
+msgstr "タスク請求書"
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_taskwork0
+msgid "Task Work"
+msgstr "タスク作業"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "エラー。再帰的なタスクを作成することはできません。"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
+msgid "Timesheet Lines"
+msgstr "勤務表行"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:231
+#, python-format
+msgid "Invalid action !"
+msgstr "無効なアクションです。"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Billable Project"
+msgstr "請求可能プロジェクト"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
+msgid "Contracts to Renew"
+msgstr "更新契約"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
+msgstr "プロジェクトごとのサインイン / サインアウト"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group by month of date"
+msgstr "日付の月でグループ化"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task
+msgid "Task"
+msgstr "タスク"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks Work"
+msgstr "請求タスク作業"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: project_timesheet
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,name:0
+msgid "Date"
+msgstr "日付"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_timesheettask0
+msgid "Complete Your Timesheet."
+msgstr "勤務表を完了"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task Hours in current year"
+msgstr "今年のタスク時間"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_taskwork0
+msgid "Work on task"
+msgstr "タスクの作業"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+msgid "Bill Tasks Works"
+msgstr "請求タスク作業"
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr "勤務表時間数"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskencoding0
+msgid "Task encoding"
+msgstr "タスクエンコード"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
+msgid "Task summary is comes into the timesheet line"
+msgstr "勤務表行の中にタスク合計があります。"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger Invoice"
+msgstr "起因となる請求書"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task hours of last month"
+msgstr "先月のタスク時間数"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_project
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoicing Data"
+msgstr "請求書データ"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
+msgstr "タスク上で費やした時間のエンコード"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:247
+#, python-format
+msgid "Invalid Analytic Account !"
+msgstr "無効な分析アカウントです。"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:59
+#, python-format
+msgid ""
+"No product defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"関連する従業員の製品が定義されていません。\n"
+"従業員フォームの勤務表タブを埋めて下さい。"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:54
+#: code:addons/project_timesheet/project_timesheet.py:58
+#: code:addons/project_timesheet/project_timesheet.py:62
+#: code:addons/project_timesheet/project_timesheet.py:69
+#, python-format
+msgid "Bad Configuration !"
+msgstr "設定が正しくありません。"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing
+msgid "Invoicing"
+msgstr "請求"
+
+#. module: project_timesheet
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー：再帰的なメンバーを作ることはできません。"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:247
+#, python-format
+msgid ""
+"You cannot select a Analytic Account which is in Close or Cancelled state"
+msgstr "閉じたあるいはキャンセル済状態の分析アカウントは選択できません。"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Month-1 "
+msgstr " 月次-1 "
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
+msgid "After task is completed, Create its invoice."
+msgstr "タスクが完了すると、その請求書を作成します。"
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr "私の勤務表"
+
+#. module: project_timesheet
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "ビューアカウントでは分析行を作ることはできません。"
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoice Task Work"
+msgstr "請求書タスク作業"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:70
+#, python-format
+msgid ""
+"No product and product category property account defined on the related "
+"employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"関連する従業員に製品と、製品分類属性のアカウントが定義されていません。\n"
+"従業員フォームの勤務表タブを埋めて下さい。"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
+#: view:report.timesheet.task.user:0
+msgid "Task Hours Per Month"
+msgstr "月別タスク時間数"
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
+msgid "Fill Timesheet"
+msgstr "タイムシートを埋める"
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@ -143,6 +143,11 @@
                    <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>
+                    <h1>
+                        <label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
+                        <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
+                        <field name="name" class="oe_form_inline" readonly="1"/>
+                    </h1>
                    <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}'/>
@ -150,7 +155,6 @@
                            <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
                        </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"/>
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/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 01:37+0100\n"
-"PO-Revision-Date: 2012-06-08 07:56+0000\n"
+"PO-Revision-Date: 2012-06-11 07:32+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-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
+"X-Generator: Launchpad (build 15389)\n"

 #. module: sale
 #: field:sale.config.picking_policy,timesheet:0
@ -286,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
@ -1399,7 +1399,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr "重建装箱单"
+msgstr "重新打包装"

 #. module: sale
 #: view:sale.order:0 field:sale.order.line,property_ids:0
@ -1955,7 +1955,7 @@ msgstr "税额。"
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr "装箱单"
+msgstr "打包装"

 #. module: sale
 #: view:sale.order.line:0
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@ -127,6 +127,11 @@
                        <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>
+                    <h1>
+                        <label string="Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
+                        <label string="Sale Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
+                        <field name="name" class="oe_form_inline" readonly="1"/>
+                    </h1>
                    <group>
                        <group>
                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
@ -135,7 +140,6 @@
                            <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)]"/>
                        </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"/>
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@ -51,7 +51,7 @@
                                <field name="journal_id"/>
                                <field name="company_id" groups="base.group_multi_company"/>
                            </tree>
-                            <form string="Pulled Paths" version="7.0">
+                            <form string="Pulled Paths">
                                <group>
                                    <group string="Conditions">
                                        <field name="name" placeholder="Fulfill needs on location X from location Y "/>
@ -62,7 +62,7 @@
                                        <field name="company_id"/>
                                    </group>
                                </group>
-                                <group col="4" attrs="{'invisible':[('type_proc','!=','move')]}">
+                                <group attrs="{'invisible':[('type_proc','!=','move')]}">
                                    <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                    <field name="picking_type"/>
                                    <field name="partner_address_id"/>
@ -83,18 +83,16 @@
                                <field name="invoice_state"/>
                                <field name="company_id" groups="base.group_multi_company"/>
                            </tree>
-                            <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>
+                            <form string="Pushed flows">
+                                <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"/>
                            </form>
                        </field>
                    </page>
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@ -12,7 +12,7 @@
            <field name="model">stock.period</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                    <header>
                        <button name="button_open" string="Open" states="draft" type="object"/>
                        <button name="button_close" string="Close" states="open" type="object"/>
@ -81,7 +81,7 @@
            <field name="model">stock.sale.forecast</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                <header>
                    <button name="action_validate" string="Approve" states="draft" type="object" />
                    <field name="state" widget="statusbar"/>
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@ -18,7 +18,7 @@
            <field name="model">survey</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-                <form string="Survey">
+                <form string="Survey" version="7.0">
                <header>
                    <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                    <button name="survey_close" string="Close" states="open" type="object"/>