diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 892747c849f..accdf95d929 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1020,7 +1020,7 @@ class account_move_line(osv.osv):
         }
 
         document = etree.Element('tree', string=title, editable="top",
-                                 refresh="5", on_write="on_create_write",
+                                 on_write="on_create_write",
                                  colors="red:state=='draft';black:state=='valid'")
         fields_get = self.fields_get(cr, uid, flds, context)
         for field, _seq in fld:
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 326f0a6f0b4..786922bf4f8 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-12 01:28+0000\n"
+"PO-Revision-Date: 2012-06-15 22: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-12 04:55+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9119,7 +9119,7 @@ msgstr "買掛金"
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr "今年度"
+msgstr "今年"
 
 #. module: account
 #: view:board.board:0
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index cd1860b6d98..73bf64893ba 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -9,19 +9,16 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Accounting">
-                    <group name="properties">
-                        <separator string="Sales Properties" colspan="2"/>
-                        <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
-                    <newline/>
-                    <group colspan="2">
-                        <separator string="Sale Taxes" colspan="2"/>
-                        <separator string="Purchase Taxes" colspan="2"/>
-                        <field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                        <field name="supplier_taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                    </group>
+                        <group name="properties">
+                            <group>
+                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                            <group>
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
+                                <field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
+                            </group>
+                        </group>
                     </page>
                 </notebook>
             </field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index b6803558b62..cd99299665b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -29,7 +29,7 @@
             </field>
         </record>
 
-        <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
+        <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="type">form</field>
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 6d76cf0ac8f..8f649e0e15e 100644
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "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-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 74dce06b85a..8a79d96d1c4 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/field[@name='property_account_expense']" position="after">
+                <xpath expr="//field[@name='property_account_expense']" position="after">
                     <label string="" colspan="2"/>
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index 758466160c1..abc33dc596f 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-08 01:54+0000\n"
+"PO-Revision-Date: 2012-06-13 17:16+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
+"X-Generator: Launchpad (build 15405)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -169,7 +169,7 @@ msgstr "会社"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr "承認のため"
+msgstr "承認"
 
 #. module: account_budget
 #: view:crossovered.budget:0
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index dba40940166..b0a81461334 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -90,15 +90,32 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Sales Receipt" layout="auto">
-                    <group col="6">
-                        <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                        <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                        <field name="number"/>
-                        <field name="name" colspan="2"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <div class="oe_form_title">
+                        <label for="number" class="oe_form_readonly_hidden"/>
+                        <h1><field name="number" readonly="0" /></h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                            <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                            <field name="name" colspan="2"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="currency_id"/>
+                            <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                            <field name="account_id"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                  domain="[('type','=','liquidity')]"/>
+                            <field name="reference"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                            />
+                            <field name="paid" invisible="1"/>
+                        </group>
                         <field name="type" invisible="True"/>
-                        <field name="currency_id"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
@@ -111,26 +128,21 @@
                                 </tree>
                             </field>
                             <group col="3">
-                                <group string="Internal Notes" col="1">
-                                    <field name="narration"/>
+                                <group colspan="1">
+                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
-                                <group col="2">
-                                    <separator string="Payment Options" colspan="2"/>
-                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                                    <field name="account_id"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                          domain="[('type','=','liquidity')]"/>
-                                         <!-- should select income accounts only. Or use the journal for this ? -->
-                                    <field name="reference"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                    />
-                                    <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                                    <field name="paid" invisible="1"/>
-                                </group>
-                                <group col="4">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
+                                <group>
+                                    <group class="oe_form_subtotal_footer" string="Total">
+                                        <field name="tax_id" 
+                                            on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
+                                            widget="selection"
+                                            domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
+                                        <field name="tax_amount" nolabel="1"/>
+                                        <field name="amount" class="oe_form_subtotal_footer_separator" />
+                                        <button type="object"
+                                            icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </group>                                    
                                 </group>
                             </group>
                         </page>
diff --git a/addons/anonymous/__init__.py b/addons/anonymous/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/anonymous/__openerp__.py b/addons/anonymous/__openerp__.py
new file mode 100644
index 00000000000..6babe973aba
--- /dev/null
+++ b/addons/anonymous/__openerp__.py
@@ -0,0 +1,19 @@
+{
+ 'name': 'Anonymous',
+ 'description': 'Allow anonymous access to OpenERP',
+ 'author': 'OpenERP SA',
+ 'version': '1.0',
+ 'category': 'Tools',
+ 'website': 'http://www.openerp.com',
+ 'installable': True,
+ 'depends': ['web'],
+ 'data': [
+    'anonymous.xml',
+ ],
+ 'js': [
+    'static/src/js/anonymous.js',
+ ],
+ 'qweb': [
+     'static/src/xml/anonymous.xml',
+ ],
+}
diff --git a/addons/anonymous/anonymous.xml b/addons/anonymous/anonymous.xml
new file mode 100644
index 00000000000..36be96db5ad
--- /dev/null
+++ b/addons/anonymous/anonymous.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record model="res.users" id="user">
+        <field name="name">Anonymous</field>
+        <field name="login">anonymous</field>
+        <field name="password">anonymous</field>
+        <field name="groups_id" eval="[(5,)]"/>
+        <field name="avatar">iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAAAAAAZai4+AAAMQElEQVR4nO2ce4wV1R3Hv7/fmbvrPliQZWEXWFgWEFgQBRNI0dZW7euPxliTRhNbW5NatammoaaPNKmpKRYiUunDFzEU28YYkRaiaX0hYhUELApaKG90l2VZdmVl2WXvnPPrH/c1M3d2uWdmePzB75+9d+7Mmc/8zjm/+T3OWRJciMLnGyBcLmLZyEUsG7mIZSNOAm2IQAAQQAAEAhBRrCYprjkVI6GPpkXFIIuHJYYJ6D/Wsb+97fiJk339A0ZVDa8bP3lG4xhAjDofWGIUcOifW3ceOFr026Q5V980CSbq2I2B5To49dILL/YAQE4tkhlf0ABG3Pzta+FG7EqJKEZL1/IZANgJuzMrBpxvvCuio7QeFcsVWTsLUEMogxSh7IEBcc8dVlrabyeoM40cRfjS3ihc0bC0bJoOp5R5lkLT1ghckbC0WV1bqiF20PCB/fiKpq30VUiVRgUozOgUY3mDaHaFKkmXeq5O/XehsTVDEc2dzX3Szqp1XPJTZCRRD4KYw+yFyBJtaVSTxGIxRkKmp6ZNG9nYNZUQEgAyo66ZnQrTizLPw250JYfF+OmHG7ZsukWKuQzeH1B2XJEMhHt10fM4+HHGDPwQRf1IqD1oZ7uS0hbpkfcYDWj51VgT1Jeo4+12vZhYJ8qoOlaAkrqWsGdtt2stMW3lfC6RyWG/n7ZrLvnIh04mcJ+ksYzqWE8hNmqYXTMRAzJWAXvOxABgDN/XporeNEL1sLLzEbF6deDWGr0AtOKFzxa//8g01Nq1HxFrfmUq0FO6UYmb6r37GcctOptkyuhzoS1+NGibBMSU2nTfu1xMBZYpZdoqZoyGRcVevGF1YvGy/lQ65HQj11m+EyMHZH4xrpi/zRpkYhPVHbH0T5PBckVeuQYYJDpTuM82ykgEKy2d38Wg4RnzsI+MZZCRBJaWVy4DDzqkU1hsHZIlgOXKCmeIQMjBl11jG/nEx3JllaJB32GUwhWt1lTxsbS8VD44FQM3tEbIjsTFMuZkS7E7moNycMnP+qPkbOJiubJ8MJNMCvjKZrGOqBPAMiZ9HYUqixygeZVIOgpVeDq2dBFufR9hIaDSbt1d99RDR7tBXCx0HA+LTJUu+8G9U+CWlGxKHivcSSfS1y5aAM2RWz8rVQymn7+6QJsYifkkqhhBYf3gL030nDxwVrSlzNd/4cZs+CxgGbqbB7f7pUn8TuQAAUnVVbGfNjaWMUX2IV0et9H4WJWTHT8X6ZpYoz3TSNzCnT5VbAaq4hUTkQDW2ZH4Qz77XCIioEwKILayktJWvqKpQ3PN1pIMllY4/f7h42r8lfUwiZjCeP5WRlxp/3VLJQA0LjwWrYAYkCSwXHm1GQA7DgPTdyfBlUhAtiYFJzvYHUw7oiM5pAljabO7xjOhU7gtUr3VL/HHp9BDPZ6clque26zsKikhEhtL+MA6b7JUaGBN3DYTwDK0q0vEd2BT/D5IwMik/VUekb2nbJNsRZIAVlFWpNeyNhAiCah7Qk1ANzWXxG00PhaZGXN9LjLTnIqQ4p2dJGAg+E4fBcnXwsoYdhL/VS3QX329YLhS6VnvVMV3bWIbZDFycAJSTABIpVD/XgIvxWRe1R/NBaAUA5gfYY1IsSTk2PQsagaAinlP9SXi2CTjBhpG95ZuU9Ewj5JxAxNzmjOOjZELyWkGIEZAcWP8vFygAdkFukr3IpaNXMSykeg5CI/bEMgk5X/QkVeCRzMQIia8duE/iwDRFMXAWmPliU6o6uwhs9eT6qZ09dgsVNdT82aOBgAtbKk1m04UgYCZobt27HhLLctm14w8s2RYbkkGG17dIAyAzMhh1zW3tMyb05gCRJO3e0u4V0lidDoTK3e/ufLez9cqVG7PuwpGfwsOcsH+s/mg2pUHAaBq7veffKNLRETSbol5gBKwjE6ntYhI/4F/PXzjpDIAoIo3CyG9lr4FcEBE5GCRJ9R35TsoZwBINd+8fENbBi1dQo5iaCxjXNcVETndvfH3d3wus1BGOaqMVspA4TQthyeDATDu9FbqjHtyPhSxykyP8Tfc/+yeUyIi2nWH9soGxzI6nbnDwO7V919bT1kiJoLCbyTtPdeVrWNAYHzTrwotB5vAAIiVwwBQOev2Fe/1ioiYoXo0FMtoN3PJwKH1S2+9fExmMDu5ma5wh0n7r0jLYjhEFfsCvqkr/x6WNxCUXV0/fPpNi9d/rEVE9CBsRTNRRDKrP/p2bv5o5+4OAHBgRPJlAaVv/ENw1SuZk4DA9AXsjXIXPHkrZa2QaIDA9NmJXWtQP+PK2dc0OQxooMi0ebEERkgRYPbv2rHzncMaABPE+BYZsZ73VEVwQRLTAQiQPjozwOW4t+x5wJOSkCyFtLevR/nsBbNmT68BoIXYG8XlsTSYoKAPtW3btr31GAAwS3HlBISb69ygkknvgoDNkaKkCJvvLT4VMNoGADHM6S1bUFl/+fx5k8aVAzCeCqSnQ/v3vHD/9fWZxkL3fWR+QsuJ4JIZIx0jQFBYKoFBJ2n50aA2mzhbNK79wsJ/7Pdemcd6+6HbWioZAKngur+AKPwlmIbU8hYDcPCTIJY2H1YPadyJM/Glqp57558O5NaXZLCMkesBwEmVUMhlXNUXmD6urAABDm4JArty16CrNzxsynEA4Jnc5Rl/iwyanXKGm9ZnfnUbtW1dYHOBoBUMCHrAvgYM/++vJSRKRLsuOFU5MzfsOdfuBNctPc/yWGAmEvaDAMGJgYC26dHPuEQnRdIVjQEswujSE4uaNmz0reIUdg9CAEHHp75mDO9YWXJWiTBlZO5zHmt86OKPcFHmCb+jRt1tGZyj/pXDgiWnSlUWCNNY/NoCGpzSk1Ka1273rhURnGiDAMI9x73aMvzBmtJ3OxCmIu+25Q6Nqyn1ckCod6nvOw71cmZD52H/eb/rLdn9JYOW/Jc8Vk1d6VgwtHa3Tw37cqr+xKMtrXY8V7y+efBGKxrznZf7a6jWIrMo3LPSd/a+3IdDvvMW9ZbcJAijJuYR8lhlE2wSnoZWdhbGMmFPFheefZ1GbX3eKrnbWCdBLNBEGyxR7U/nx6ewuy/Td4SufCsCLHNLnoYAoblgpAtRdVPpUAA0Huss7JHp+iyDJWjPJwPtpiEAzCh8zDVCaLQq1Ig6uDrXQ4JPjufU8ml3buqR/LbPQlkQzCn0VwGrPlgjOUMr9ETOjTI42MPZpk92ZZ/O8NvP22xoI6meWowFNIwo2p8zlBj+z4v5PtqdP9zTmf/4SNoqZJfLxoRpa/gltrWHx3N1Q9mVGwA0kH0pat60tvQ9jAAY44aJ51u2PakaaYel6fUXM6OLB/ZksYTRkZuTj7hWSSrCJOjiTjSYYNMKAMbjGXWw25bXFg6DAGje+He7rZLiefX40m7jLLE0vbyNDWDQ6jGinRmdm0VpuyGhaaoHxoM10RILnP4jAAj29ecXAOEoGNDqjdfsbBbBOxG9WPW2WIbX7WUD4KDHtB/JeBKPpG3r1RO99/dgNdpWJ4W7l8NAsN/TzLEBiOENL1uuhWBMTZkQbRHGVNvWcjX9+bAjjD0ebbX3ADLwYNi+mqGEMM2rXg9WlY1rk4GgnhXQ3F+IpQV9ndDq9ddsdywLZoRiATWWG6oAgFZ1KnS1FuIAlm6QWWLdjuZxXpaCtkzFKNvGYPjQGsLRo4W3DA+0Qb1su18ZhNomr1IKhELjI1S+aWk3DnntuXyC9MMh+8jOJOObJBwLY+3XoGjevUYO+B7nY7xgabMAMGb6pm4BizAqwtIYweO0y3fkY3dZlNLFXN837+u00SKCzYmhLRtafWk1943NVq5D9rLJ/hHkSQZtt4hg86Loi/63xuXFW8HPKISyHb6sawHLSJela5OcMCZ3+DbeeB+sujESVvCaKJUnNF7qO+Ad8qmmSFjBeRKh5kZodnz/GsGjLYNo2kpADFr8T+M1hLDcZZycCKb4NeLDsvVPkxKS8mmDYgHjYBWTJSgN4/0kni+EusrYy9QiCaGp3G+BfVijLVJvSQqhJeWfvz6s2gRWz0URwhWBI14sqR5zTmnyImWBEe8baOfLcJEe0zwEFjD2XNLkhTC8PgDi/2Yb7ycjhCnBf+PgxxoXe410NGkJ3teLRZhwnrCmBw/4tXVpVezVyBHE8LTgIb+2Kkach6lIMnps0KH1YZnhDecBizFhZHDs/B9R17D2kvkawAAAAABJRU5ErkJggg==</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js
new file mode 100644
index 00000000000..a28c56ac411
--- /dev/null
+++ b/addons/anonymous/static/src/js/anonymous.js
@@ -0,0 +1,44 @@
+openerp.anonymous = function(instance) {
+
+    instance.web.client_actions.add("login", "instance.web.Login");
+
+    instance.web.WebClient.include({
+        show_login: function() {
+            var self = this, _super = this._super;
+            this.login.load_db_list().then(function() {
+                var dblist = self.login._db_list;
+                if (dblist && dblist.length === 1) {
+                    self.login.remember_credentials = false;
+                    // XXX get login/pass from server (via a rpc call) ?
+                    self.login.do_login(dblist[0], 'anonymous', 'anonymous').fail(function() {
+                        _super.apply(self, []);
+                    });
+                } else {
+                    _super.apply(self, []);
+                }
+            });
+        },
+    });
+
+
+    instance.web.UserMenu.include({
+        init: function(parent) {
+            this._super(parent);
+            if (this.session.username == 'anonymous') {
+                this.template = 'UserMenu.anonymous';
+                this.do_update = function() {};     // avoid change of avatar
+            }
+        },
+        start: function() {
+            var self = this;
+            this._super.apply(this, arguments);
+            this.$element.find('.oe_topbar_anonymous_login').click(function() {
+                var p = self.getParent();
+                var am = p.action_manager;
+                am.do_action({type:'ir.actions.client', tag:'login'});
+                am.client_widget.on('login', p, p.show_application);
+            });
+        }
+    });
+
+};
diff --git a/addons/anonymous/static/src/xml/anonymous.xml b/addons/anonymous/static/src/xml/anonymous.xml
new file mode 100644
index 00000000000..afa0ac545a6
--- /dev/null
+++ b/addons/anonymous/static/src/xml/anonymous.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+
+<t t-name="UserMenu.anonymous">
+    <ul class="oe_user_menu oe_topbar_item">
+        <li>
+            <a href="#" class="oe_topbar_anonymous_login">
+                <img class="oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/icons/gtk-dialog-authentication.png'"/>
+                Login
+            </a>
+        </li>
+    </ul>
+</t>
+
+</templates>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index fa073938a37..5c83337044c 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -28,37 +28,40 @@
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <field name="email" string="Invitation To"/>
-                            <field name="cutype" string="Invitation Type" />
-                            <field name="rsvp" />
-                            <field name="role" string="Role" />
-                            <field name="sent_by_uid" string="Invitation From" />
+
+                        <div class="oe_form_title">
+                            <label for="email" string="Invitation To" class="oe_form_readonly_hidden" /> 
+                            <h1>
+                                <field name="email" class="oe_form_inline" />
+                                (<field name="language" class="oe_form_inline" />)
+                            </h1>
+                            
+                            <h2>
+                                From <field name="event_date" class="oe_form_inline" />
+                                to <field name="event_end_date" class="oe_form_inline"/>
+                            </h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="sent_by_uid" string="Invitation From" />
+                                <field name="user_id" string="Invited User"/>
+                                <field name="partner_id" string="Contact" />
+                            </group>
+                            <group>
+                                <field name="cutype" string="Invitation Type" />
+                                <field name="role" string="Role" />
+                                <field name="rsvp" />
+                                <field name="ref" readonly="1"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Delegrated From">
+                                <field name="parent_ids" readonly="1" nolabel="1" />
+                            </group>
+                            <group string="Delegrated To" >
+                                <field name="child_ids" readonly="1" nolabel="1" />
+                            </group>
                         </group>
-                        <notebook>
-                            <page string="Invitation">
-                                <group>
-                                    <group string="Invitation Detail">
-                                        <field name="user_id" string="Invited User"/>
-                                        <field name="partner_id" string="Contact" />
-                                    </group>
-                                    <group string="Event Detail">
-                                        <field name="event_date" />
-                                        <field name="event_end_date" />
-                                        <field name="language"/>
-                                        <field name="ref" readonly="1"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="Delegation Info">
-                                <separator string="Delegated From" colspan="4" />
-                                <field name="parent_ids"
-                                    readonly="1" />
-                                <separator string="Delegated To" colspan="4" />
-                                <field name="child_ids"
-                                    readonly="1" />
-                            </page>
-                        </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 02fc3369041..fd3a398845d 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -40,27 +40,6 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
 
-    <act_window
-            id="act_crm_opportunity_crm_phonecall_new"
-            name="Phone calls"
-            groups="base.group_sale_salesman"
-            res_model="crm.phonecall"
-            src_model="crm.lead"
-            view_mode="tree,calendar,form"
-            context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
-    <act_window
-            id="act_crm_opportunity_crm_meeting_new"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="crm.lead"
-            view_mode="tree,form,calendar"
-            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
-            domain="[('opportunity_id', '=', active_id)]"
-            view_type="form"/>
-
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
           <field name="res_model">crm.lead</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 03fcd9c1119..89c38d7671c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,6 +53,25 @@
         <!--
             LEADS
             -->
+        <act_window
+                id="act_crm_opportunity_crm_phonecall_new"
+                name="Phone calls"
+                groups="base.group_sale_salesman"
+                res_model="crm.phonecall"
+                view_mode="tree,calendar,form"
+                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id,'default_partner_phone':phone}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
+        <act_window
+                id="act_crm_opportunity_crm_meeting_new"
+                name="Meetings"
+                res_model="crm.meeting"
+                view_mode="tree,form,calendar"
+                context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+                domain="[('opportunity_id', '=', active_id)]"
+                view_type="form"/>
+
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -78,6 +97,16 @@
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
+                    <div class="oe_right oe_form_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_meeting_new)d"
+                            string="Meetings" />
+
+                        <button type="action"
+                            name="%(act_crm_opportunity_crm_phonecall_new)d"
+                            string="Phone Calls" />
+                    </div>
+
                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
                     <field name="message_thread_read"/>
@@ -226,10 +255,9 @@
                             <ul class="oe_kanban_menu">
                                 <li><a type="edit" >Edit...</a></li>
                                 <li><a type="delete">Delete</a></li>
-                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send New Email</a></li>
+                                <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
                                 <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                 <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
-                                <li><a name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" type="action">Add Internal Note</a></li>
                                 <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                             </ul>
                             <div class="oe_kanban_content">
@@ -369,6 +397,10 @@
         <field name="arch" type="xml">
             <form string="Opportunities" version="7.0">
                 <header>
+                    <button name="stage_previous" string="Previous" type="object"
+                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
+                    <button name="stage_next" string="Next" type="object"  
+                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <button name="case_mark_won" string="Mark Won" type="object"
                             states="draft,open,pending"/>
                     <button name="case_open" string="Open" type="object"
@@ -385,10 +417,6 @@
                             attrs="{'invisible':[('message_thread_read', '==', False)]}"/>
                     <button name="message_mark_as_read" string="Mark Read" type="object"
                             attrs="{'invisible':[('message_thread_read', '==', True)]}"/>
-                    <button name="stage_previous" string="Previous" type="object"
-                            states="open" icon="gtk-go-back" context="{'stage_type': 'opportunity'}"/>
-                    <button name="stage_next" string="Next" type="object"  
-                            states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
                     <field name="stage_id" widget="statusbar"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 5c07e4383ae..16d9a7ebb58 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -40,8 +40,8 @@ class crm_meeting(base_state, osv.Model):
     _columns = {
         # base_state required fields
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]}, \
-                        select=True, help='Sales team to which Case belongs to.'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]},
+                        select=True, groups='base.group_sale_salesman', help='Sales team to which Case belongs to.'),
         'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'write_date': fields.datetime('Write Date' , readonly=True),
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7c0b2f6cfa4..5f94e3d738f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-
     <act_window
         id="crm_case_categ_meet_create_partner"
         name="Schedule a Meeting"
         res_model="crm.meeting"
-        src_model="res.partner"
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
         domain="[('partner_id', '=', active_id)]"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e98ce2ce8f6..9123cf7c305 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,52 +38,62 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet>
-                <group col="6" colspan="4">
-                    <field name="name" string="Title"
-                           required="1" />
-                    <field name="categ_id" widget="selection"
-                        string="Meeting Type"
-                        domain="[('object_id.model', '=', 'crm.meeting')]" />
-                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
-                    <newline/>
-                    <field name="date" string="Start Date" required="1"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="date_deadline" string="End Date" required="1"
-                        on_change="onchange_dates(date,False,date_deadline)" />
-                    <field name="location" />
-                    <field name="alarm_id" string="Reminder"
-                        widget="selection" />
-                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency" string="Recurrence"/>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="name" string="Title"/> 
+                            (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_form_inline"/>
+                            <label for="allday" string="All Day?"/>)
+                        </div>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <h2>
+                            At <field name="location" class="oe_form_inline" />
+                        </h2>
+                    </div>
+                    <h2>
+                        <label for="duration" string="Duration" />
+                        <field name="duration" widget="float_time"
+                            on_change="onchange_dates(date,duration,False,allday)"
+                            class="oe_form_inline"/> from
+                        <field name="date"
+                            string="Start Date" 
+                            required="1"
+                            class="oe_form_readonly_hidden oe_form_inline"/> to
+                        <field name="date_deadline" 
+                            string="End Date" required="1"
+                            on_change="onchange_dates(date,False,date_deadline)"                            
+                            class="oe_form_inline"/> 
+                    </h2>
+                <group colspan="4" col="4">
+                    <group colspan="2">
+                        <field name="user_id" />
+                        <field name="organizer"/>
+                        <field name="section_id" widget="selection"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="alarm_id" string="Reminder" widget="selection" />
+                        <field name="class" string="Privacy"/>
+                        <field name="show_as" string="Show Time as"/>
+                        <field name="recurrency" string="Recurrence" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="partner_id" string="Partner"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="email_from"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="categ_id" widget="selection"
+                            string="Meeting Type"
+                            domain="[('object_id.model', '=', 'crm.meeting')]" />
+                        <field name="rrule" invisible="1" readonly="1"/>
+                        <field name="recurrent_id" invisible="1"/>
+                        <field name="recurrent_uid" invisible="1"/>
                     </group>
                 </group>
+                <separator string="Description" colspan="4" />
+                <field name="description" nolabel="1" colspan="4" />
                 <notebook>
-                <page string="Meeting">
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Assignment"/>
-                            <field name="user_id" />
-                            <field name="organizer"/>
-                            <field name="section_id" widget="selection"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contacts"/>
-                            <field name="partner_id" string="Partner"
-                                on_change="onchange_partner_id(partner_id)" />
-                            <field name="email_from"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
-                            <field name="show_as" string="Show Time as"/>
-                            <field name="rrule" invisible="1" readonly="1"/>
-                            <field name="recurrent_id" invisible="1"/>
-                            <field name="recurrent_uid" invisible="1"/>
-                        </group>
-                    </group>
-                    <separator string="Description" colspan="4" />
-                    <field name="description" nolabel="1" colspan="4" />
-                    </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
@@ -157,12 +167,11 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                    <page string="Recurrence Options"><!-- attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">-->
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string=" Recurrence Pattern" />
                                 <field name="interval" />
-                                <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
@@ -209,9 +218,9 @@
                     </page>
                 </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
             </form>
         </field>
     </record>
@@ -296,7 +305,7 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
                 <field name="arch" type="xml">
-                    <field name="language" position="after">
+                    <field name="ref" position="after">
                         <field name="categ_id" string="Event Type"/>
                     </field>
                 </field>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c6fc9b404a4..b4e65d9aa0a 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -6,7 +6,6 @@
         id="crm_case_categ_phone_create_partner"
         name="Schedule a Call"
         res_model="crm.phonecall"
-        src_model="res.partner"
         view_mode="calendar,tree,form"
         context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
         groups="base.group_sale_salesman"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b5c75aa6ccf..04ab8645215 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -65,50 +65,48 @@
             <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
-                        states="draft,pending" icon="gtk-go-forward"/>
+                        states="draft,pending"/>
                 <button name="case_close" string="Held" type="object"
-                        states="open,pending" icon="gtk-jump-to"/>
+                        states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
-                        states="cancel" icon="gtk-convert"/>
+                        states="cancel"/>
                 <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending" icon="gtk-cancel"/>
+                        states="draft,open,pending"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
-                    icon="gtk-index" type="action"
+                    type="action"
                     attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Schedule Other Call"
-                    icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
+                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
             <sheet string="Phone Call">
+                  <div class="oe_form_title">
+                      <div class="oe_form_readonly_hidden">
+                          <label for="name" string="Title"/> 
+                      </div>
+                      <h1><field name="name" required="1"/></h1>
+                      <div class="oe_form_readonly_hidden">
+                        <label for="partner_phone" string="Phone" />
+                      </div>
+                      <h2><field name="partner_phone"/></h2>
+                  </div>
                  <group col="4">
-                    <field name="name" required="1"/>
-                    <field name="partner_phone"/>
-                    <field name="duration" widget="float_time"/>
-
-                    <field name="date"/>
-                    <field name="user_id"/>
+                    <field name="date" />
+                    <field name="user_id" />
+                    <field name="duration" widget="float_time" />
                     <field name="section_id" colspan="1" widget="selection" />
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
+                    <field name="categ_id" widget="selection"
+                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="partner_mobile" />
+                    <field name="priority"/>
+                    <field name="opportunity_id"/>
                 </group>
 
-                <group>
-                    <group string="Contacts">
-                        <field name="partner_id"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="partner_mobile"/>
-                    </group>
-                    <group string="Categorization">
-                        <field name="categ_id" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="priority"/>
-                        <field name="opportunity_id"/>
-                    </group>
-                </group>
-                <separator string="Description"/>
-                <field name="description"/>
+                <field name="description" placeholder="Description..." />
             </sheet>
             <footer>
                 <field name="message_ids" widget="ThreadView"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b9da39c4721..257d1cd93f7 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -158,13 +158,13 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
+                        <field name="state" string="Related State" />
                         <field name="probability"/>
-                        <field name="on_change"/>
-                        <field name="case_default"/>
-                        <field name="sequence"/>
-                        <field name="state"/>
-                        <field name="fold"/>
                         <field name="type"/>
+                        <field name="on_change"/>
+                        <field name="sequence"/>
+                        <field name="case_default"/>
+                        <field name="fold"/>
                     </group>
                     <separator string="Requirements"/>
                     <field name="requirements" nolabel="1"/>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 78a956f65ac..8ca4e4755ee 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -82,6 +82,27 @@
             </field>
         </record>
 
+
+        <record model="ir.ui.view" id="res_partner_view_buttons">
+            <field name="name">res.partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button type="action"
+                        string="Schedule a Meeting"
+                        name="%(crm.crm_case_categ_meet_create_partner)d"
+                        context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
+                    <button type="action" string="Schedule a Call" 
+                        name="%(crm.crm_case_categ_phone_create_partner)d" 
+                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
+                    <button type="action" string="Create an Opportunity"
+                        name="%(crm.action_view_crm_partner2opportunity)d" />
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index b91b31d7721..ad1a763fa46 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,29 +10,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" layout="manual" version="7.0">
-                <header>
-                    <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                    <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                    <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                </header>
-                <group>
+                    <header>
+                        <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                    </header>
                     <group>
-                        <field name="action"/>
-                        <field name="name"/>
-                        <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        <group>
+                            <field name="action"/>
+                            <field name="name"/>
+                            <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
+                        <group>
+                            <field name="partner_id" readonly="True"/>
+                            <field name="categ_id" string="Type"
+                                widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"
+                            groups="base.group_no_one"/>
+                            <field name="phone"/>
+                            <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
+                            <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                        </group>
                     </group>
-                    <group>
-                        <field name="partner_id" readonly="True"/>
-                        <field name="categ_id" string="Type"
-                            widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"
-                        groups="base.group_no_one"/>
-                        <field name="phone"/>
-                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    </group>
-                </group>
-                <field name="note"/>
+                    <field name="note" placeholder="Call Description" />
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index a65aa4ae5e0..c7641d8f64d 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -42,5 +42,4 @@
             view_mode="form" target="new" view_type="form"
             groups="base.group_sale_salesman"/>
      </data>
-
 </openerp>
diff --git a/addons/crm_claim/i18n/mn.po b/addons/crm_claim/i18n/mn.po
new file mode 100644
index 00000000000..9bbdbc0acab
--- /dev/null
+++ b/addons/crm_claim/i18n/mn.po
@@ -0,0 +1,793 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-17 12:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "Хэрэгийн #"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "Хариуцагч"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "Дараагий үйлдлийн огноо"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "3-р сар"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "Хаахыг азнах"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "Шийдэл"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "Ажиглагчийн и-мэйл"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "#Гомдол"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
+
+#. module: crm_claim
+#: code:addons/crm_claim/crm_claim.py:132
+#, python-format
+msgid "The claim '%s' has been opened."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Date Closed"
+msgstr "Хаагдсан огноо"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "Дотоод тэмдэглэл нэмэх"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "Зурвас"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Date of claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "All pending Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+#: model:ir.model,name:crm_claim.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month of claim"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Year of claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_claim
+#: view:res.partner:0
+msgid "Partners Claim"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+#: field:res.partner,claims_ids:0
+msgid "Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "New Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current year"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Unassigned Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in last month"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My company"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_claim
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress Claims"
+msgstr ""
diff --git a/addons/crm_todo/i18n/mn.po b/addons/crm_todo/i18n/mn.po
new file mode 100644
index 00000000000..189b6ec293b
--- /dev/null
+++ b/addons/crm_todo/i18n/mn.po
@@ -0,0 +1,96 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-17 12:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Хугацааны муж"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "Даалгаварыг цуцлахад"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Дараах"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Миний даалгаврууд"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Сэжим / Боломж"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "Төлөвийг хийгдсэн болгож өөрчлөхөд"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Өмнөх"
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 099754aef06..fb1587b543c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -230,12 +230,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id" position="after">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
@@ -245,12 +243,10 @@
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
             <field name="arch" type="xml">
-                <group name="picking" position="after">
-                    <group string="Weights">
-                        <field name="weight"/>
-                        <field name="weight_net"/>
-                    </group>
-                </group>
+                <field name="picking_id">
+                    <field name="weight"/>
+                    <field name="weight_net"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/google_base_account/i18n/sl.po b/addons/google_base_account/i18n/sl.po
new file mode 100644
index 00000000000..7cbfb60a9c7
--- /dev/null
+++ b/addons/google_base_account/i18n/sl.po
@@ -0,0 +1,119 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-13 22:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
+"X-Generator: Launchpad (build 15405)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr ""
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr ""
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr ""
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9d1ba1c9f05..e2bca73a72e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -93,24 +93,27 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees': fields.function(_no_of_employee, string='Expected Employees', help='Required number of employees in total for that job.',
+        'expected_employees': fields.function(_no_of_employee, string='Total Employees',
+            help='Expected number of employees for this job position after new recruitment.',
             store = {
                 'hr.job': (lambda self,cr,uid,ids,c=None: ids, ['no_of_recruitment'], 10),
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
-        'no_of_employee': fields.function(_no_of_employee, string="Number of Employees", help='Number of employees with that job.',
+        'no_of_employee': fields.function(_no_of_employee, string="Number of Employees",
+            help='Number of employees currently occupying this job position.',
             store = {
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
-        'no_of_recruitment': fields.float('Expected in Recruitment'),
+        'no_of_recruitment': fields.float('Expected in Recruitment', help='Number of new employees you expect to recruit.'),
         'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement'),('old', 'Old')], 'Status', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'), ('recruit', 'In Recruitement')], 'Status', readonly=True, required=True,
+            help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."),
     }
     _defaults = {
         'expected_employees': 1,
@@ -128,10 +131,6 @@ class hr_job(osv.osv):
             context = {}
         return {'value': {'expected_employees': no_of_recruitment + no_of_employee}}
 
-    def job_old(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'old', 'no_of_recruitment': 0})
-        return True
-
     def job_recruitement(self, cr, uid, ids, *args):
         for job in self.browse(cr, uid, ids):
             no_of_recruitment = job.no_of_recruitment == 0 and 1 or job.no_of_recruitment
@@ -209,6 +208,7 @@ class hr_employee(osv.osv):
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
         'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
+        'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
     }
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index bed32142a39..db85a0f76ef 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -8,9 +8,7 @@
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25" groups="base.group_no_one"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
-        <menuitem id="base.menu_hr_reports" parent="hr.menu_hr_root" sequence="40" name="Reporting"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
 
         <!--
         ==========
@@ -31,23 +29,22 @@
                     <div class="oe_form_title">
                         <label for="name" class="oe_form_readonly_hidden"/>
                         <h1><field name="name"/></h1>
+
+                        <label for="company_id" class="oe_form_readonly_hidden" groups="base.group_multi_company"/>
+                        <h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
+
                         <label for="department_id" class="oe_form_readonly_hidden"/>
-                        <h2>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>,
-                            <field name="department_id" on_change="onchange_department_id(department_id)" />
-                        </h2>
+                        <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
                     </div>
                     <notebook>
                         <page string="Personal Information">
                             <group>
-                                <group>
+                                <group string="General">
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                     <field name="active"/>
                                     <field name="parent_id" />
                                 </group>
                                 <group groups="base.group_hr_user" string="Social IDs">
-                                    <field name="ssnid"/>
-                                    <field name="sinid"/>
                                     <field name="identification_id"/>
                                     <field name="passport_id"/>
                                     <field name="otherid"/>
@@ -67,13 +64,13 @@
                                     <field name="work_location"/>
                                 </group>
                                 <group string="Job Information">
-                                    <field name="job_id" domain="[('state','!=','old')]"/>
+                                    <field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                     <field name="coach_id" />
                                 </group>
                             </group>
                         </page>
                         <page string="Categories" groups="base.group_hr_user">
-                            <field name="category_ids"/>
+                            <field name="category_ids" widget="many2many_tags"/>
                         </page>
                         <page string="Notes" groups="base.group_hr_user">
                             <field name="notes"/>
@@ -134,6 +131,7 @@
         <field name="type">kanban</field>
         <field name="arch" type="xml">
             <kanban>
+                <field name="last_login"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -143,6 +141,11 @@
                             <div class="oe_employee_details">
                                 <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                 <ul>
+                                    <li id="last_login">
+                                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                              <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
+                                        </span>
+                                    </li>
                                     <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
                                     <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
@@ -315,7 +318,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="hr.menu_hr_configuration" sequence="1"/>
+            parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories Structure</field>
@@ -352,24 +355,27 @@
                 <form string="Job" version="7.0">
                     <header>
                         <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                        <button name="job_open" string="In Position" states="old,recruit" type="object"/>
-                        <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
+                        <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                            <field name="name" />
-                            <field name="department_id" />
-                            <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                            <field name="no_of_employee"/>
-                            <field name="expected_employees"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="department_id" />
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
+                            <group>
+                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                                <field name="no_of_employee"/>
+                                <field name="expected_employees"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">
-                                <separator string="Job Description"/>
+                                <label for="description"/>
                                 <field name="description"/>
-                                <separator string="Requirements"/>
+                                <label for="requirements"/>
                                 <field name="requirements"/>
                             </page>
                             <page string="Employees">
@@ -421,9 +427,26 @@
                     <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
-             </field>
-         </record>
-
+            </field>
+        </record>
+        
+        <record id="view_hr_job_employee_form" model="ir.ui.view">
+            <field name="name">hr.job.employee.form</field>
+            <field name="model">hr.job</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <form string="Job" version="7.0">
+                    <group col="4">
+                        <field name="name" />
+                        <field name="department_id" />
+                    </group>
+                    <label for="description"/>
+                    <field name="description"/>
+                </form>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window" id="action_hr_job">
             <field name="name">Job Positions</field>
             <field name="res_model">hr.job</field>
@@ -435,7 +458,7 @@
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
-        <menuitem parent="hr.menu_hr_management" id="menu_hr_job" action="action_hr_job" sequence="6"/>
+        <menuitem parent="hr.menu_hr_configuration" id="menu_hr_job" action="action_hr_job" sequence="6"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index ae51e209305..44cb5bcc2da 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -187,7 +187,8 @@ msgstr "أنثى"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -280,8 +281,8 @@ msgstr "التصنيفات"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "الموظفون المتوقعون"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -701,7 +702,12 @@ msgstr "المرؤوسين"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Holidays"
@@ -760,6 +766,9 @@ msgstr ""
 #~ "employees."
 #~ msgstr "ويتيح لك انشاء وادارة التقييم الدوري واستعراض اداء الموظفين."
 
+#~ msgid "Expected Employees"
+#~ msgstr "الموظفون المتوقعون"
+
 #~ msgid "No of Employee"
 #~ msgstr "رقم الموظف"
 
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index 410142dcc22..8840d539127 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Жена"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,8 +272,8 @@ msgstr "Категории"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Очаквани служители"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -684,7 +685,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
@@ -775,6 +781,9 @@ msgstr ""
 #~ msgid "Expenses"
 #~ msgstr "Разходи"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Очаквани служители"
+
 #~ msgid "Payroll"
 #~ msgstr "Ведомост"
 
diff --git a/addons/hr/i18n/bn.po b/addons/hr/i18n/bn.po
index 0673f969dfa..45de6e608a8 100644
--- a/addons/hr/i18n/bn.po
+++ b/addons/hr/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "মহিলা"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,7 +685,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 7802baa76ef..83e53a7e9e4 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Ženski"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,7 +684,12 @@ msgstr "Podređeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index 44901828469..711077cd2e5 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Dona"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Categories"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleats previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -710,7 +711,12 @@ msgstr "Subordinats"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
@@ -918,6 +924,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Progrés de la configuració"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empleats previstos"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "Nombre total d'empleats necessaris per a aquest treball."
 
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index 5ebbbdc2af7..e6e6942be00 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
@@ -190,8 +190,9 @@ msgstr "Žena"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Celkový požadovaný počet zaměstnanců pro úlohu."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -283,8 +284,8 @@ msgstr "Kategorie"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekávaní zaměstnanci"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -696,8 +697,13 @@ msgstr "Podřízení"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Počet zaměstnanců"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
 #~ msgstr "Zjednodušuje správu docházky zaměstnance"
@@ -753,6 +759,9 @@ msgstr "Počet zaměstnanců"
 #~ "Můžete rozšířit základní aplikaci HR instalováním několika funkčností "
 #~ "souvisejících s HR."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekávaní zaměstnanci"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Průběh nastavení"
 
@@ -853,3 +862,9 @@ msgstr "Počet zaměstnanců"
 
 #~ msgid "Employee's Contracts"
 #~ msgstr "Smlouvy zaměstnance"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Celkový požadovaný počet zaměstnanců pro úlohu."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Počet zaměstnanců"
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index b5d15ee60ad..b2e37c54c43 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,5 +685,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 6967f4ec754..f3b7886f694 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -198,8 +198,9 @@ msgstr "Weiblich"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Notwendige Anzahl von Mitarbeiter um diesen Job zu erledigen."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -291,8 +292,8 @@ msgstr "Kategorien"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Stellenbedarf"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -725,8 +726,13 @@ msgstr "Unterstellte Mitarbeiter"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Anzahl der Mitarbeiter"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Arbeitszeiten Kategorien"
@@ -898,6 +904,9 @@ msgstr "Anzahl der Mitarbeiter"
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Konfiguration Personalwesen"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Stellenbedarf"
+
 #~ msgid "Image"
 #~ msgstr "Bild"
 
@@ -1010,3 +1019,9 @@ msgstr "Anzahl der Mitarbeiter"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Untergeordnete Hierarchie"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Notwendige Anzahl von Mitarbeiter um diesen Job zu erledigen."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Anzahl der Mitarbeiter"
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index fe4c89ec881..cdb7f8d1d45 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -181,7 +181,8 @@ msgstr "Γυναίκα"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -274,7 +275,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -686,7 +687,12 @@ msgstr "Υφιστάμενοι"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/en_AU.po b/addons/hr/i18n/en_AU.po
index d03337c2323..7b5e463c3b9 100644
--- a/addons/hr/i18n/en_AU.po
+++ b/addons/hr/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "Female"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,5 +685,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index 7340fe3a3cc..3ce25860d53 100644
--- a/addons/hr/i18n/en_GB.po
+++ b/addons/hr/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -191,7 +191,8 @@ msgstr "Female"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -284,8 +285,8 @@ msgstr "Categories"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Expected Employees"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -706,7 +707,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -761,6 +767,9 @@ msgstr ""
 #~ msgid "Holidays"
 #~ msgstr "Holidays"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Expected Employees"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 8f693764de1..e7a2b7cf18e 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -194,8 +194,9 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número total de empleados necesarios para ese trabajo"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -719,8 +720,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de empleados"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Categorías horarios de trabajo"
@@ -883,6 +889,9 @@ msgstr "Número de empleados"
 #~ msgid "No of Employee"
 #~ msgstr "Nº de empleado"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
+
 #~ msgid ""
 #~ "Lets you create and manage the periodic evaluation and performance review of "
 #~ "employees."
@@ -1007,3 +1016,9 @@ msgstr "Número de empleados"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Jerarquía subirdinada"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de empleados"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número total de empleados necesarios para ese trabajo"
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index 92120bc7403..ca32378a760 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,7 +684,12 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index fa86f0c2dd7..ede0fe99bab 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -711,7 +712,12 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -777,6 +783,9 @@ msgstr ""
 #~ "Puede mejorar la aplicación de recursos humanos base mediante la instalación "
 #~ "de algunas funcionalidades relacionadas con RRHH."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso configuración"
 
diff --git a/addons/hr/i18n/es_CR.po b/addons/hr/i18n/es_CR.po
index 8378839bd8d..9453feb99e3 100644
--- a/addons/hr/i18n/es_CR.po
+++ b/addons/hr/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "Language: \n"
 
 #. module: hr
@@ -195,8 +195,9 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número de empleados en total para ese trabajo."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,8 +289,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -720,8 +721,16 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de empleados"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
 
 #~ msgid "Categories structure"
 #~ msgstr "Estructura de categorías"
@@ -1008,3 +1017,9 @@ msgstr "Número de empleados"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Jerarquía subirdinada"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número de empleados en total para ese trabajo."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de empleados"
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 96c4a33b4df..bbe7c705e83 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -196,8 +196,9 @@ msgstr "Mujer"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número de empleados requeridos en total para este puesto"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -289,8 +290,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empleados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -719,8 +720,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de Empleados"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Work Email"
 #~ msgstr "E-mail de Trabajo"
@@ -848,5 +854,14 @@ msgstr "Número de Empleados"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo inválido en la definición de acción."
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número de empleados requeridos en total para este puesto"
+
+#~ msgid "Expected Employees"
+#~ msgstr "Empleados previstos"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Organigrama Jerárquico"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de Empleados"
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index eb56633435d..994f4b49a41 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Naine"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,7 +684,12 @@ msgstr "Alluvad"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 99f87260a79..a0002294366 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -186,8 +186,9 @@ msgstr "Nainen"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Tehtävään vaadittava kokonaishenkilömäärä"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -279,8 +280,8 @@ msgstr "Kategoriat"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Odotetut työntekijät"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -691,8 +692,13 @@ msgstr "Alaiset"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Henkilöstön määrä"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Sunnuntai"
@@ -917,6 +923,9 @@ msgstr "Henkilöstön määrä"
 #~ "Mahdollistaan määräaikaisarviointien ja suorituskykyanalyysien tekemisen "
 #~ "työntekijöille."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Odotetut työntekijät"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "Tarvittava kokonaishenkilömäärä työtä varten."
 
@@ -948,5 +957,11 @@ msgstr "Henkilöstön määrä"
 #~ msgid "Recruitment Process"
 #~ msgstr "Rekrytointiprosessi"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Tehtävään vaadittava kokonaishenkilömäärä"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Alaishierarkia"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Henkilöstön määrä"
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 53d120d2079..f5bcb0f7ea4 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -194,8 +194,9 @@ msgstr "Féminin"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Nombre requis d'employés total pour ce poste"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Catégories"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Employés attendus"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -718,8 +719,13 @@ msgstr "Subordonnés"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Nombre d'employés"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Catégories de Temps de Travail"
@@ -886,6 +892,9 @@ msgstr "Nombre d'employés"
 #~ msgid "Image"
 #~ msgstr "Image"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Employés attendus"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "C'est lié au directeur du département"
 
@@ -997,5 +1006,11 @@ msgstr "Nombre d'employés"
 #~ msgid "Employee Marital Status"
 #~ msgstr "État civil de l'employé"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Nombre requis d'employés total pour ce poste"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Hiérarchie"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Nombre d'employés"
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index edb80992b63..76637e2000c 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,5 +685,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index e4999ddcb39..d3519531a8e 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -191,7 +191,8 @@ msgstr "Muller"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -284,8 +285,8 @@ msgstr "Categorías"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Empregados previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -710,7 +711,12 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -769,6 +775,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Número de empregados con ese traballo."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Empregados previstos"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index 0b59d72ea56..2793adc05c3 100644
--- a/addons/hr/i18n/gu.po
+++ b/addons/hr/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0 field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "જરૂરીયાતો"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -35,7 +35,7 @@ msgstr ""
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "કર્મચારીને માહિતી સાથે સંલિગ્ન કરો."
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -47,17 +47,17 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "માનવ સંશાધન"
 
 #. module: hr
 #: view:hr.employee:0 view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "ગ્રુપ દ્વારા..."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "તમારા વિભાગો બનાવો"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -73,7 +73,7 @@ msgstr ""
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
 #: field:hr.job,department_id:0 view:res.users:0
 msgid "Department"
-msgstr ""
+msgstr "વિભાગ"
 
 #. module: hr
 #: view:hr.job:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "કાર્યો"
 
 #. module: hr
 #: view:hr.job:0
@@ -94,12 +94,12 @@ msgstr ""
 #: field:hr.department,company_id:0 view:hr.employee:0 view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "કંપની"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "ભરતીમાં અપેક્ષિત"
 
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
@@ -170,7 +170,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "ઓળખ નંબર"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -179,7 +179,8 @@ msgstr "સ્ત્રી"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -200,23 +201,23 @@ msgstr ""
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "વંશજ વર્ગ(શ્રેણી)"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "કાર્યની વિગત"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "કાર્યાલયનું સ્થાન"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "મારા વિભાગના કર્મચારી"
 
 #. module: hr
 #: view:hr.employee:0 model:ir.model,name:hr.model_hr_employee
@@ -227,7 +228,7 @@ msgstr "કર્મચારી"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "અન્ય માહિતી"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -248,12 +249,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr.open_board_hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard_user
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "માનવ સંશાધન ડેશબોર્ડ"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "કાર્ય"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -263,22 +264,22 @@ msgstr "સભ્યો"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "રુપરેખાંકન"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,category_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "વર્ગો"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "અપેક્ષિત કર્મચારીઓ"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr ""
+msgstr "છુટાછેડા લીધેલ"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -296,7 +297,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_department_tree
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr ""
+msgstr "વિભાગો"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
@@ -684,9 +685,17 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
 msgstr ""
 
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#~ msgid "Expected Employees"
+#~ msgstr "અપેક્ષિત કર્મચારીઓ"
+
 #~ msgid "Attendances"
 #~ msgstr "હાજરી"
 
@@ -695,3 +704,30 @@ msgstr ""
 
 #~ msgid "Expenses"
 #~ msgstr "ખર્ચાઓ"
+
+#~ msgid "title"
+#~ msgstr "શીર્ષક"
+
+#~ msgid "Simplifies the management of employee's attendances."
+#~ msgstr "કર્મચાર્યોની હાજરીનું સંચાલન સરળ બનાવે છે."
+
+#~ msgid "Holidays"
+#~ msgstr "રજાના દિવસો"
+
+#~ msgid "Employee Marital Status"
+#~ msgstr "કર્મચારીની વૈવાહિક સ્થિતિ"
+
+#~ msgid "Employee's Contracts"
+#~ msgstr "કર્મચારીના કરારો"
+
+#~ msgid "Position"
+#~ msgstr "સ્થાન"
+
+#~ msgid "Employee Passport Information"
+#~ msgstr "કર્મચારી પાસપોર્ટ માહિતી"
+
+#~ msgid "Periodic Evaluations"
+#~ msgstr "સામયિક મૂલ્યાંકનો"
+
+#~ msgid "Image"
+#~ msgstr "ચિત્ર"
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index af7f0969475..47742bcada6 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "स्त्री"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,7 +685,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 8301b35a6c4..b1aad05bba9 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "Language: hr\n"
 
 #. module: hr
@@ -195,8 +195,9 @@ msgstr "Žensko"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Ukupan broj potrebnih zaposlenika za taj posao"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,8 +289,8 @@ msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekivano djelatnika"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -715,8 +716,13 @@ msgstr "Podređeni djelatnici"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Broj djelatnika"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -898,6 +904,9 @@ msgstr "Broj djelatnika"
 #~ "Moguće je povećati mogućnosti aplikacije ljudskih resursa instalacijom "
 #~ "nekoliko funkcionalnosti povezanih sa odjelom ljudskih resursa."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekivano djelatnika"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Tijek konfiguracije"
 
@@ -993,5 +1002,11 @@ msgstr "Broj djelatnika"
 #~ msgid "Configure"
 #~ msgstr "Promijeni postavke"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Ukupan broj potrebnih zaposlenika za taj posao"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Podređena hijerarhija"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Broj djelatnika"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index c0f57787a35..b04780b980a 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -197,7 +197,7 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid "Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -290,7 +290,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -702,5 +702,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index e60c45ac809..e6935d03848 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -185,7 +185,8 @@ msgstr "Nő"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -278,8 +279,8 @@ msgstr "Kategóriák"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Javasolt alkalmazottak"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -693,7 +694,12 @@ msgstr "Beosztottak"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -765,6 +771,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "Alkalmazott sorszáma"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Javasolt alkalmazottak"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Beállítási folyamat"
 
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index c5abd4e8dc3..4028b863ab7 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -194,8 +194,9 @@ msgstr "Perempuan"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Dibutuhkan sejumlah karwayan untuk pekerjaan ini"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Kategori"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Karyawan yang diharapkan"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -718,8 +719,13 @@ msgstr "Bawahan"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Jumlah Karyawan"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
 #~ msgstr "Menyederhanakan pengelolaan kehadiran karyawan."
@@ -768,6 +774,9 @@ msgstr "Jumlah Karyawan"
 #~ msgid "Number of employee with that job."
 #~ msgstr "Jumlah pegawai dengan pekerjaan itu."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Karyawan yang diharapkan"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -872,5 +881,11 @@ msgstr "Jumlah Karyawan"
 #~ msgid "Generic Payroll system Integrated with Accountings."
 #~ msgstr "Generik sistem Penggajian Terintegrasi  dengan  Pembukuan."
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Dibutuhkan sejumlah karwayan untuk pekerjaan ini"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Susunan Subordinat"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Jumlah Karyawan"
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 5da4967c6de..9c6cef19a93 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -191,7 +191,8 @@ msgstr "Femmina"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -284,8 +285,8 @@ msgstr "Categorie"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Dipendenti previsti"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -711,7 +712,12 @@ msgstr "Subordinati"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
@@ -861,6 +867,9 @@ msgstr ""
 #~ "Errore ! Non è possibile selezionare un dipartimento di cui il dipendente è "
 #~ "manager."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Dipendenti previsti"
+
 #~ msgid "Number of employee with that job."
 #~ msgstr "Numero di dipendenti con quel lavoro"
 
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index b7d2655f45f..1d55bf70a80 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -183,8 +183,9 @@ msgstr "女"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "この職種に必要な従業員の数"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -276,8 +277,8 @@ msgstr "区分"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "従業員候補"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -691,11 +692,25 @@ msgstr "部下"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "従業員数"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "この職種に必要な従業員の数"
+
+#~ msgid "Expected Employees"
+#~ msgstr "従業員候補"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "下位の階層構造"
 
 #~ msgid "Categories structure"
 #~ msgstr "カテゴリー体系"
+
+#~ msgid "Number of Employees"
+#~ msgstr "従業員数"
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index ad557d0bb25..af56e12d5d1 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "여성"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,7 +685,12 @@ msgstr "종속"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Work Email"
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index e30af6a51ff..5769cf62066 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,5 +685,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 6dc0134341e..097ac71e0d5 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Moteris"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,7 +684,12 @@ msgstr "Pavaldiniai"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index c6d9cbf05f0..ddccb725516 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Sieviete"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Kategorijas"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Gaidāmie Darbinieki"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -706,7 +707,12 @@ msgstr "Pakļautie"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Work Email"
@@ -906,6 +912,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Ļauj periodiski veikt darbinieku novērtējumu un efektivitātes uzskaiti."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Gaidāmie Darbinieki"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for human resource management. You can manage:\n"
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index 19cfd44c0a5..b8b71574ff8 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -195,8 +195,9 @@ msgstr "Женски"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Потребен број на вработени за тоа работно место"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,8 +289,8 @@ msgstr "Категории"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Потребен број"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -715,7 +716,12 @@ msgstr "Подредени"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Simplifies the management of employee's attendances."
@@ -775,6 +781,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Број на вработени на одреденото работно место/позиција."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Потребен број"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -882,3 +891,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Генерички систем на Платните Списоци интегрирани со Сметководствената Бизнис "
 #~ "Апликација."
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Потребен број на вработени за тоа работно место"
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index d9e1b2664fd..225ad5e9b5b 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -189,8 +189,9 @@ msgstr "эм"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Тус албан тушаалд шаардлагатай нийт ажиллагсдын тоо"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -282,8 +283,8 @@ msgstr "Зэрэглэл"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Нийт орон тоо"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -703,8 +704,13 @@ msgstr "Харьяалагдсан"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Ажиллагсдын тоо"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Ням"
@@ -880,6 +886,9 @@ msgstr "Ажиллагсдын тоо"
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Хүний нөөцийн модулийн тохиргоо"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Нийт орон тоо"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Харагдацын архитектурын xml алдаатай !"
 
@@ -978,3 +987,9 @@ msgstr "Ажиллагсдын тоо"
 
 #~ msgid "Configure Your Human Resources Application"
 #~ msgstr "Хүний Нөөцийн Аппликэшныг Тохируулах"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Тус албан тушаалд шаардлагатай нийт ажиллагсдын тоо"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Ажиллагсдын тоо"
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index dc62e39a4bb..31e4bbeb932 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "Kvinne"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr "Kategorier"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,7 +685,12 @@ msgstr "Underordnet"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "title"
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 446398d8f58..23f9b319c93 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -193,8 +193,9 @@ msgstr "Vrouw"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Benodigd totaal aantal werknemers voor de functie."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -286,8 +287,8 @@ msgstr "Categorieën"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Verwachte werknemers"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -714,8 +715,13 @@ msgstr "Ondergeschikten"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Aantal werknemers"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Zondag"
@@ -993,5 +999,14 @@ msgstr "Aantal werknemers"
 #~ msgid "Configure Your Human Resources Application"
 #~ msgstr "Configureer uw HR applicatie"
 
+#~ msgid "Number of Employees"
+#~ msgstr "Aantal werknemers"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Benodigd totaal aantal werknemers voor de functie."
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Hiërarchische ondergeschikte"
+
+#~ msgid "Expected Employees"
+#~ msgstr "Verwachte werknemers"
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index 770273532f4..00a2b92398b 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,7 +684,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 3336e1a628c..bcb504df9c8 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -182,7 +182,8 @@ msgstr "Kobieta"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -275,13 +276,13 @@ msgstr "Kategorie"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Spodziewana liczba pracowników"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr "Rozwiedziony"
+msgstr "Rozwiedziony(a)"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -687,7 +688,12 @@ msgstr "Podlegli"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
@@ -866,6 +872,9 @@ msgstr ""
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Konfiguracja kadr"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Spodziewana liczba pracowników"
+
 #~ msgid "Image"
 #~ msgstr "Obraz"
 
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 3f0e52d69b8..e730b62c0d2 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -34,7 +34,7 @@ msgstr "Erro! Não pode criar departamentos recursivos."
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Ligue o colaborador à informação"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -194,8 +194,9 @@ msgstr "Feminino"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número de funcionários necessário no total para esse trabalho."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -287,8 +288,8 @@ msgstr "Categorias"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Funcionários previstos"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -504,7 +505,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr "Painel de Controlo"
+msgstr "Painel"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -718,8 +719,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de Funcionários"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Domingo"
@@ -934,6 +940,9 @@ msgstr "Número de Funcionários"
 #~ msgstr ""
 #~ "Regista ausências dos funcionários, requisições de colocação e planeamento"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Funcionários previstos"
+
 #~ msgid "Employee Hierarchy"
 #~ msgstr "Hierarquia dos funcionários"
 
@@ -986,6 +995,9 @@ msgstr "Número de Funcionários"
 #~ "    * Cargos\n"
 #~ "    "
 
+#~ msgid "Number of Employees"
+#~ msgstr "Número de Funcionários"
+
 #~ msgid "title"
 #~ msgstr "Título"
 
@@ -1001,3 +1013,6 @@ msgstr "Número de Funcionários"
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Hierarquia Subordinada"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número de funcionários necessário no total para esse trabalho."
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index d98d7a31f95..f7f392663a9 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -182,8 +182,9 @@ msgstr "Feminino"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "Número total de funcionários requeridos para fazer esta tarefa."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -275,8 +276,8 @@ msgstr "Categorias"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Funcionários Esperados"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -690,8 +691,13 @@ msgstr "Subordinados"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Número de Funcionários"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Sunday"
 #~ msgstr "Domingo"
@@ -912,6 +918,9 @@ msgstr "Número de Funcionários"
 #~ "Permite criar e gerenciar a avaliação periódica e revisar o desempenho de "
 #~ "funcionários."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Funcionários Esperados"
+
 #~ msgid "Employee Passport Information"
 #~ msgstr "Informação do Passaporte do Funcionário"
 
@@ -949,3 +958,9 @@ msgstr "Número de Funcionários"
 #~ "    * Departamentos de RH\n"
 #~ "    * Cargos de RH\n"
 #~ "    "
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Número total de funcionários requeridos para fazer esta tarefa."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Número de Funcionários"
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index f4e2c59fa4d..a26c493ac32 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -24,17 +24,17 @@ msgstr "Utilizator OpenERP"
 #. module: hr
 #: view:hr.job:0 field:hr.job,requirements:0
 msgid "Requirements"
-msgstr "Cerințe"
+msgstr "Cerinte"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Eroare! Nu puteţi crea departamente recursive."
+msgstr "Eroare! Nu puteti crea departamente recursive."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr "Conectează angajatul la informaţii"
+msgstr "Conectati angajatul la informatii"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -46,17 +46,17 @@ msgstr "Nr SIN"
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Resurse umane"
+msgstr "Resurse Umane"
 
 #. module: hr
 #: view:hr.employee:0 view:hr.job:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Creati-va Departamentele"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -67,11 +67,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
-"Pozitiile de locuri de muncă sunt folosite pentru a defini posturile şi "
-"cerinţele lor. Puteţi ţine evidenţa numărului de salariaţi per post şi la "
-"câţi vă aşteptaţi în viitor. De asemenea, aveţi posibilitatea să ataşaţi un "
-"sondaj la un post de muncă care va fi utilizat în procesul de recrutare "
-"pentru a evalua candidatii pentru acest loc de muncă."
+"Nivelul functiilor sunt folosite pentru a defini posturile si cerintele lor. "
+"Puteti sa tineti evidenta numarului de salariati per post si la cati va "
+"asteptati in viitor. De asemenea, aveti posibilitatea sa atasati un sondaj "
+"la o functie care va fi utilizat in procesul de recrutare pentru a evalua "
+"candidatii pentru aceasta functie."
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
@@ -82,12 +82,12 @@ msgstr "Departament"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr "Marchează ca veche"
+msgstr "Marcheaza ca vechi(e)"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr "Locuri de muncă"
+msgstr "Locuri de munca"
 
 #. module: hr
 #: view:hr.job:0
@@ -98,7 +98,7 @@ msgstr "In recrutare"
 #: field:hr.department,company_id:0 view:hr.employee:0 view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr "Companie"
+msgstr "Compania"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
@@ -108,7 +108,7 @@ msgstr "Asteptat in recrutare"
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "Managementul RU"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -127,7 +127,7 @@ msgstr "Leaga un utilizator de un angajat"
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr "Departament superior"
+msgstr "Departament Superior"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,notes:0
@@ -137,7 +137,7 @@ msgstr "Note"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Married"
-msgstr "Căsătorit(ă)"
+msgstr "Casatorit(a)"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_create_hr_employee_installer
@@ -147,6 +147,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Creati formularul angajatilor si conectati-i la un utilizator OpenERP daca "
+"doriti ca ei sa acceseze aceasta instanta. Categoriile pot fi configurate pe "
+"angajati pentru a efectua operatiuni masive pentru toti angajatii din "
+"aceeasi categorie, de ex. alocarea concediilor."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -155,15 +159,15 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
-"Structura Departamentelor Companiei dumenavoastra este folosita pentru a "
+"Structura Departamentelor Companiei dumneavoastra este folosita pentru a "
 "gestiona toate documentele referitoare la angajati per departamente: "
-"validarea cheltuielilor si a foii de pontaj, managementul zilelor libere, "
+"validarea cheltuielilor si a fisei de pontaj, managementul zilelor libere, "
 "recrutari, etc."
 
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Index culori"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -171,7 +175,7 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
-"Campul asociat utilizatorului in formularul Angajatului permite conectarea "
+"Campul asociat utilizatorului in Formularul Angajatului permite conectarea "
 "utilizatorului OpenERP (si drepturile acestuia/acesteia) la angajat."
 
 #. module: hr
@@ -182,22 +186,23 @@ msgstr "In recrutare"
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr "CNP"
+msgstr "Nr. de identificare"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr "Feminin"
+msgstr "Femeie"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Prezenta"
 
 #. module: hr
 #: view:hr.employee:0
@@ -207,23 +212,23 @@ msgstr "ID-uri sociale"
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr "Telefon birou"
+msgstr "Telefon la serviciu"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "Categorii subordonate"
+msgstr "Categorii Subordonate"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr "Fișa postului"
+msgstr "Fisa postului"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr "Locaţie birou"
+msgstr "Locatia biroului"
 
 #. module: hr
 #: view:hr.employee:0
@@ -239,7 +244,7 @@ msgstr "Angajat"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr "Alte informații"
+msgstr "Alte informatii"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -249,7 +254,7 @@ msgstr "E-mail serviciu"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr "Data nașterii"
+msgstr "Data nasterii"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -265,7 +270,7 @@ msgstr "Tablou de bord Resurse Umane"
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
 msgid "Job"
-msgstr "Loc de muncă"
+msgstr "Loc de munca"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -284,18 +289,18 @@ msgstr "Categorii"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Angajati estimati"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr "Divorțat(ă)"
+msgstr "Divortat(a)"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Categorie părinte"
+msgstr "Categorie parinte (superioara)"
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -313,7 +318,7 @@ msgstr "Departamente"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Contact angajat"
+msgstr "Contact Angajat"
 
 #. module: hr
 #: view:board.board:0
@@ -323,19 +328,19 @@ msgstr "Consiliul meu"
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr "Masculin"
+msgstr "Barbat"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr "Categorii de salariaţi"
+msgstr "Categorii de angajati"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Categorie angajat"
+msgstr "Categorie aAgajat"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
@@ -345,12 +350,12 @@ msgstr "Contract angajat"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "hr.department (departament.resurse_umane)"
+msgstr "departament.resurse_umane"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Creati-va Angajatii"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -375,28 +380,28 @@ msgstr ""
 "proprietari specifice in sistem. Pastrati toate informatiile legate de "
 "angajati si tineti evidenta a tot ceea ce trebuie sa fie inregistrat pentru "
 "ei. Tabul informatiilor personale va va ajuta sa pastrati datele lor de "
-"identificare. Tabul Categorii va da posibilitatea de a le atribui categorii "
-"asociate de angajati in functie de pozitia si activitatile lor in cadrul "
-"companiei. O categorie poate fi un nivel superior in cadul companiei sau a "
-"unui departament. Tabul Foi de pontaj va permite sa le atribuiti o foaie de "
-"pontaj specifica si un jurnal analitic unde vor putea introduce timpul in "
+"identificare. Tabul Categorii va da posibilitatea sa le atribuiti categorii "
+"asociate de angajati in functie de pozitia si activitatile lor din cadrul "
+"companiei. O categorie poate fi un nivel superior in cadrul companiei sau al "
+"unui departament. Tabul Fise de pontaj va permite sa le atribuiti o fisa de "
+"pontaj specifica si un jurnal analitic unde vor putea introduce orele in "
 "sistem. In tabul note, puteti introduce date text care vor fi inregistrate "
 "pentru un anumit angajat."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr "Cont bancar pentru salariu al angajatului"
+msgstr "Cont bancar pentru salariul angajatului"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr "Notă"
+msgstr "Nota"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Structură angajaţi"
+msgstr "Structura Angajati"
 
 #. module: hr
 #: constraint:res.users:0
@@ -407,12 +412,12 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "Informații de contact"
+msgstr "Informatii de contact"
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr "Adresă serviciu"
+msgstr "Adresa de la serviciu"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
@@ -423,7 +428,7 @@ msgstr "Tablou de bord Manager Resurse Umane"
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Departamente subordonate"
+msgstr "Departamente Subordonate"
 
 #. module: hr
 #: view:hr.employee:0
@@ -439,22 +444,22 @@ msgstr "Structura categoriilor"
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr "necunoscut(ă)"
+msgstr "necunoscut(a)"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees with that job."
-msgstr ""
+msgstr "Numarul de angajati cu acel post."
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "Număr de securitate socială (CNP)"
+msgstr "Nr de SS (Securitate Sociala)"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr "Activ"
+msgstr "Activ(a)"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -473,11 +478,14 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Structura departamentelor d-voastra este folosita pentru a gestiona toate "
+"documentele asociate angajatilor pe departamente: validarea cheltuielilor si "
+"a fisei de pontaj, gestionarea concediilor, recrutari, etc."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account Number"
-msgstr "Numar cont bancar"
+msgstr "Numar de cont bancar"
 
 #. module: hr
 #: view:hr.department:0
@@ -491,12 +499,12 @@ msgid ""
 "information."
 msgstr ""
 "In formularul Angajatului, exista mai multe tipuri de informatii, cum ar fi "
-"Informatii de contact."
+"Informatiile de contact."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Tablou de bord"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -516,57 +524,57 @@ msgstr "Stare"
 #. module: hr
 #: field:hr.employee,marital:0
 msgid "Marital Status"
-msgstr "Stare civilă"
+msgstr "Stare civila"
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr "ir.actions.act_window"
+msgstr "ir.actiuni.act_fereastra"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr "Forma şi structura angajați"
+msgstr "Formular si structura angajati"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr "Fotografie"
+msgstr "Poza"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr "res.users (res.utilizatori)"
+msgstr "res.utilizatori"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr "Informații personale"
+msgstr "Informatii Personale"
 
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Oras"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr "Nr. pașaport"
+msgstr "Nr pasaport"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Mobil serviciu"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Categorii salariaţi"
+msgstr "Categorii Salariati"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "Adresa de acasă"
+msgstr "Adresa de acasa"
 
 #. module: hr
 #: view:hr.job:0
@@ -576,7 +584,7 @@ msgstr "Descriere"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Single"
-msgstr "Necăsatorit(ă)"
+msgstr "Necasatorit(a)"
 
 #. module: hr
 #: field:hr.job,name:0
@@ -591,27 +599,27 @@ msgstr "In pozitie"
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr "departamnet"
+msgstr "departament"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr "Naţionalitate"
+msgstr "Nationalitate"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Concedii"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr "Manager consiliu RU"
+msgstr "Panou Manager RU"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr "Resursă"
+msgstr "Resursa"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -634,12 +642,12 @@ msgstr "Sex"
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
-msgstr "Angajați"
+msgstr "Angajati"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr "Număr de Asigurări Sociale"
+msgstr "Numar Asigurari Sociale"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -649,7 +657,7 @@ msgstr "Nume departament"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr "Număr Asigurare Socială"
+msgstr "Numar Asigurare Sociala"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -659,12 +667,12 @@ msgstr "Crearea unui utilizator OpenERP"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Autentificare"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr "Informații despre funcție"
+msgstr "Informatii despre functie"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -675,7 +683,7 @@ msgstr "Pozitii functie"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Alt Id"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
@@ -685,32 +693,37 @@ msgstr "Instructor"
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Numele functiei trebuie sa fie unic per companie!"
 
 #. module: hr
 #: view:hr.job:0
 msgid "My Departments Jobs"
-msgstr ""
+msgstr "Locurile de munca din Departamentele mele"
 
 #. module: hr
 #: field:hr.department,manager_id:0 view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr "Manager"
+msgstr "Director"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Widower"
-msgstr "Văduv"
+msgstr "Vaduv"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr "Subordonaţi"
+msgstr "Subordonati"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Work Email"
@@ -776,9 +789,6 @@ msgstr ""
 #~ msgid "Employee Complete Form"
 #~ msgstr "Formular complet al salariatului"
 
-#~ msgid "Categories structure"
-#~ msgstr "Structura categoriilor"
-
 #~ msgid "Timesheet Line"
 #~ msgstr "Linie foaie de pontaj"
 
@@ -918,6 +928,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "Numarul de angajati cu acel loc de munca."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Angajati estimati"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -992,3 +1005,15 @@ msgstr ""
 
 #~ msgid "Generic Payroll system Integrated with Accountings."
 #~ msgstr "Sistemul General de Salarizare integrat cu Contabilitatea."
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Numarul necesar de angajati per total pentru acea munca."
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Ierarhie Subordonata"
+
+#~ msgid "Categories structure"
+#~ msgstr "Structura categorii"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Numarul de Angajati"
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 5d532420d19..f37f8c8a661 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -56,7 +56,7 @@ msgstr "Объеденить по..."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Укажите ваши отделы"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -108,7 +108,7 @@ msgstr "Планируется набрать"
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "Управление кадрами"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -147,6 +147,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Создать сотрудника и добавить ссылку на пользователя OpenERP, если вы "
+"желаете предоставить ему доступ. Категории могут быть указаны для "
+"сотрудников для применения массовых операций на всех сотрудниках данной "
+"категории."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -162,7 +166,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -190,13 +194,14 @@ msgstr "Женский"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Посещаемость"
 
 #. module: hr
 #: view:hr.employee:0
@@ -283,8 +288,8 @@ msgstr "Категории"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Планируется сотрудников"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -349,7 +354,7 @@ msgstr "hr.department"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Создайте ваших сотрудников."
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -443,7 +448,7 @@ msgstr "неизвестен"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees with that job."
-msgstr ""
+msgstr "Количество сотрудников с данной работой."
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -472,6 +477,9 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Структура отделов используется для управления документами, относящимся к "
+"сотрудникам по отделам: проверки расходов и расписания, управления "
+"посещаемостью, набор новых сотрудников и т. д."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -495,7 +503,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Инфо-панель"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -545,7 +553,7 @@ msgstr "Личные данные"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Город"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
@@ -555,7 +563,7 @@ msgstr "№ паспорта"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Рабочий сотовый телефон"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -600,7 +608,7 @@ msgstr "Национальность"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Отпуска"
 
 #. module: hr
 #: view:board.board:0
@@ -658,7 +666,7 @@ msgstr "Создание пользователя OpenERP"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Имя пользователя системы"
 
 #. module: hr
 #: view:hr.employee:0
@@ -674,7 +682,7 @@ msgstr "Штатное расписание"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Other Id"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
@@ -684,7 +692,7 @@ msgstr "Тренер"
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Название должности в компании должно быть уникальным!"
 
 #. module: hr
 #: view:hr.job:0
@@ -709,7 +717,12 @@ msgstr "Подчиненные"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
@@ -912,6 +925,9 @@ msgstr ""
 #~ "Вы можете улучшить базовое приложение \"Кадры\" подключив некоторый "
 #~ "дополнительный функционал."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Планируется сотрудников"
+
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Связано с руководителем подразделения"
 
@@ -991,3 +1007,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Позволяет создавать и управлять периодическими собеседованиями и "
 #~ "анализировать производительность сотрудников."
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Дерево субординации"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Общее необходимое число сотрудников для данной работы."
+
+#~ msgid "Number of Employees"
+#~ msgstr "Количество сотрудников"
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 4b247150c1b..06ece4aa7ae 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "Žena"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,7 +685,12 @@ msgstr "Podriadený"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Working Time Categories"
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index e6766fe9f8b..32d9813d1c0 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "Ženska"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,7 +684,12 @@ msgstr "Podrejeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index bae2ed10614..f4357b53752 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:03+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,7 +273,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -684,5 +685,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index 80f385bcd84..f7249d858ff 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -183,7 +183,8 @@ msgstr "Žensko"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -276,8 +277,8 @@ msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekivani zapopljeni"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -690,7 +691,12 @@ msgstr "Podređeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
@@ -752,6 +758,9 @@ msgstr ""
 #~ msgid "Human Resources Application Configuration"
 #~ msgstr "Konfiguracija Aplikacije Ljudskih Resursa"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekivani zapopljeni"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za pregled arhitekture"
 
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index aa5c0402cc9..83fef687b95 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Žensko"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Očekivani zapošljeni"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -707,7 +708,12 @@ msgstr "Podređeni"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
@@ -826,6 +832,9 @@ msgstr ""
 #~ "Možete da povećate bazu HR Aplikacija instaliranjem nekolikoHR-vezanih "
 #~ "funkcionalnosti."
 
+#~ msgid "Expected Employees"
+#~ msgstr "Očekivani zapošljeni"
+
 #~ msgid ""
 #~ "Lets you create and manage the periodic evaluation and performance review of "
 #~ "employees."
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 4542d3e51bc..52964d2e5fd 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -34,7 +34,7 @@ msgstr "Fel! Det går inte att skapa rekursiva avdelningar!"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Knyt anställd till information"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -67,6 +67,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Befattningar används för att definiera arbetsuppgifter och deras krav. Du "
+"kan hålla reda på antalet anställda du har per befattning och hur många du "
+"förväntar dig i framtiden. Du kan också bifoga en enkät till ett befattning "
+"som kommer att användas i rekryteringsprocessen för att utvärdera de sökande "
+"för denna befattning."
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
@@ -77,7 +82,7 @@ msgstr "Avdelning"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Märk som gammal"
 
 #. module: hr
 #: view:hr.job:0
@@ -98,7 +103,7 @@ msgstr "Företag"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Väntas i rekryteringen"
 
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
@@ -111,6 +116,8 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Företag som är knutet till den aktuella anställde. Bokföringstransaktioner "
+"kommer att registreras på detta företag som tillhör denna anställd."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -140,6 +147,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Formulär för registrering av anställda och knyt dem till OpenERP-användare "
+"of du vill att de skall kunna logga in. Kategorier kan sättas på anställda "
+"för att utföra massåtgärder för alla anställda i samma kategori, t ex "
+"semesterplanering."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -148,6 +159,9 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Din bolags avdelningsstruktur används för att hantera alla handlingar som "
+"rör anställda per avdelningar: kostnader och tidrapport utvärderingar,  "
+"ledigheter och rekryteringar, etc."
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -160,11 +174,13 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"I relationsfältet för i anställningsformuläret gör det möjligt att koppla "
+"OpenERP-användaren (och hennes rättigheter) till den anställde."
 
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "I rekrytering"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -178,7 +194,8 @@ msgstr "Kvinna"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -267,11 +284,11 @@ msgstr "Konfiguration"
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,category_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -337,7 +354,7 @@ msgstr "hr.department"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Registrera dina anställda"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -358,11 +375,21 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Här kan du hantera din arbetsstyrka genom att skapa anställda och ge dem "
+"specifika egenskaper i systemet. Underhåll information om den anställde "
+"hålla koll på allt som måste registreras för dem. Den personliga "
+"informationsfliken hjälper dig att underhålla identitetsdata. Kategorifliken "
+"ger dig möjlighet att tilldela kategorier beroende på den anställdes "
+"befattning och verksamhet inom företaget. En kategori kan vara t ex ange "
+"senioritet inom företaget eller en avdelning. Tidrapportfliken kan tilldela "
+"dem en särskild tidrapport och objektjournal där de kommer att kunna mata in "
+"tid i systemet. I noteringsfliken kan du ange text data som ska registreras "
+"för en viss anställd."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Anställds lönekonto"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -377,7 +404,7 @@ msgstr "Struktur för de anställda"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Detta bolag är inte tillåtet för den här användaren"
 
 #. module: hr
 #: view:hr.employee:0
@@ -393,7 +420,7 @@ msgstr "adress"
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Personalchefens infopanel"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -448,6 +475,9 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Din avdelningsstruktur används för att administrera alla dokument relaterade "
+"till anställda per avdelning; utlägg och tidrapporter, utvärderingar, "
+"semesterplanering, rekrytering etc."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -465,6 +495,8 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"I anställningsformuläret finns olika typer av information, t ex "
+"kontaktinformation."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
@@ -494,12 +526,12 @@ msgstr "Civilstånd"
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.actions.act_window"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Anställdsformulär och struktur"
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -509,7 +541,7 @@ msgstr "Bild"
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: hr
 #: view:hr.employee:0
@@ -559,7 +591,7 @@ msgstr "Jobbnamn"
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "I befattning"
 
 #. module: hr
 #: view:hr.department:0
@@ -579,7 +611,7 @@ msgstr "Frånvaro"
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Personaladministrationsinfopanel"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -612,7 +644,7 @@ msgstr "Anställda"
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Försäkringsnummer"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -622,12 +654,12 @@ msgstr "Avdelningsnamn"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Personnummer"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Skapa OpenERP-användare"
 
 #. module: hr
 #: field:hr.employee,login:0
@@ -648,7 +680,7 @@ msgstr "Platser"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Annat ID"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
@@ -658,12 +690,12 @@ msgstr "Tränare"
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Namnet på befattningen måste vara unikt per bolag!"
 
 #. module: hr
 #: view:hr.job:0
 msgid "My Departments Jobs"
-msgstr ""
+msgstr "Min avdelnings arbeten"
 
 #. module: hr
 #: field:hr.department,manager_id:0 view:hr.employee:0
@@ -683,8 +715,13 @@ msgstr "Underordnad"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "Antal anställda"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Work Email"
 #~ msgstr "E-post arbete"
@@ -810,3 +847,15 @@ msgstr "Antal anställda"
 
 #~ msgid "Employee Complete Form"
 #~ msgstr "Employee Complete Form"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Antal anställda"
+
+#~ msgid "Expected Employees"
+#~ msgstr "Väntade anställda"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Krävt antal anställda totalt för detta arbete."
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Underlydande hierarki"
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 1bc8ade24a0..6429e4e7fc9 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,7 +179,8 @@ msgstr "หญิง"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -272,8 +273,8 @@ msgstr "ประเภท"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "พนักงานที่คาดหวัง"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -684,7 +685,12 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Holidays"
@@ -724,6 +730,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "จำนวนพนักงาน"
 
+#~ msgid "Expected Employees"
+#~ msgstr "พนักงานที่คาดหวัง"
+
 #~ msgid "Recruitment Process"
 #~ msgstr "ขั้นตอนการสรรหา"
 
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index 5d1f03f1631..aad9b400fa2 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,5 +684,10 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 34647db68ce..7c8fa91b1f4 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -190,7 +190,8 @@ msgstr "Kadın"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -283,8 +284,8 @@ msgstr "Kategoriler"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "Beklenen Personel"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -706,7 +707,12 @@ msgstr "Emrindekiler"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
@@ -908,6 +914,9 @@ msgstr ""
 #~ msgid "Periodic Evaluations"
 #~ msgstr "Süreli Değerlendirmeler"
 
+#~ msgid "Expected Employees"
+#~ msgstr "Beklenen Personel"
+
 #~ msgid "Helps you manage and streamline your recruitment process."
 #~ msgstr "Eleman seçme işleminizi yönetmenizi ve yürütmenizi sağlar."
 
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 03df4fc2447..ca77650ba5c 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,7 +272,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
+msgid "Total Employees"
 msgstr ""
 
 #. module: hr
@@ -683,7 +684,12 @@ msgstr "Підлеглі"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Sunday"
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index 6378c34f2da..d975ce5fdda 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -19,8 +19,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -195,7 +195,8 @@ msgstr "Nữ"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -288,8 +289,8 @@ msgstr "Loại"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "nhân viên dự kiến"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -713,7 +714,12 @@ msgstr "Người cấp dưới"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Group name"
@@ -913,6 +919,9 @@ msgstr ""
 #~ msgid "Number of employee with that job."
 #~ msgstr "số lượng nhân viên đang làm việc trong công viêc"
 
+#~ msgid "Expected Employees"
+#~ msgstr "nhân viên dự kiến"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 9715ce63c34..d9c1b6ea882 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -179,8 +179,9 @@ msgstr "女性"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
-msgstr "该职位所需的总员工数"
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -272,8 +273,8 @@ msgstr "分类"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "预期员工数"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -689,8 +690,13 @@ msgstr "下属"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
-msgstr "员工数"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr ""
 
 #~ msgid "Group name"
 #~ msgstr "组名"
@@ -874,6 +880,9 @@ msgstr "员工数"
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "错误！您不能选择一部门因为该员工是经理。"
 
+#~ msgid "Expected Employees"
+#~ msgstr "预期员工数"
+
 #~ msgid ""
 #~ "You can enhance the base HR Application by installing few HR-related "
 #~ "functionalities."
@@ -957,5 +966,11 @@ msgstr "员工数"
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "该职务需要的员工数。"
 
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "该职位所需的总员工数"
+
+#~ msgid "Number of Employees"
+#~ msgstr "员工数"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "隶属结构"
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index b7116843ae5..82d0de304cd 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -178,7 +178,8 @@ msgstr "女"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Required number of employees in total for that job."
+msgid ""
+"Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -271,8 +272,8 @@ msgstr "分類"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
-msgid "Expected Employees"
-msgstr "預期員工數目"
+msgid "Total Employees"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -683,7 +684,12 @@ msgstr "下屬"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of Employees"
+msgid "Number of employees currently occupying this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
 msgstr ""
 
 #~ msgid "Group name"
@@ -725,6 +731,9 @@ msgstr ""
 #~ msgid "No of Employee"
 #~ msgstr "員工數目"
 
+#~ msgid "Expected Employees"
+#~ msgstr "預期員工數目"
+
 #~ msgid "Image"
 #~ msgstr "圖像"
 
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 0f72d37f32f..5e4c3052858 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,12 +3,12 @@
     <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">HR Officer</field>
+        <field name="name">Officer</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">HR Manager</field>
+        <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
diff --git a/addons/hr/test/open2recruit2close_job.yml b/addons/hr/test/open2recruit2close_job.yml
index 0f14828694c..5a01b55439b 100644
--- a/addons/hr/test/open2recruit2close_job.yml
+++ b/addons/hr/test/open2recruit2close_job.yml
@@ -26,13 +26,13 @@
   !python {model: hr.employee}: |
     self.write(cr, uid, [ref('employee_niv')], {'job_id':ref('job_developer')})
 -
-  Now I dont want to recruit new employee for this position. so I mark it as Old.
+  Now I dont want to recruit new employee for this position. so I mark it as Open.
 -
   !python {model: hr.job}: |
-    self.job_old(cr, uid, [ref('job_developer')])
+    self.job_open(cr, uid, [ref('job_developer')])
 -
   I check 'state' and number of 'Expected in Recruitment' after closing the Job position.
 -
-  !assert {model: hr.job, id: job_developer, string: Job position is in 'old' state and no_of_recruitment = 0}:
-    - state == 'old'
+  !assert {model: hr.job, id: job_developer, string: Job position is in 'open' state and no_of_recruitment = 0}:
+    - state == 'open'
     - no_of_recruitment == 0
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c2c964565ad..1934c975ae2 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -123,7 +123,7 @@
         <menuitem
             sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
             groups="base.group_no_one"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" />
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_no_one"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 6f2ad46e913..67bd4d930e0 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -72,7 +72,7 @@
                         <field name="employee_id" />
                         <field name="job_id"/>
                         <field name="wage"/>
-                        <field name="type_id" widget="selection"/>
+                        <field name="type_id"/>
                     </group>
                     <notebook>
                         <page string="Information" name="information">
@@ -176,7 +176,7 @@
             <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
 
-        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
+        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6" groups="base.group_no_one"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Contracts Button on Employee Form -->
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 710c33f12b9..982ea1c4000 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -265,7 +265,7 @@
             <field name="help">Each employee may be assigned an Appraisal Plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and attach interviews to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager.</field>
         </record>
 
-        <menuitem name="Appraisal" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
+        <menuitem name="Appraisals" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
             action="open_view_hr_evaluation_tree" groups="base.group_hr_user"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 2cf5a930b4d..753b33fa706 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -100,7 +100,6 @@
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
     <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
 
     </data>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index c007f2c2509..e6b51958e1c 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -118,7 +118,6 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
     <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
 
 </data>
diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
index 1c7c6280f8b..dfb4924c631 100644
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
-            <field name="name">Leaves To Validate</field>
+            <field name="name">Leaves to Approve</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 55222b6fb26..d4beb79820e 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -76,12 +76,12 @@ class hr_holidays_status(osv.osv):
         'name': fields.char('Leave Type', size=64, required=True, translate=True),
         'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
         'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
-        'double_validation': fields.boolean('Apply Double Validation', help="If its True then its Allocation/Request have to be validated by second validator")
+        'double_validation': fields.boolean('Apply Double Validation', help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved."),
     }
     _defaults = {
         'color_name': 'red',
@@ -280,6 +280,7 @@ class hr_holidays(osv.osv):
                     'date': record.date_from,
                     'end_date': record.date_to,
                     'date_deadline': record.date_to,
+                    'leave_id': record.id,
                 }
                 case_id = meeting_obj.create(cr, uid, vals)
                 self._create_resource_leave(cr, uid, [record], context=context)
@@ -398,11 +399,11 @@ class hr_holidays(osv.osv):
         for obj in self.browse(cr, uid, ids):
             if obj.holiday_status_id.double_validation:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>validated</b>. A second validation is necessary and is now pending.")
+                    _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
             else:
                 self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>validated</b>. The validation process is now over.")
+                    _("The %s request has been <b>approved</b>. The validation process is now over.")
                     % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
     
     def holidays_valid2_notificate(self, cr, uid, ids, context=None):
@@ -514,9 +515,14 @@ class hr_employee(osv.osv):
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
         'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
         'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),        
-        'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1)
     }
 
 hr_employee()
 
+class crm_meeting(osv.osv):
+    _inherit = 'crm.meeting'
+    _columns = {
+        'leave_id': fields.many2one('hr.holidays','Leave'),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index b312d79c03d..c5045d7b318 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -20,7 +20,7 @@
     <record model="hr.holidays.status" id="holiday_status_comp">
       <field name="name">Compensatory Days</field>
       <field name="limit">True</field>
-      <field name="color_name">brown</field>
+      <field name="color_name">lavender</field>
     </record>
 
     <!--Unpaid Leave -->
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 4c8ec39a1af..14d4cb99562 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -3,7 +3,7 @@
     <data>
 
         <report id="report_holidays_summary"
-                string="Summary Of Leaves"
+                string="Leaves Summary"
                 model="hr.holidays"
                 name="holidays.summary"
                 xsl="hr_holidays/report/holidays_summary.xsl"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8ab02b528c5..dfe16a33357 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -16,7 +16,7 @@
                         <filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                         <filter icon="terp-go-month" name="This Month-1" string=" Month-1"
                          domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Holidays during last month"/>
+                         help="Leaves during last month"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id">
                             <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
@@ -284,7 +284,7 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
-        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
+        <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">
             <field name="name">Requests Approve</field>
@@ -493,8 +493,6 @@
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
                     <field name="remaining_leaves"/>
-                    <field name="current_leave_id"/>
-                    <field name="current_leave_state" attrs="{'invisible':[('current_leave_id','=',False)]}"/>
                 </field>
             </field>
         </record>
@@ -505,25 +503,29 @@
             <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
             <field name="arch" type="xml">
                 <xpath expr="//templates" position="before">
+                    <field name="current_leave_id"/>
                     <field name="current_leave_state"/>
-                    <field name="last_login"/>
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
-                    <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
-                        <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
-                            <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
-                                <field name="current_leave_id"/>
-                            </span>
-                        </span>
-                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
-                            <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
-                        </span>
-                    </li>
+                <xpath expr="//div[@class='oe_employee_details']/ul/li[@id='last_login']" position="inside">
+                    <span t-if="record.current_leave_id.raw_value" style="font-size: 100%%"
+                            t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_button oe_kanban_color_3':'oe_kanban_button oe_kanban_color_2'"
+                            t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')">
+                        <field name="current_leave_id"/>
+                    </span>
                 </xpath>
             </field>
         </record>
 
+        <act_window
+            id="act_hr_leave_request_to_meeting"
+            name="Leave Meetings"
+            src_model="hr.holidays"
+            res_model="crm.meeting"
+            domain="[('leave_id', '=', active_id)]"
+            view_mode="tree,form,calendar,gantt"
+            view_type="form"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index bbf8d4b36bf..d556b94cb06 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-12 20:01+0000\n"
-"Last-Translator: amani ali <applepie9911@yahoo.com>\n"
+"Last-Translator: Pioneer Solutions <wzaki_dotcom@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-13 04:50+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -39,7 +39,7 @@ msgstr "الحد الاقصى للترك المسموح - اتخذ بالفعل
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "ادارة الاجازات"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -127,6 +127,10 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"يمكن تسجيل طلبات الاجازه من قبل الموظفين والتصديق عليها من قبل مديريهم. "
+"بمجرد التحقق من صحة طلب الإجازة، تبدو تلقائيا في جدول الأعمال للموظف. يمكنك "
+"تحديد أنواع عدة بدل (الإجازات المدفوعة الأجر، والمرض، وما إلى ذلك) وإدارة "
+"البدلات لكل نوع."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
@@ -204,6 +208,8 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"اختر 'طلب اجازة \"اذا كان هناك من يريد أن يأخذ يوما للعطلة.\n"
+"اختر 'طلب تخصيص \"إذا كنت ترغب في زيادة عدد الاجازات المتاحة لشخص ما"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -221,7 +227,7 @@ msgstr "التحقّق"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "تحذير !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -315,7 +321,7 @@ msgstr "موظف"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "جديد"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -385,9 +391,9 @@ msgstr "اختر موظف أو فئة"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "اذا كانت القيمة صحيح فالتوزيع/الطلبات ستطلب مرة ثانية للتحقق"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -426,7 +432,7 @@ msgstr "ارجواني"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "شهر"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -534,7 +540,7 @@ msgstr "أجازات للتحقق من صحة"
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "خطأ ! لايمكنك انشاء تسلسل هرمي عودي  للعاملين"
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
@@ -549,7 +555,7 @@ msgstr "الموافقة الاولى"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "غير مدفوعة"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -757,11 +763,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"إذا بالتعليم، سيسمح النظام، لموظفين هذا القسم ان يأخذو اجازات اكثر من المتاح "
-"لهم."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -799,7 +803,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "نمط"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
@@ -821,7 +825,7 @@ msgstr "تاريخ البدء"
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "طلبات التوزيع"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -846,12 +850,12 @@ msgstr "للتأكيد"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "السّنة"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
+msgstr "للموافقة"
 
 #~ msgid "Holidays"
 #~ msgstr "الأعياد"
@@ -877,3 +881,87 @@ msgstr ""
 
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "الموارد البشرية: إدارة الاجازات"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "إذا بالتعليم، سيسمح النظام، لموظفين هذا القسم ان يأخذو اجازات اكثر من المتاح "
+#~ "لهم."
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "اذا كانت القيمة صحيح فالتوزيع/الطلبات ستطلب مرة ثانية للتحقق"
+
+#~ msgid ""
+#~ "Human Resources: Holidays tracking and workflow\n"
+#~ "\n"
+#~ "    This module allows you to manage leaves and leaves' requests.\n"
+#~ "    Implements a dashboard for human resource management that includes.\n"
+#~ "        * My Leaves\n"
+#~ "        * My Expenses\n"
+#~ "    Note that:\n"
+#~ "    - A synchronisation with an internal agenda (use of the CRM module) is "
+#~ "possible: in order to automatically create a case when an holiday request is "
+#~ "accepted, you have to link the holidays status to a case section. You can "
+#~ "set up this info and your colour preferences in\n"
+#~ "                HR / Configuration / Holidays Status\n"
+#~ "    - An employee can make an ask for more off-days by making a new "
+#~ "Allocation It will increase his total of that leave type available (if the "
+#~ "request is accepted).\n"
+#~ "    - There are two ways to print the employee's holidays:\n"
+#~ "        * The first will allow to choose employees by department and is used "
+#~ "by clicking the menu item located in\n"
+#~ "                HR / Holidays Request / Print Summary of Holidays\n"
+#~ "        * The second will allow you to choose the holidays report for "
+#~ "specific employees. Go on the list\n"
+#~ "                HR / Employees / Employees\n"
+#~ "            then select the ones you want to choose, click on the print icon "
+#~ "and select the option\n"
+#~ "                'Print Summary of Employee's Holidays'\n"
+#~ "    - The wizard allows you to choose if you want to print either the "
+#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
+#~ "be set up by a user from the group 'HR'. You can define these features in "
+#~ "the security tab from the user data in\n"
+#~ "                Administration / Users / Users\n"
+#~ "            for example, you maybe will do it for the user 'admin'\n"
+#~ "            .\n"
+#~ msgstr ""
+#~ "ألموارد البشرية: تعقب الاجازات و سير العمل\n"
+#~ "هذا النموذج يسمح لك لإدارة الأوراق وطلبات الإجازات \".\n"
+#~ "وتنفذ لوحة القيادة لإدارة الموارد البشرية التي تتضمن.\n"
+#~ "* بلادي أوراق\n"
+#~ "* بلادي النفقات\n"
+#~ "ملاحظة ما يلي:\n"
+#~ "- وتزامن مع جدول أعمال داخلي (استخدام وحدة إدارة علاقات العملاء) هو ممكن: من "
+#~ "أجل خلق حالة تلقائيا عندما يتم قبول طلب عطلة، لديك لربط حالة العطل إلى قسم "
+#~ "القضية. يمكنك إعداد هذه المعلومات والتفضيلات الخاصة بك في اللون\n"
+#~ "الموارد البشرية / تكوين / العطل الحالة\n"
+#~ "- يمكن للموظف تقديم طلب أيام خارج أكثر من خلال جعل توزيع جديد أنه سيزيد "
+#~ "مجموع له من هذا النوع إجازة المتاحة (في حال قبول الطلب).\n"
+#~ "- هناك طريقتان لطباعة العطل الموظف:\n"
+#~ "* وسيكون أول تسمح لاختيار الموظفين من خلال قسم ويستخدم من خلال النقر على "
+#~ "عنصر القائمة الموجود في\n"
+#~ "الموارد البشرية / العطل طلب / ملخص طباعة من العطل\n"
+#~ "* والثانية تسمح لك لاختيار تقرير العطل للموظفين محددة. يذهب على لائحة\n"
+#~ "الموارد البشرية / الموظفين / العاملين\n"
+#~ "ثم حدد تلك التي تريد أن تختار، انقر على أيقونة الطباعة وحدد الخيار\n"
+#~ "\"ملخص طباعة من العطل الموظف '\n"
+#~ "- المعالج تسمح لك لاختيار ما إذا كنت تريد طباعة إما العطلات مؤكد والمصادق "
+#~ "عليها أو فقط تلك التحقق من صحتها. يجب أن يتم تعيين هذه الدول حتى من قبل "
+#~ "مستخدم من \"الموارد البشرية\" للمجموعة. يمكنك تحديد هذه الخصائص في علامة "
+#~ "التبويب أمان من بيانات المستخدم في\n"
+#~ "إدارة / المستخدمين / المستخدمين\n"
+#~ "على سبيل المثال، كنت ستفعل ربما ل 'مشرف' للمستخدم\n"
+
+#~ msgid ""
+#~ "When the holiday request is created the state is 'Draft'.\n"
+#~ " It is confirmed by the user and request is sent to admin, the state is "
+#~ "'Waiting Approval'.            If the admin accepts it, the state is "
+#~ "'Approved'. If it is refused, the state is 'Refused'."
+#~ msgstr ""
+#~ "عند انشاء طلب الاجازة الحالة تصبح ‘سحب‘.\n"
+#~ "تم تأكيدها بواسطة المستخدم وتم ارسال الطلب للمدير, الحالة تصبح ‘قبول "
+#~ "الانتظار‘. اذا قبلها المدير, تصبح الحالة ‘مقبولة‘. اذا تم رفضها , الحالة "
+#~ "تصبح‘مرفوض‘."
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 3a39c04eeb7..1cb6ecbd7b7 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr "Вие трябва да изберете служител или кат
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index a608b9b299c..701d4febd17 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 4e0fd1ab423..03b3205bbd9 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -396,11 +396,9 @@ msgstr "Heu de seleccionar un empleat o una categoria"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si és cert, les assignacions/peticions han de ser validades per un segon "
-"validador."
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -775,11 +773,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si marqueu aquesta casella, el sistema permetrà als empleats, per aquesta "
-"secció, agafar-se més absències de les disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -893,9 +889,23 @@ msgstr "Per aprovar"
 #~ "'Esperant aprovació'. Si el responsable l'autoritza, l'estat canvia a "
 #~ "'Aprovada', però si la rebutja el seu estat canvia a 'Rebutjada'."
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si és cert, les assignacions/peticions han de ser validades per un segon "
+#~ "validador."
+
 #~ msgid "Casual Leave"
 #~ msgstr "Absència ocasional"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si marqueu aquesta casella, el sistema permetrà als empleats, per aquesta "
+#~ "secció, agafar-se més absències de les disponibles."
+
 #~ msgid "This Month"
 #~ msgstr "Aquest mes"
 
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 21c2cd37e53..967e1b7944f 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_holidays
@@ -396,11 +396,9 @@ msgstr "Musíte vybrat zaměstnance nebo kategorii"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Pokud je pravdivé, pak Přidělení/Požadavek musí být ověřen druhým "
-"ověřovatelem"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -775,11 +773,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Pokud zaškrtnete toto políčko, systém vám pro tuto sekci umožní, aby "
-"zaměstnanci mohli vzít více uvolnění než mají dostupných."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -959,6 +955,13 @@ msgstr "Ke schválení"
 #~ "            na příklad, můžete chtít toto udělat pro uživatele 'admin'\n"
 #~ "            .\n"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Pokud je pravdivé, pak Přidělení/Požadavek musí být ověřen druhým "
+#~ "ověřovatelem"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Rozšířené filtry..."
 
@@ -968,6 +971,13 @@ msgstr "Ke schválení"
 #~ msgid "This Month"
 #~ msgstr "Tento měsíc"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Pokud zaškrtnete toto políčko, systém vám pro tuto sekci umožní, aby "
+#~ "zaměstnanci mohli vzít více uvolnění než mají dostupných."
+
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Lidské zdroje: Správa dovolených"
 
diff --git a/addons/hr_holidays/i18n/da.po b/addons/hr_holidays/i18n/da.po
index bd2a2888ebf..8d41951aafa 100644
--- a/addons/hr_holidays/i18n/da.po
+++ b/addons/hr_holidays/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index d52460ed66d..a7de3edea4e 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-24 04:47+0000\n"
-"X-Generator: Launchpad (build 14860)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -414,11 +414,9 @@ msgstr "Sie müssen einen Mitarbeiter oder eine Kategorie auswählen"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Durch Aktivierung muss Urlaubszuweisung / Urlaubsantrag durch einen weitern "
-"Vorgesetzten, z.B. Projektmanager oder Personalleiter genehmigt werden."
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -794,11 +792,9 @@ msgstr "Krankheitsstände"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Wenn Sie diese Option über die Checkbox auszuwählen, können  Ihre "
-"Mitarbeiter mehr Urlaub beantragen als Ihnen ursprünglich zugewiesen wurde."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -982,6 +978,13 @@ msgstr "Zu Genehmigen"
 #~ "Urlaubsmanagement/Reporting/Urlaubsmanagement/Urlaub nach Abteilungen\n"
 #~ "         durch Klick auf den Drucken Button.\n"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Durch Aktivierung muss Urlaubszuweisung / Urlaubsantrag durch einen weitern "
+#~ "Vorgesetzten, z.B. Projektmanager oder Personalleiter genehmigt werden."
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Erweiterter Filter..."
 
@@ -991,6 +994,13 @@ msgstr "Zu Genehmigen"
 #~ msgid "This Month"
 #~ msgstr "Dieser Monat"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Wenn Sie diese Option über die Checkbox auszuwählen, können  Ihre "
+#~ "Mitarbeiter mehr Urlaub beantragen als Ihnen ursprünglich zugewiesen wurde."
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "Dieser Bereich wird autom. mit dem Benutzer ausgefüllt, der dem Benutzer "
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index b716691876a..50cbd4b1c0e 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -385,8 +385,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -751,8 +751,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 3fde454cd86..9495b2a144f 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -396,11 +396,9 @@ msgstr "Debe seleccionar un empleado o una categoría"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
-"segundo validador"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -774,11 +772,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si marca esta casilla, el sistema permitirá a los empleados, para esta "
-"sección, cogerse más ausencias de las disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -879,12 +875,26 @@ msgstr "Para aprobar"
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
+#~ "segundo validador"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
 #~ msgid "Casual Leave"
 #~ msgstr "Ausencia ocasional"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si marca esta casilla, el sistema permitirá a los empleados, para esta "
+#~ "sección, cogerse más ausencias de las disponibles."
+
 #~ msgid "This Month"
 #~ msgstr "Este Mes"
 
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 8138180193b..a5d228adfbd 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_CR.po b/addons/hr_holidays/i18n/es_CR.po
index 73c4c0fa26a..c04db8b7aae 100644
--- a/addons/hr_holidays/i18n/es_CR.po
+++ b/addons/hr_holidays/i18n/es_CR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-16 15:29+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 05:00+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "Language: \n"
 
 #. module: hr_holidays
@@ -417,11 +417,9 @@ msgstr "Debe seleccionar un empleado o una categoría"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
-"segundo validador"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -795,11 +793,9 @@ msgstr "Permisos de"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si marca esta casilla, el sistema permitirá a los empleados, para esta "
-"sección, cogerse más ausencias de las disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -896,6 +892,20 @@ msgstr "Año"
 msgid "To Approve"
 msgstr "Para aprobar"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
+#~ "segundo validador"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si marca esta casilla, el sistema permitirá a los empleados, para esta "
+#~ "sección, cogerse más ausencias de las disponibles."
+
 #~ msgid "Sick Leave"
 #~ msgstr "Ausencia por enfermedad"
 
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index fe816de7d0a..0485afe102b 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index eadf044acf8..ca14a3fa6ae 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 7e040f0e382..8307e13ef53 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -545,7 +545,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Palkaton"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 37091535fcc..cf19d1abe0b 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -50,7 +50,7 @@ msgstr "Grouper par..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Mode d'allocation"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -60,7 +60,7 @@ msgstr "Département"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Approuver la demande"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -75,7 +75,7 @@ msgstr "Catégorie d'employé"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " Mois -1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -119,7 +119,7 @@ msgstr "Vert clair"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Type d'absence"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -149,7 +149,7 @@ msgstr "Approuvée"
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Dernière connexion"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -175,6 +175,13 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"L'état est défini à «brouillon», quand une demande de congés est créé.\n"
+"L'état est «en attente» (d'approbation) lorsque la demande de congés est "
+"confirmée par l'utilisateur.\n"
+"L'état est «refusé», lorsque la demande de congés est refusée par le "
+"responsable.\n"
+"L'état est «approuvé», lorsque la demande de congés est validée par le "
+"responsable."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -192,7 +199,7 @@ msgstr "Congé"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Demandes de congés à valider"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
@@ -221,6 +228,8 @@ msgid ""
 "Total number of legal leaves allocated to this employee, change this value "
 "to create allocation/leave requests."
 msgstr ""
+"Nombre total de jours de congés alloués à cet employé, modifier cette valeur "
+"pour créer des demandes de congés."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -231,7 +240,7 @@ msgstr "Validation"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -247,6 +256,8 @@ msgstr "Rapport de synthèse des congés par employé"
 #: help:hr.holidays,manager_id:0
 msgid "This area is automatically filled by the user who validate the leave"
 msgstr ""
+"Cette partie est automatiquement remplie par l'utilisateur qui valide la "
+"demande"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
@@ -298,7 +309,7 @@ msgstr "Confirmer"
 #: code:addons/hr_holidays/hr_holidays.py:384
 #, python-format
 msgid "Leave Request for %s"
-msgstr ""
+msgstr "Demande de congés pour %s"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
@@ -313,7 +324,7 @@ msgstr "Statut"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr "Total des vacances par type"
+msgstr "Total des congés par type"
 
 #. module: hr_holidays
 #: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
@@ -325,7 +336,7 @@ msgstr "Employé"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -362,7 +373,7 @@ msgstr ""
 #: code:addons/hr_holidays/hr_holidays.py:382
 #, python-format
 msgid "Allocation for %s"
-msgstr ""
+msgstr "Allocation pour %s"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,number_of_days:0
@@ -382,6 +393,14 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"Le champ \"Jours de congés restants\" ne peut être utilisé que si il "
+"n'existe qu' un seul type de congés et que l'option 'Autoriser à outrepasser "
+"la limite' est décochée. (% s trouvé). Sinon, la mise à jour est ambigu, car "
+"le système ne peut pas décider quel type de congés doit être mis à jour.\n"
+"Dans ce cas, il est préférable d' utiliser les menus classiques des demandes "
+"de congés et les demandes d'allocation situés dans le menu des ressources "
+"humaines \\ Congés pour gérer les congés des employés si la configuration ne "
+"permet pas d'utiliser le champ précité."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -396,11 +415,9 @@ msgstr "Vous devez sélectionner un employé ou une catégorie"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Si cette case est cochée, la demande / attribution de congés devra être "
-"validée par un deuxième valideur"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -439,7 +456,7 @@ msgstr "Lavande"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -487,7 +504,7 @@ msgstr "Corail clair"
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 msgid "Holidays by Department"
-msgstr "Vacances par département"
+msgstr "Congés par département"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -497,7 +514,7 @@ msgstr "Noir"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
 msgid "Allocate Leaves for Employees"
-msgstr ""
+msgstr "Allouer des congés pour les employés"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
@@ -550,11 +567,12 @@ msgstr "Congés à valider"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr ""
+msgstr "Jours de congés restants"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
@@ -564,7 +582,7 @@ msgstr "Première approbation"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Impayé"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -576,7 +594,7 @@ msgstr "Résumé des congés"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Congés du mois dernier"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -587,7 +605,7 @@ msgstr "Erreur"
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr ""
+msgstr "Assigner des congés"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -597,12 +615,12 @@ msgstr "Bleu clair"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr ""
+msgstr "Les congés de mon département"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "Statut du congés courant"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
@@ -631,7 +649,7 @@ msgstr "Général"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Jours de compensation"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,notes:0
@@ -714,7 +732,7 @@ msgstr "Description"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves"
-msgstr ""
+msgstr "Congés légaux"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -771,16 +789,14 @@ msgstr "Date de fin"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leaves"
-msgstr ""
+msgstr "Arrêts maladie"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Si vous cochez cette case, le système autorisera, pour cette section, "
-"l'employé à prendre plus de congés qu'il n'en a de disponibles."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -802,6 +818,8 @@ msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
 msgstr ""
+"Vous pouvez assigner des jours de congés restants pour chaque employé, "
+"OpenERP va automatiquement créer et valider des demandes d'allocation."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -821,7 +839,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "Mode"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
@@ -868,7 +886,7 @@ msgstr "À confirmer"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -884,6 +902,13 @@ msgstr "À approuver"
 #~ msgid "Draft"
 #~ msgstr "Brouillon"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Si cette case est cochée, la demande / attribution de congés devra être "
+#~ "validée par un deuxième valideur"
+
 #~ msgid "Casual Leave"
 #~ msgstr "Congés légaux"
 
@@ -912,6 +937,13 @@ msgstr "À approuver"
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Ressources humaines : gestion des vacances"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Si vous cochez cette case, le système autorisera, pour cette section, "
+#~ "l'employé à prendre plus de congés qu'il n'en a de disponibles."
+
 #~ msgid ""
 #~ "Human Resources: Holidays tracking and workflow\n"
 #~ "\n"
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
index bf9e1b5626f..2da1901bf4b 100644
--- a/addons/hr_holidays/i18n/gu.po
+++ b/addons/hr_holidays/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-26 05:07+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index cbea6632e7c..791563f0724 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index 9279766a8c4..b79b8077c14 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 76cbd507c0e..eeb4e7b5e27 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -401,8 +401,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -767,8 +767,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index 059efd0ffab..91c7af998d4 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 84d4eba11ae..0a280d19520 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -402,11 +402,9 @@ msgstr "Anda harus memilih karyawan atau kategori"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Jika Benar dari perusahaan perusahaan Alokasi / Permintaan harus divalidasi "
-"dari validator kedua"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -781,11 +779,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Jika Anda mencentang kotak centang  ini, sistem akan memungkinkan, atas "
-"bagian ini, karyawan untuk mengambil cuti lebih dari yang tersedia."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -903,6 +899,13 @@ msgstr "Untuk Disetujui"
 #~ msgid "Draft"
 #~ msgstr "Draft"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Jika Benar dari perusahaan perusahaan Alokasi / Permintaan harus divalidasi "
+#~ "dari validator kedua"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Filter Tambahan"
 
@@ -912,6 +915,13 @@ msgstr "Untuk Disetujui"
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Sumber Daya Manusia: Manajemen Liburan"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Jika Anda mencentang kotak centang  ini, sistem akan memungkinkan, atas "
+#~ "bagian ini, karyawan untuk mengambil cuti lebih dari yang tersedia."
+
 #~ msgid "This Month"
 #~ msgstr "Bulan Ini"
 
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 0e562724340..4bc6ee2d96a 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -389,11 +389,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Se è impostato a vero allora le sue assegnazioni / richieste devono essere "
-"convalidate da un secondo convalidatore"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -766,11 +764,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Se spuntate questo riquadro, il sistema permetterà, per questa sezione, "
-"all'impiegato di prendere più permessi di quelli disponibili."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -964,3 +960,17 @@ msgstr "Da Approvare"
 #~ "                per esempio, vorrete farlo sicuramente per l'utente "
 #~ "\"admin\"\n"
 #~ "                .\n"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Se spuntate questo riquadro, il sistema permetterà, per questa sezione, "
+#~ "all'impiegato di prendere più permessi di quelli disponibili."
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Se è impostato a vero allora le sue assegnazioni / richieste devono essere "
+#~ "convalidate da un secondo convalidatore"
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index 2877f7d9bb9..c37e26582ac 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/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-18 23:32+0000\n"
+"PO-Revision-Date: 2012-06-16 01:12+0000\n"
 "Last-Translator: Masaki Yamaya <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-20 04:43+0000\n"
-"X-Generator: Launchpad (build 15120)\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -351,7 +351,7 @@ msgstr "小麦色"
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr "エラー：休暇開始日は休暇終了日の前でなければいけません。"
+msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
@@ -394,9 +394,9 @@ msgstr "従業員あるいはカテゴリーを選んで下さい。"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -760,9 +760,9 @@ msgstr "病欠"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
-msgstr "このボックスをチェックすると、従業員はこの部分について有効な休暇よりも多くの休暇を取ることができます。"
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -851,3 +851,13 @@ msgstr "年"
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr "承認する"
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr "このボックスをチェックすると、従業員はこの部分について有効な休暇よりも多くの休暇を取ることができます。"
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index 43b56ea3347..decc1094ae2 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index d8eec2cb350..76c30b5b2a5 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 43ffce1ea56..101f5d3869d 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index 1fc6bd2b7da..94d4b4dcc92 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-04 04:48+0000\n"
-"X-Generator: Launchpad (build 15195)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -387,11 +387,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Энэ нь үнэн утгатай бол амралт, чөлөө хүсэх/ хуваарилахыг хүсэх хүсэлт нь 2 "
-"дах менежерээр батламжлагдсан байна"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -764,11 +762,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Энэ талбарыг сонговол ажилтан өөрт хуваарилагдсан боломжит амралт, чөлөөнөөс "
-"хязгаарыг хэтрүүлэн амралт, чөлөө авах боломжтой болно."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -934,6 +930,13 @@ msgstr "Зөвшөөрөх"
 #~ msgid "This Month"
 #~ msgstr "Энэ сар"
 
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Энэ талбарыг сонговол ажилтан өөрт хуваарилагдсан боломжит амралт, чөлөөнөөс "
+#~ "хязгаарыг хэтрүүлэн амралт, чөлөө авах боломжтой болно."
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "Энэ талбарт амралт, чөлөөг батламжилсан менежерийн нэвтэрсэн хэрэглэгчийн "
@@ -942,5 +945,12 @@ msgstr "Зөвшөөрөх"
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Хүний нөөц: Амралт, чөлөөний удирдлага"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Энэ нь үнэн утгатай бол амралт, чөлөө хүсэх/ хуваарилахыг хүсэх хүсэлт нь 2 "
+#~ "дах менежерээр батламжлагдсан байна"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Өргөтгөсөн хайлт..."
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index cad7786d59e..7ca12141094 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-20 05:40+0000\n"
-"X-Generator: Launchpad (build 14833)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -69,7 +69,7 @@ msgstr "Geweigerd"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr "Medewerker categorie"
+msgstr "Werknemer categorie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -89,7 +89,7 @@ msgstr "Resterende dagen"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr "Per medewerker"
+msgstr "Per werknemer"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -98,7 +98,7 @@ msgid ""
 "for every employee"
 msgstr ""
 "De verlof manager kan dit veld leeg laten als de aanvraag/reservering voor "
-"elke medewerker is"
+"elke werknemer is"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -130,9 +130,8 @@ msgid ""
 msgstr ""
 "Verlofaanvragen kunnen worden ingediend door medewerkers en goedgekeurd door "
 "hun managers. Als een verlofaanvraag is goedgekeurd, verschijnt het "
-"automatisch in de agenda van de medewerker. U kunt verschillende "
-"verlofvormen definiëren (betaald verlof, ziek, etc.) en verlof per vorm "
-"beheren."
+"automatisch in de agenda van de werknemer. U kunt verschillende verlofvormen "
+"definiëren (betaald verlof, ziek, etc.) en verlof per vorm beheren."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
@@ -161,7 +160,7 @@ msgstr "Weigeren"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
-"U kunt geen verlof goedkeuren voor medewerker %s: onvoldoende resterende "
+"U kunt geen verlof goedkeuren voor werknemer %s: onvoldoende resterende "
 "dagen (%s)."
 
 #. module: hr_holidays
@@ -249,7 +248,7 @@ msgstr "Kleur in overzicht"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "HR Vakantie samenvatting overzicht per medewerker"
+msgstr "HR Vakantie samenvatting overzicht per werknemer"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
@@ -330,7 +329,7 @@ msgstr "Totaal vakantiedagen per soort"
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
-msgstr "Medewerker"
+msgstr "Werknemer"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -409,16 +408,14 @@ msgstr "Verlofsoort zoeken"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr "U moet een medewerker of categorie selecteren"
+msgstr "U moet een werknemer of categorie selecteren"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Als dit aanstaat moeten aanvragen/reserveringen door een tweede beoordelaar "
-"worden goedgekeurd"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -428,7 +425,7 @@ msgstr "Wacht op goedkeuring"
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
-msgstr "Medewerkers"
+msgstr "Werknemer(s)"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -475,7 +472,7 @@ msgstr "Toestaan om de limiet te overschrijden"
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr "Medewerkers vakantie"
+msgstr "Werknemer vakantie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,category_id:0
@@ -494,7 +491,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr "Alle medewerkers verlof"
+msgstr "Alle werknemer verlof"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -717,7 +714,7 @@ msgstr "Mijn verlof"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr "Per medewerker categorie"
+msgstr "Per werknemer categorie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
@@ -745,9 +742,8 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
-"Per medewerker: Reservering/aanvraag voor individuele medewerker. Per "
-"medewerker categorie: Reservering/aanvraag voor groep medewerkers in "
-"categorie"
+"Per werknemer : Reservering/aanvraag voor individuele medewerker. Per "
+"werknemer categorie: Reservering/aanvraag voor groep werknemers in categorie"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
@@ -793,11 +789,9 @@ msgstr "Ziekteverlof"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Als u dit aanvinkt laat het systeem toe dat de medewerkers voor deze sectie "
-"meer verlof opnemen dan er beschikbaar is."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -985,6 +979,13 @@ msgstr "Goed te keuren"
 #~ " Als de manager goedkeurt gaat de status naar 'Goedgekeurd'.\n"
 #~ " Als de manager afkeurt gaat de status naar 'Geweigerd'"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Als dit aanstaat moeten aanvragen/reserveringen door een tweede beoordelaar "
+#~ "worden goedgekeurd"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Uitgebreide filters..."
 
@@ -998,3 +999,10 @@ msgstr "Goed te keuren"
 #~ msgstr ""
 #~ "Dit gebied wordt automatisch gevuld door de gebruiker die het verlof "
 #~ "goedkeurt"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Als u dit aanvinkt laat het systeem toe dat de werknemers voor deze sectie "
+#~ "meer verlof opnemen dan er beschikbaar is."
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index 5caa07c3bc8..5dd88108c44 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 82a6c618483..94dd3f6fa51 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -387,11 +387,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Jeśli to jest prawda, to Wniosek musi być zatwierdzony przez jeszcze jednego "
-"zatiwerdzającego"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -755,8 +753,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
@@ -873,3 +871,10 @@ msgstr ""
 #~ "'Oczekuje na aprobatę'.            Jeśli admin aprobuje, to stan zmienia się "
 #~ "na 'Zaaprobowano'. Jeśli zostanie odrzucony, to stan zmienia się na "
 #~ "'Odrzucony'."
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Jeśli to jest prawda, to Wniosek musi być zatwierdzony przez jeszcze jednego "
+#~ "zatiwerdzającego"
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 7928580f000..4ef9e4824bc 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -24,22 +24,22 @@ msgstr "Azul"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr ""
+msgstr "Tipo de alocação"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr "Aguardando confirmação da aprovação"
+msgstr "A aguardar confirmação da aprovação"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "Máximo de Ausências Permitidas - Ausências Já Tomadas"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr ""
+msgstr "Gestão de Ausências"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -49,7 +49,7 @@ msgstr "Agrupar por..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Modo de Alocação"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -59,7 +59,7 @@ msgstr "Departamento"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Aprovar Pedidos"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -69,12 +69,12 @@ msgstr "Recusado"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Categoria do funcionário"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " Mês - 1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -89,7 +89,7 @@ msgstr "Dias restantes"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr "Por empregado"
+msgstr "Por funcionário"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -97,6 +97,8 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
+"Deixe este campo em branco se pretender que este pedido de licença se "
+"aplique a todos os funcionários"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -116,7 +118,7 @@ msgstr "Verde claro"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Tipo de Licença Atual"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -126,11 +128,15 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"Leave pedidos podem ser registados por funcionários e validado pelos "
+"gerentes. Uma vez que um pedido de licença é validado, ele aparece "
+"automaticamente na agenda do funcionário. Pode definir os tipos de abono "
+"diversos (férias pagas, doença, etc) e gerir abonos por tipo."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr ""
+msgstr "Listagem de Ausências"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
@@ -141,7 +147,7 @@ msgstr "Aprovado"
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Última Conexão"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -154,6 +160,7 @@ msgstr "Recusar"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
+"Não pode validar ausências para o funcionário %s: poucos dias restantes(%s)."
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -165,6 +172,13 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"O estado é definido para 'Rascunho', quando um pedido de férias é criado.    "
+"        \n"
+"O estado é 'Aprovação em espera',quando o pedido de férias é confirmado pelo "
+"utilizador.          \n"
+"O estado é 'Recusado', quando o pedido de férias é recusado pelo gerente.    "
+"        \n"
+"O estado é 'Aprovado', quando o pedido de férias é aprovado pelo gerente."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -172,7 +186,7 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Leaves"
-msgstr "Baixas"
+msgstr "Ausências"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -182,12 +196,12 @@ msgstr "Baixa"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Pedidos de Ausência para Aprovar"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr ""
+msgstr "Ausências por Departamento"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -201,6 +215,9 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"Escolha 'Leave Request' se alguém quer tirar um dia de folga. \n"
+"Escolha 'Solicitação de Alocação' se quiser aumentar o número de folhas "
+"disponíveis para alguém"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -208,6 +225,8 @@ msgid ""
 "Total number of legal leaves allocated to this employee, change this value "
 "to create allocation/leave requests."
 msgstr ""
+"Número total de ausências legais alocadas a este funcionário, mude este "
+"valor para criar alocação / pedido de ausência."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -218,22 +237,23 @@ msgstr "Validação"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Aviso !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Cor no Relatório"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "Relatório de resumo de férias, por empregado"
+msgstr "Relatório de resumo de férias, por funcionário"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automatically filled by the user who validate the leave"
 msgstr ""
+"Esta área é automaticamente preenchida pelo utilizador que valida a licença"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
@@ -262,7 +282,7 @@ msgstr "Magenta"
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr ""
+msgstr "Deve selecionar pelo menos 1 Departamento. E volte a tentar"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -285,12 +305,12 @@ msgstr "Confirmar"
 #: code:addons/hr_holidays/hr_holidays.py:384
 #, python-format
 msgid "Leave Request for %s"
-msgstr ""
+msgstr "Pedido de Ausência para %s"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "Ausências Restantes"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,state:0
@@ -307,12 +327,12 @@ msgstr "Total de férias, por tipo"
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
-msgstr "Empregado"
+msgstr "Funcionário"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -327,7 +347,7 @@ msgstr "Vermelho"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr ""
+msgstr "Ausências por Tipo"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -342,13 +362,13 @@ msgstr "Trigo"
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "Erro! A data de inicio deve ser inferior à data de fim."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
 #, python-format
 msgid "Allocation for %s"
-msgstr ""
+msgstr "Alocação para %s"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,number_of_days:0
@@ -368,22 +388,27 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"O recurso por trás do campo 'Ausências Remanescentes' só pode ser usado "
+"quando há apenas um tipo de licença com a opção' Permitir para substituir "
+"Limite' desmarcada. (%s encontrado). Caso contrário, a atualização é "
+"ambígua, pois não podemos decidir sobre que ausência digitar a atualização a "
+"ser feita."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Pesquisar tipo Leave"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "Deve escolher um funcionário ou uma categoria"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -394,7 +419,7 @@ msgstr "Aguardando aprovação"
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
 msgid "Employee(s)"
-msgstr "Empregado(s)"
+msgstr "Funcionário(s)"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -402,11 +427,13 @@ msgid ""
 "If you set a meeting type, OpenERP will create a meeting in the calendar "
 "once a leave is validated."
 msgstr ""
+"Se definir um tipo reunião, o OpenERP criará uma reunião no calendário, "
+"quando uma ausência for validada."
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
-msgstr "Pedidos relacionados"
+msgstr "Pedidos Relacionados"
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
@@ -421,25 +448,25 @@ msgstr "Lavanda"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr ""
+msgstr "Pedidos de Ausência"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+msgstr "Permitido ultrapassar o limite"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr "Férias do empregado"
+msgstr "Férias do funcionário"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,category_id:0
@@ -452,11 +479,13 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
+"Este valor é dado pela soma de todos os pedidos de férias com um valor "
+"positivo."
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr ""
+msgstr "Ausências de Todos os Funcionários"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -477,7 +506,7 @@ msgstr "Preto"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
 msgid "Allocate Leaves for Employees"
-msgstr ""
+msgstr "Alocar Ausências para Funcionários"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
@@ -503,7 +532,7 @@ msgstr "Ambos validados e confirmados"
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "Saídas tomadas"
+msgstr "Ausências Já Tomadas"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -514,49 +543,49 @@ msgstr "Utilizador"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "A data de começo deve ser anterior à data final !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr "Ativo"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "Leaves To Validate"
-msgstr "Férias por validar"
+msgstr "Ausências por Validar"
 
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Erro ! Não pode criar uma Hierarquia recursiva de Funcionários."
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr ""
+msgstr "Ausências Legais Remanescentes"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "Primeira aprovação"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Por pagar"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr ""
+msgstr "Listagem de Ausências"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Férias durante o mês passado"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -567,7 +596,7 @@ msgstr "Erro"
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr ""
+msgstr "Atribuir Ausências"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -577,12 +606,12 @@ msgstr "Azul claro"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr ""
+msgstr "Ausências do Departamento"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "Estado da ausência atual"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
@@ -595,6 +624,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
+"Se o campo ativo é definido como falso, ela permitirá que oculte o tipo de "
+"licença sem a remover."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -609,18 +640,18 @@ msgstr "Geral"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Dias Compensatórios"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "Razões"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "Análise de Ausências"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
@@ -633,6 +664,8 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
+"Esta côr será usada na listagem das ausências alocadas em Relatórios \\ "
+"Ausências por Departamento"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
@@ -643,18 +676,18 @@ msgstr "Validado"
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "Pedido de Atribuição"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalhe Leave"
 
 #. module: hr_holidays
 #: field:hr.holidays,double_validation:0
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Aplicar validação dupla"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
@@ -670,17 +703,17 @@ msgstr "Detalhes"
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr ""
+msgstr "Minhas Ausências"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr "Por categoria de empregado"
+msgstr "Por categoria de funcionário"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Pedido de Ausência"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
@@ -690,7 +723,7 @@ msgstr "Descrição"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves"
-msgstr ""
+msgstr "Ausências Válidas"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -703,17 +736,20 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
+"Por funcionário: Pedido para funcionário individual, Pela Categoria do "
+"Funcionário: Pedido para grupos de funcionários na categoria"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
 msgstr ""
+"Não é possível eliminar a ausência que não esteja no estado de rascunho !"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Pesquisar Ausência"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
@@ -723,7 +759,7 @@ msgstr "Selecione o tipo de férias"
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "Relembrar Ausências"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -743,13 +779,13 @@ msgstr "Data de fim"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leaves"
-msgstr ""
+msgstr "Ausências por Doença"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
@@ -758,6 +794,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
+"Este valor é dado pela soma de todos os pedidos de férias com um valor "
+"negativo."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -770,6 +808,8 @@ msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
 msgstr ""
+"Pode atribuir as restantes ausências válidas de cada funcionário, o OpenERP "
+"automaticamente cria e valida as solicitações de alocação."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -782,16 +822,18 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Esta área é automaticamente preenchida pelo utilizador que validar a leave "
+"com segundo nível (If Leave type need second validation)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "Modo"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "RH Relatório Resumido de Férias Por Departamento"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -808,7 +850,7 @@ msgstr "Data de início"
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "Pedidos de Alocação"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -833,7 +875,7 @@ msgstr "Para confirmar"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -857,3 +899,101 @@ msgstr "Para aprovar"
 
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros avançados..."
+
+#~ msgid ""
+#~ "When the holiday request is created the state is 'Draft'.\n"
+#~ " It is confirmed by the user and request is sent to admin, the state is "
+#~ "'Waiting Approval'.            If the admin accepts it, the state is "
+#~ "'Approved'. If it is refused, the state is 'Refused'."
+#~ msgstr ""
+#~ "Quando o pedido de férias é criado o estado é 'Rascunho'.\n"
+#~ "Confirma-se pelo usuário e pedido é enviado ao administrador, o Estado é "
+#~ "'Aprovação em espera'.            Se o administrador aceita, o estado é "
+#~ "'Aprovado'. Se for recusada, o estado é 'Recusado'."
+
+#~ msgid ""
+#~ "Human Resources: Holidays tracking and workflow\n"
+#~ "\n"
+#~ "    This module allows you to manage leaves and leaves' requests.\n"
+#~ "    Implements a dashboard for human resource management that includes.\n"
+#~ "        * My Leaves\n"
+#~ "        * My Expenses\n"
+#~ "    Note that:\n"
+#~ "    - A synchronisation with an internal agenda (use of the CRM module) is "
+#~ "possible: in order to automatically create a case when an holiday request is "
+#~ "accepted, you have to link the holidays status to a case section. You can "
+#~ "set up this info and your colour preferences in\n"
+#~ "                HR / Configuration / Holidays Status\n"
+#~ "    - An employee can make an ask for more off-days by making a new "
+#~ "Allocation It will increase his total of that leave type available (if the "
+#~ "request is accepted).\n"
+#~ "    - There are two ways to print the employee's holidays:\n"
+#~ "        * The first will allow to choose employees by department and is used "
+#~ "by clicking the menu item located in\n"
+#~ "                HR / Holidays Request / Print Summary of Holidays\n"
+#~ "        * The second will allow you to choose the holidays report for "
+#~ "specific employees. Go on the list\n"
+#~ "                HR / Employees / Employees\n"
+#~ "            then select the ones you want to choose, click on the print icon "
+#~ "and select the option\n"
+#~ "                'Print Summary of Employee's Holidays'\n"
+#~ "    - The wizard allows you to choose if you want to print either the "
+#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
+#~ "be set up by a user from the group 'HR'. You can define these features in "
+#~ "the security tab from the user data in\n"
+#~ "                Administration / Users / Users\n"
+#~ "            for example, you maybe will do it for the user 'admin'\n"
+#~ "            .\n"
+#~ msgstr ""
+#~ "?!?!?!?!?!?Recurso Humanos: Holidays tracking and workflow\n"
+#~ "\n"
+#~ "    This module allows you to manage leaves and leaves' requests.\n"
+#~ "    Implementa um painel para gestão de recursos humanos, que inclui.\n"
+#~ "        * My Leaves\n"
+#~ "        * Despesas\n"
+#~ "    Note that:\n"
+#~ "    - A sincronização com uma agenda interna (use módulo CRM)é possível: a "
+#~ "fim de criar automaticamente um caso quando um pedido de férias é aceite, "
+#~ "tem que ligar o status férias a uma secção de caso. Pode configurar esta "
+#~ "informação e as suas preferências de cor em\n"
+#~ "                HR / Configuration / Holidays Status\n"
+#~ "    - Um funcionário pode fazer uma peça mais off-days, fazendo uma nova "
+#~ "alocação ela vai aumentar o total desse tipo ficando disponíveis (se o "
+#~ "pedido for aceite).\n"
+#~ "    - Existem duas maneira de print the employee's holidays:\n"
+#~ "        * A primeira irá permitir que escolha os funcionários por "
+#~ "departamento e usado ao clicar no item menu localizado no\n"
+#~ "                HR / Holidays Request / Print Summary of Holidays\n"
+#~ "        * O segundo irá permitir que escolha holidays report para "
+#~ "funcionários específicos. Vá para a lista\n"
+#~ "                HR / Employees / Employees\n"
+#~ "            e escolha o que quer seleccionar, clique no print icon e "
+#~ "seleccione a opção\n"
+#~ "                'Print Summary of Employee's Holidays'\n"
+#~ "    - The wizard allows you to choose if you want to print either the "
+#~ "Confirmed & Validated holidays or only the Validated ones. These states must "
+#~ "be set up by a user from the group 'HR'. You can define these features in "
+#~ "the security tab from the user data in\n"
+#~ "                Administration / Users / Users\n"
+#~ "            for example, you maybe will do it for the user 'admin'\n"
+#~ "            .\n"
+
+#~ msgid "Casual Leave"
+#~ msgstr "?!?!??!Casual Leave"
+
+#~ msgid "This area is automaticly filled by the user who validate the leave"
+#~ msgstr ""
+#~ "Esta área é automaticamente preenchido pelo utilizador que validar o leave"
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Se o pedido for verdadeiro  tem que ser validado pelo segundo validador"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Se marcar esta opção, o sistema permitirá que, para esta seção, os "
+#~ "funcionários possam tirar mais ausências do que as disponíveis."
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 2d51a3c124f..0937252f595 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-20 05:40+0000\n"
-"X-Generator: Launchpad (build 14833)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr "Você deve selecionar um funcionário ou uma categoria"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index e39530d949f..7bc1520fec5 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -24,17 +24,17 @@ msgstr "Albastru"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr "Tipul alocării"
+msgstr "Tipul alocarii"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr "Se așteaptă a doua aprobare"
+msgstr "Se asteapta a doua aprobare"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr "Maximum de concedii permise - Concedii deja luate"
+msgstr "Maximul de concedii permise - Concedii deja luate"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -44,12 +44,12 @@ msgstr "Managementul concediilor"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Mod Alocare"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -59,7 +59,7 @@ msgstr "Departament"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Aprobare cereri"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -69,12 +69,12 @@ msgstr "Respins"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr "Categoria angajatului"
+msgstr "Categorie Angajat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " Luna-1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -84,12 +84,12 @@ msgstr "Maro"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr "Zile rămase"
+msgstr "Zile ramase"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr "De către angajat"
+msgstr "De catre angajat"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -97,13 +97,13 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
-"Administratorul concediilor poate lăsa acest câmp necompletat dacă această "
+"Administratorul concediilor poate lasa acest camp necompletat daca aceasta "
 "cerere/alocare de concediu este pentru fiecare angajat"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
-msgstr "Setare ca ciornă"
+msgstr "Setati ca ciorna"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -118,7 +118,7 @@ msgstr "Verde deschis"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Tipul Concediului actual"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -128,26 +128,27 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
-"Cererile de concediu pot fi înregistrate de către angajați și validate de "
-"către șefii lor. Odată ce o cerere de concediu este validată, ea apare "
-"automat în agenda angajatului. Se pot defini multiple tipuri de permisiuni "
-"(concedii plătite, medicale etc.) si se pot administra după tip."
+"Cererile de concediu pot fi inregistrate de catre angajati si validate de "
+"catre sefii lor. Odata ce o cerere de concediu este validata, ea apare "
+"automat in agenda angajatului. Se pot defini mai multe tipuri de permisiuni "
+"(concedii platite, concedii medicale etc.) si se pot administra dupa tipul "
+"lor."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr "Rezumat concedii"
+msgstr "Rezumat Concedii"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
-msgstr "Aprobat"
+msgstr "Aprobat(e)"
 
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Conexiune recenta"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -160,7 +161,7 @@ msgstr "Respingeti"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
-"Nu puteți valida concediul pentru angajatul %s: prea puține zile rămase (%s)."
+"Nu puteti valida concediul pentru angajatul %s: prea putine zile rămase (%s)."
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -172,6 +173,14 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"Starea este setata ca 'Ciorna', atunci cand este creata o cerede de "
+"concediu.            \n"
+"Starea este 'In asteptarea aprobarii', atunci cand cererea de concediu este "
+"confirmata de utilizator.             \n"
+"Starea este 'Respins', atunci cand cererea de concediu este respinsa de "
+"director.            \n"
+"Starea este 'Aprobat', atunci cand cererea de concediu este aprobata de "
+"director."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -189,17 +198,17 @@ msgstr "Concediu"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Cerere de concediu pentru Aprobare"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr "Concedii după departament"
+msgstr "Concedii dupa Departament"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr "Anulat(ă)"
+msgstr "Anulat(a)"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -208,9 +217,9 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
-"Selectați 'Cerere de concediu' cănd cineva dorește o zi liberă. Selectați "
-"'Cerere de alocare' dacă doriți să mariți numarul de concedii disponibile "
-"pentru cineva"
+"Selectati 'Cerere de concediu' atunci cand cineva doreste sa isi ia o zi "
+"libera. Selectati 'Cerere de alocare' daca doriti sa mariti numarul de "
+"concedii disponibile pentru cineva"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -218,6 +227,8 @@ msgid ""
 "Total number of legal leaves allocated to this employee, change this value "
 "to create allocation/leave requests."
 msgstr ""
+"Numarul total de concedii legale alocate acestui angajat, schimbati aceasta "
+"valoare pentru a crea cereri de alocare/concediu."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -228,22 +239,24 @@ msgstr "Validare"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertizare !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr "Culoare în raport"
+msgstr "Culoare in Raport"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "Resurse Umane Raport Rezumat Concedii pe angajat"
+msgstr "Resurse Umane Raport Rezumat Concedii dupa Angajat"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automatically filled by the user who validate the leave"
 msgstr ""
+"Aceasta parte este completata automat de utilizatorul care valideaza "
+"concediul"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
@@ -254,31 +267,32 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Leave Type"
-msgstr "Tipul de concediu"
+msgstr "Tipul concediului"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #: code:addons/hr_holidays/hr_holidays.py:344
 #, python-format
 msgid "Warning!"
-msgstr "Avertisment!"
+msgstr "Avertizare!"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr "Magenta (culoare)"
+msgstr "Magenta"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr "trebuie să selectați cel puțin un departament. Și încercați din nou."
+msgstr ""
+"Trebuie sa selectati cel putin un departament.Apoi incercati din nou."
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Confirmed"
-msgstr "Confirmat"
+msgstr "Confirmat(a)"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,date_from:0
@@ -289,18 +303,18 @@ msgstr "De la"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Confirm"
-msgstr "Confirmă"
+msgstr "Confirmati"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:384
 #, python-format
 msgid "Leave Request for %s"
-msgstr ""
+msgstr "Cerere de concediu pentru %s"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr "Concedii rămase"
+msgstr "Concedii ramase"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,state:0
@@ -310,7 +324,7 @@ msgstr "Stare"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr "Totalul concediilor după tip"
+msgstr "Total concedii dupa tip"
 
 #. module: hr_holidays
 #: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
@@ -322,7 +336,7 @@ msgstr "Angajat"
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "Nou(a)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -332,12 +346,12 @@ msgstr "Tip"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr "Roșu"
+msgstr "Rosu"
 
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr "Concedii după tip"
+msgstr "Concedii dupa Tip"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -347,26 +361,26 @@ msgstr "Somon deschis"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr "Grâu"
+msgstr "Grau"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
-"Eroare! data de inceput a concediului trebuie să fie sub data de sfarsit a "
-"concediului."
+"Eroare! data de inceput a concediului trebuie sa fie mai mica decat data de "
+"sfarsit a concediului."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
 #, python-format
 msgid "Allocation for %s"
-msgstr ""
+msgstr "Alocare pentru %s"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
-msgstr "Număr de zile"
+msgstr "Numar de zile"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:377
@@ -380,30 +394,37 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"Caracteristica asociata campului 'Concedii Legale Ramase' poate fi utilizata "
+"numai atunci cand exista un singur tip de concediu cu optiunea 'Permite "
+"depasirea limitei' nebifata. (%s gasit). In caz contrar actualizarea este "
+"ambigua deoarece nu putem decide pentru care tip de concediu trebuie facuta "
+"actualizarea. \n"
+"Poate preferati sa folositi meniurile clasice 'Cereri de concediu' si "
+"'Cereri de alocare' localizate in 'Resurse Umane \\ Concedii' pentru a "
+"gestiona zilele de concediu ale angajatilor daca configurarea nu permite "
+"utilizarea acestui camp."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr "Caută Tipul concediului"
+msgstr "Cautati Tipul concediului"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr "Trebuie să selectati un angajat sau o categorie"
+msgstr "Trebuie sa selectati un angajat sau o categorie"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
-"Dacă este Adevărat, Alocarea/Cererea trebuie să fie validată de către un al "
-"doilea validator"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr "Așteaptă aprobare"
+msgstr "Asteapta aprobare"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -416,8 +437,8 @@ msgid ""
 "If you set a meeting type, OpenERP will create a meeting in the calendar "
 "once a leave is validated."
 msgstr ""
-"Dacă setati un tip de intalnire, OpenERP va crea o intalnire in calendar de "
-"indată ce concediul este validat."
+"Daca setati un tip de intalnire, OpenERP va crea o intalnire in calendar de "
+"indata ce concediul este validat."
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
@@ -427,17 +448,17 @@ msgstr "Cereri asociate"
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr "Părinte"
+msgstr "Parinte"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr "Lavandă"
+msgstr "Lavanda"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Luna"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -449,13 +470,13 @@ msgstr "Cereri de concediu"
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr "Permite depasirea limitei"
+msgstr "Permiteti depasirea limitei"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr "Concediile angajatului"
+msgstr "Concediile Angajatului"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,category_id:0
@@ -468,8 +489,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
-"Această valoare este dată de suma tuturor cererilor de concediu cu o valoare "
-"pozitivă."
+"Aceasta valoare este data de suma tuturor cererilor de concediu cu valoare "
+"pozitiva."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -495,7 +516,7 @@ msgstr "Negru"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
 msgid "Allocate Leaves for Employees"
-msgstr ""
+msgstr "Alocati Concedii pentru Angajati"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
@@ -505,7 +526,7 @@ msgstr "Concediu"
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr "Întâlnire"
+msgstr "Intalnire"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -516,12 +537,12 @@ msgstr "Fildes"
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr "Validat și confirmat"
+msgstr "Validat si confirmat"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "Libere deja luate"
+msgstr "Concedii luate deja"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -532,49 +553,49 @@ msgstr "Utilizator"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr "Data de început trebuie să fie anterioară datei de sfârșit."
+msgstr "Data de inceput trebuie sa fie anterioara datei de sfarsit !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr "Activ(ă)"
+msgstr "Activ(a)"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "Leaves To Validate"
-msgstr "Libere de validat"
+msgstr "Concedii de validat"
 
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea Ierarhii recursive ale Angajatilor."
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr ""
+msgstr "Concedii legale ramase"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr "Prima apobare"
+msgstr "Prima aprobare"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Neplatit"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr "Rezumat concediu"
+msgstr "Rezumat concedii"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Concedii in ultima luna"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -585,7 +606,7 @@ msgstr "Eroare"
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr ""
+msgstr "Atribuiti Concedii"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -595,12 +616,12 @@ msgstr "Albastru deschis"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr ""
+msgstr "Concediile din Departamentul meu"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "Statusul concediului actual"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
@@ -613,8 +634,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
-"Dacă campul activ este setat pe fals, vă va permite să ascundeti tipul "
-"concediului fără a-l sterge."
+"Daca campul activ este setat pe fals, va va permite sa ascundeti tipul "
+"concediului fara a-l sterge."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -629,7 +650,7 @@ msgstr "General"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Zile compensatorii"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,notes:0
@@ -640,12 +661,12 @@ msgstr "Motive"
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr "Analiză concediu"
+msgstr "Analiza concediu"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulati"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
@@ -653,14 +674,14 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
-"Această culoare va fi folosită in rezumatul concediului localizat in "
-"Rapoarte\\Concedii după Departament"
+"Aceasta culoare va fi folosita in rezumatul concediului localizat in "
+"Rapoarte\\Concedii dupa Departament"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
-msgstr "Validat"
+msgstr "Validat(a)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
@@ -676,12 +697,12 @@ msgstr "Detalii concediu"
 #: field:hr.holidays,double_validation:0
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr "Aplică Validarea Dublă"
+msgstr "Aplicati Validarea Dubla"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
 msgid "Print"
-msgstr "Imprimă"
+msgstr "Tipariti"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -697,7 +718,7 @@ msgstr "Concediile mele"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr "După categoria salariatului"
+msgstr "Dupa Categoria Angajatului"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
@@ -712,12 +733,12 @@ msgstr "Descriere"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves"
-msgstr ""
+msgstr "Concedii Legale"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr "Numărul de zile trebuie să fie mai mare de 0 !"
+msgstr "Numarul de zile trebuie sa fie mai mare de 0 !"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -725,29 +746,29 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
-"După Angajat: Alocare/Cerere pentru un Angajat individual, După Categoria "
+"Dupa Angajat: Alocare/Cerere pentru un Angajat individual, Dupa Categoria "
 "Angajatului: Alocare/Cerere pentru un grup de angajati in categorie"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr "Nu puteti sterge un concediu care nu se află in stare de ciornă !"
+msgstr "Nu puteti sterge un concediu care nu se afla in starea ciorna !"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr "Caută Concediu"
+msgstr "Cautati Concediul"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr "Selectează tipul concediului"
+msgstr "Selectati Tipul de concediu"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr "Concedii (zile libere) rămase"
+msgstr "Concedii ramase"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -762,21 +783,19 @@ msgstr "A doua aprobare"
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leaves"
-msgstr ""
+msgstr "Concedii medicale"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Dacă bifati această căsută, sistemul va permite, pentru această sectiune, "
-"angajatilor să ia mai multe zile libere decat cele disponibile."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -784,8 +803,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
-"Acestă valoare este dată de suma tuturor cererilor de concediu cu o valoare "
-"negativă."
+"Acesta valoare este data de suma tuturor cererilor de concediu cu valoare "
+"negativa."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -798,6 +817,8 @@ msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
 msgstr ""
+"Puteti atribui Concedii Legale ramase fiecarui angajat, OpenERP va crea si "
+"valida automat cererile de alocare."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -810,36 +831,36 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
-"Acest camp este completat automat de către utilizatorul care validează "
-"concediul cu al doilea nivel (Dacă tipul de concediu necesită o a doua "
+"Acest camp este completat automat de catre utilizatorul care valideaza "
+"concediul cu al doilea nivel (Daca Tipul de concediu necesita o a doua "
 "validare)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "Mod"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr "Resurse Umane Raport Rezumat Concedii după Departament"
+msgstr "Resurse Umane Raport Rezumat Concedii dupa Departament"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr "Aprobă"
+msgstr "Aprobati"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr "Cereri alocare"
+msgstr "Cereri de alocare"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -854,7 +875,7 @@ msgstr "Roz deschis"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr "Manager"
+msgstr "Director"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -864,7 +885,7 @@ msgstr "De confirmat"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "An"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -976,3 +997,17 @@ msgstr "De aprobat"
 #~ msgstr ""
 #~ "Acest camp este completat automat de către utilizatorul care validează "
 #~ "concediul"
+
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Daca este Adevarat, atunci Alocarea/Cererea trebuie sa fie validata de catre "
+#~ "un al doilea validator"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Daca bifati aceasta casuta, sistemul va permite, pentru aceasta sectiune, "
+#~ "angajatilor sa isi ia mai multe zile libere decat cele disponibile."
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index b3c25a51d70..d3f77fbc332 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -384,9 +384,9 @@ msgstr "Вы должны выбрать сотрудника или катег
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "Если это истина, то заявка должна быть утверждения второй проверкой"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -754,11 +754,9 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
-"Если выбрать данную галочку, система позволит сотрудникам в данном разделе "
-"создавать больше отгулов, чем доступно."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -864,6 +862,18 @@ msgstr ""
 #~ "\"Ожидает утверждения\". Если админ принимает его, то статус изменится на "
 #~ "\"Утвержден\". Если он отклонен, статус будет \"Отклонен\"."
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "Если это истина, то заявка должна быть утверждения второй проверкой"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Если выбрать данную галочку, система позволит сотрудникам в данном разделе "
+#~ "создавать больше отгулов, чем доступно."
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "Эта область автоматически заполняется утверждающим отгул пользователем."
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 924ef46b250..fa22fb3b261 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index 5ca61227010..a1ea145f705 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 22e759daa9b..f852c987cf0 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index 2565db3fbd7..c184004e1cd 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 42648c1c6ed..75890f2f078 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 89c9fadc993..6e13f119b39 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr "คุณต้อง เลือกพนักงานหรือ
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index b982e89b7e6..abf10258fbb 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 29a0af3d080..98c11cc5c1a 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 4b692250f0c..861f5660310 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index 3e188ef4109..05f4ac72f08 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -383,8 +383,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -749,8 +749,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 0796bb02964..a303883c205 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 05:00+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -392,9 +392,9 @@ msgstr "您必须选择一个员工或分类"
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
-msgstr "如果为真，分配 / 申请要二次审核才能生效。"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -758,9 +758,9 @@ msgstr "病假"
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
-msgstr "如果您勾选，系统将允许员工获得比可得到更多的准假。"
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -931,5 +931,15 @@ msgstr "待审批"
 #~ "向导可以让您选择打印确认并生效的假期或者看确认或只看生效的，但必须是人力资源组的用户，您可以在“管理/用户”的安全标签里更改用户的数据。\n"
 #~ "             例如你可能把用户定义为admin\n"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr "如果为真，分配 / 申请要二次审核才能生效。"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr "如果您勾选，系统将允许员工获得比可得到更多的准假。"
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr "这里自动填充谁生效这准假"
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 4d204f36768..0b9ae4908f9 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:40+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -382,8 +382,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
 msgid ""
-"If its True then its Allocation/Request have to be validated by second "
-"validator"
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
 msgstr ""
 
 #. module: hr_holidays
@@ -748,8 +748,8 @@ msgstr ""
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
-"If you tick this checkbox, the system will allow, for this section, the "
-"employees to take more leaves than the available ones."
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index a65425dd0b3..4d83cd9cdc7 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -149,9 +149,9 @@
             </tr>
         </blockTable>
         <spacer length="1.0cm" />
-        <para style="title" t="1">Off-Days' Summary</para>
+        <para style="title" t="1">Leaves Summary <xsl:value-of select="report/name" /></para>
         <spacer length="0.5cm" />
-        <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
+        <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> leaves. </para>
         <spacer length="1.0cm" />
         <xsl:variable name="cols_legend">
             <xsl:text>0.7cm,5.0cm</xsl:text>
@@ -236,7 +236,7 @@
             <xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
             <tr>
                     <td>Color</td>
-                    <td>Holiday Type</td>
+                    <td>Leave Type</td>
 
             </tr>
             <xsl:for-each select="report/legend">
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index d756dfe6dfd..8a782075853 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -106,6 +106,10 @@ class report_custom(report_rml):
         eom = som+datetime.timedelta(59)
         day_diff=eom-som
 
+        name = ''
+        if len(data['form'].get('emp', ())) == 1:
+            name = obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name']
+
         if data['form']['holiday_type']!='both':
             type=data['form']['holiday_type']
             if data['form']['holiday_type']=='Confirmed':
@@ -113,11 +117,12 @@ class report_custom(report_rml):
             else:
                 holiday_type=('validate')
         else:
-            type="Confirmed and Validated"
+            type="Confirmed and Approved"
             holiday_type=('confirm','validate')
         date_xml.append('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
         date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
         date_xml.append('<type>%s</type>'%(type))
+        date_xml.append('<name>%s</name>'%(name))
 
 #        date_xml=[]
         for l in range(0,len(legend)):
diff --git a/addons/hr_holidays/test/hr_holidays_report.yml b/addons/hr_holidays/test/hr_holidays_report.yml
index 29b6b8c36cd..854ad34d5ff 100644
--- a/addons/hr_holidays/test/hr_holidays_report.yml
+++ b/addons/hr_holidays/test/hr_holidays_report.yml
@@ -5,7 +5,7 @@
     import time
     ctx={}
     ctx.update({'model': 'hr.department','active_ids': [ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')]})
-    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'depts' : [(6,0,[ref('hr.dep_sales')])],'holiday_type' : 'Validated'}
+    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'depts' : [(6,0,[ref('hr.dep_sales')])],'holiday_type' : 'Approved'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_dept',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
 
@@ -16,7 +16,7 @@
     import time
     ctx={}
     ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')]})
-    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'emp' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])],'holiday_type' : 'Validated'}
+    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'emp' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])],'holiday_type' : 'Approved'}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_employee',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
 
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index f21dca92393..53f981424d2 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -26,16 +26,16 @@ from tools.translate import _
 
 class hr_holidays_summary_dept(osv.osv_memory):
     _name = 'hr.holidays.summary.dept'
-    _description = 'HR Holidays Summary Report By Department'
+    _description = 'HR Leaves Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Leave Type', required=True)
+        'holiday_type': fields.selection([('Approved','Approved'),('Confirmed','Confirmed'),('both','Both Approved and Confirmed')], 'Leave Type', required=True)
     }
 
     _defaults = {
          'date_from': lambda *a: time.strftime('%Y-%m-01'),
-         'holiday_type': 'Validated'
+         'holiday_type': 'Approved'
     }
 
     def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 12cb3ceeb0d..72844a58ccb 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.holidays.summary.dept</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Holidays by Department" version="7.0">
+            <form string="Leaves by Department" version="7.0">
                 <header>
                     <button icon="gtk-print" name="print_report" string="Print" type="object"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -22,7 +22,7 @@
         </record>
 
         <record id="action_hr_holidays_summary_dept" model="ir.actions.act_window">
-            <field name="name">Holidays by Department</field>
+            <field name="name">Leaves by Department</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.dept</field>
             <field name="view_type">form</field>
@@ -30,11 +30,9 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
-        
         <menuitem
             name="Leaves by Department"
-            parent="menu_hr_leaves_reports"
+            parent="menu_hr_reporting_holidays"
             action="action_hr_holidays_summary_dept"
             id="menu_account_central_journal"
             icon="STOCK_PRINT"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index b6aeee96b00..2622ffa7493 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -24,16 +24,16 @@ from osv import osv, fields
 
 class hr_holidays_summary_employee(osv.osv_memory):
     _name = 'hr.holidays.summary.employee'
-    _description = 'HR Holidays Summary Report By Employee'
+    _description = 'HR Leaves Summary Report By Employee'
     _columns = {
         'date_from': fields.date('From', required=True),
         'emp': fields.many2many('hr.employee', 'summary_emp_rel', 'sum_id', 'emp_id', 'Employee(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
+        'holiday_type': fields.selection([('Approved','Approved'),('Confirmed','Confirmed'),('both','Both Approved and Confirmed')], 'Select Leave Type', required=True)
     }
 
     _defaults = {
          'date_from': lambda *a: time.strftime('%Y-%m-01'),
-         'holiday_type': 'Validated',
+         'holiday_type': 'Approved',
     }
 
     def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index d8a46ff4af4..1f330580c6e 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -7,25 +7,25 @@
             <field name="model">hr.holidays.summary.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Employee's Holidays">
-                <group col="4" colspan="6">
-                    <field name="date_from"/>
-                    <newline/>
-                    <field name="holiday_type"/>
-                    <newline/>
-                    <field name="emp" invisible="True"/>
-                </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
+                <form string="Leaves Summary">
+                    <group col="4" colspan="6">
+                        <field name="date_from"/>
+                        <newline/>
+                        <field name="holiday_type"/>
+                        <newline/>
+                        <field name="emp" invisible="True"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group col="2" colspan="4">
                         <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
                         <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-                </group>
-            </form>
+                    </group>
+                </form>
             </field>
         </record>
 
         <record id="action_hr_holidays_summary_employee" model="ir.actions.act_window">
-            <field name="name">Employee's Holidays</field>
+            <field name="name">Leaves Summary</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.employee</field>
             <field name="view_type">form</field>
@@ -35,7 +35,7 @@
 
         <record model="ir.values" id="hr_holidays_summary_employee_value">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="name">Employee's Holidays</field>
+            <field name="name">Leaves Summary</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_holidays_summary_employee'))" />
             <field name="key">action</field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a8bb5ea83c8..9251777dce4 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
 
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_no_one" sequence="45"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager" sequence="45"/>
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
@@ -482,6 +482,7 @@
             action="action_hr_salary_rule_category"
             parent="payroll_configure"
             sequence="11"
+            groups="base.group_no_one"
         />
         <record id="action_hr_salary_rule_category_tree_view" model="ir.actions.act_window">
             <field name="name">Salary Rule Categories Hierarchy</field>
@@ -496,6 +497,7 @@
             parent="payroll_configure"
             sequence="12"
             icon="STOCK_INDENT"
+            groups="base.group_no_one"
         />
 
         <!--
@@ -670,7 +672,7 @@
             <field name="search_view_id" ref="view_hr_rule_filter"/>
         </record>
 
-        <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12" groups="base.group_no_one"/>
+        <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
 
 
         <act_window name="All Children Rules"
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index ca8c516135f..7b0090d60ea 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -187,7 +187,7 @@ class hr_applicant(base_stage, osv.Model):
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'email_cc': fields.text('Watchers Emails', size=252, help="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"),
         'probability': fields.float('Probability'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Contact'),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
@@ -221,7 +221,7 @@ class hr_applicant(base_stage, osv.Model):
         'department_id': fields.many2one('hr.department', 'Department'),
         'survey': fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response': fields.integer("Response"),
-        'reference': fields.char('Refered By', size=128),
+        'reference': fields.char('Referred By', size=128),
         'source_id': fields.many2one('hr.recruitment.source', 'Source'),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 multi='day_open', type="float", store=True),
@@ -309,24 +309,19 @@ class hr_applicant(base_stage, osv.Model):
         value = {}
         for opp in self.browse(cr, uid, ids, context=context):
             # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'], context=context)
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            context = {
+            search_view = data_obj.get_object(cr, uid, 'crm', 'view_crm_case_meetings_filter', context)
+            calendar_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_calendar_view_meet', context)
+            form_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_form_view_meet', context)
+            tree_view = data_obj.get_object(cr, uid, 'crm', 'crm_case_tree_view_meet', context)
+            category = data_obj.get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
+            context.update({
+                'default_applicant_id': opp.id,
                 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
                 'default_email_from': opp.email_from,
                 'default_state': 'open',
-                'default_name': opp.name
-            }
+                'default_categ_id': category.id,
+                'default_name': opp.name,
+            })
             value = {
                 'name': ('Meetings'),
                 'domain': "[('user_id','=',%s)]" % (uid),
@@ -335,10 +330,10 @@ class hr_applicant(base_stage, osv.Model):
                 'view_mode': 'calendar,form,tree',
                 'res_model': 'crm.meeting',
                 'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'views': [(calendar_view.id, 'calendar'), (form_view.id, 'form'), (tree_view.id, 'tree')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
-                'nodestroy': True
+                'search_view_id': search_view.id,
+                'nodestroy': True,
             }
         return value
 
@@ -550,6 +545,29 @@ class hr_job(osv.osv):
     _columns = {
         'survey_id': fields.many2one('survey', 'Interview Form', help="Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"),
     }
+    
+    def action_print_survey(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        datas = {}
+        record = self.browse(cr, uid, ids, context=context)[0]
+        if record.survey_id:
+            datas['ids'] = [record.survey_id.id]
+        datas['model'] = 'survey.print'
+        context.update({'response_id': [0], 'response_no': 0,})
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'survey.form',
+                'datas': datas,
+                'context' : context,
+                'nodestroy':True,
+            }
 
 
+class crm_meeting(osv.osv):
+    _inherit = 'crm.meeting'
+    _columns = {
+        'applicant_id': fields.many2one('hr.applicant','Applicant'),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 8cbebda5f1f..13436bef45a 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -5,6 +5,13 @@
 -->
 <data>
 
+    <!-- Case category (for interview meetings) -->
+    <record model="crm.case.categ" id="categ_meet_interview">
+        <field name="name">Interview</field>
+        <field name="section_id" ref="crm.section_sales_department"/>
+        <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+    </record>
+
         <!--    HR Recruitment Source        -->
 
     <record model="hr.recruitment.source" id="source_linkedin">
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 058eb3e2e6c..112adb9b5fb 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -54,7 +54,7 @@
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
 	
-	    <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="hr.action_hr_job" sequence="2"/>
+	    <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
 
 
     </data>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 75a74c88139..ae4cc365ec4 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -7,6 +7,15 @@
             parent="hr.menu_hr_configuration"
             sequence="40" />
 
+        <act_window
+            domain="[('applicant_id', '=', active_id)]"
+            id="act_hr_applicant_to_meeting"
+            name="Meetings"
+            res_model="crm.meeting"
+            src_model="hr.applicant"
+            view_mode="tree,form,calendar,graph"
+            view_type="form"/>
+
     # ------------------------------------------------------
     # Job Categories
     # ------------------------------------------------------
@@ -70,7 +79,7 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Jobs - Recruitment Form" version="7.0">
+          <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
                         states="open,pending"/>
@@ -89,76 +98,81 @@
                 <field name="stage_id" widget="statusbar"/>
             </header>
             <sheet>
-                <group col="4">
-                    <field name="name" string="Subject"/>
-                    <group colspan="2" col="4">
-                        <field name="partner_name"/>
-                        <button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
-                        <button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                    </group>
-                    <field name="user_id"/>
-                    <field name="job_id" on_change="onchange_job(job_id)"/>
-                    <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                    <field name="state" groups="base.group_no_one"/>
-                    <field name="date_action"/>
-                    <group colspan="2" col="8">
+                <div class="oe_right oe_form_button_box">
+                    <button name="action_makeMeeting" type="object"
+                        string="Schedule Interview" icon="gtk-index" help="Schedule interview with this applicant"/>
+                    <button name="%(survey.action_view_survey_question_message)d" type="action"
+                        string="Start Interview" icon="gtk-execute" help="Answer related job question"
+                        context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
+                        attrs="{'invisible':[('survey','=',False)]}"/>
+                    <button name="action_print_survey" type="object"
+                        string="Print Interview" icon="gtk-print" help="Print interview report"
+                        attrs="{'invisible':[('survey','=',False)]}"/>
+                </div>
+                <div class="oe_form_title">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1><field name="name"/></h1>
+                    <label for="partner_name" class="oe_form_readonly_hidden"/>
+                    <h2><field name="partner_name"/></h2>
+                    <field name="type_id" placeholder="Degree"/>
+                </div>
+
+                <group>
+                    <group>
+                        <field name="user_id"/>
                         <field name="title_action"/>
-                        <field name="survey" invisible="1"/>
-                        <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <field name="response" invisible="1"/>
+                        <field name="date_action"/>
+                    </group>
+                    <group>
+                        <field name="job_id" on_change="onchange_job(job_id)"/>
+                        <field name="priority" string="Appreciation"/>
+                        <field name="survey" invisible="1"/>
+                        <field name="response" invisible="1"/>
+                        <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
-                    <newline/>
                 </group>
-                <notebook colspan="4">
-                    <page string="Job Info">
+                <notebook>
+                    <page string="Application">
                         <group>
                             <group string="Contact">
                                 <label for="partner_id"/>
                                 <div>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
-                                    <button string="Create Partner"
-                                        name="%(action_hr_recruitment_partner_create)d"
-                                        icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
+                                    <field name="partner_id" class="oe_form_inline"
+                                        on_change="onchange_partner_id(partner_id, email_from)"/>
+                                    <button class="oe_form_inline"
+                                        string="Create" help="Create a new contact for this applicant" icon="gtk-index"
+                                        name="%(action_hr_recruitment_partner_create)d" type="action"
+                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
                                 </div>
-                                <field name="email_from"/>
+                                <field name="email_from" widget="email"/>
                                 <field name="partner_phone"/>
                                 <field name="partner_mobile"/>
                             </group>
-                            <group string="Contract Data">
-                                <field name="availability"/>
-                                <field name="salary_expected"/>
-                                <field name="salary_expected_extra" nolabel="1"/>
-                                <field name="salary_proposed"/>
-                                <field name="salary_proposed_extra" nolabel="1"/>
-                            </group>
-                            <group string="Qualification">
-                                <field name="type_id"/>
-                                <field name="priority" string="Appreciation"/>
+                            <group string="Reference">
                                 <field name="source_id"/>
                                 <field name="reference"/>
                             </group>
-                            <group string="Dates">
-                               <field name="create_date"/>
-                               <field name="write_date"/>
-                               <field name="date_closed"/>
-                               <field name="date_open"/>
+                            <group string="Contract">
+                                <field name="salary_expected"/>
+                                <field name="salary_expected_extra"/>
+                                <field name="salary_proposed"/>
+                                <field name="salary_proposed_extra"/>
+                                <field name="availability"/>
                             </group>
                         </group>
+                        <separator string="Details"/>
+                        <field name="description"/>
                    </page>
-                 <page string="Notes">
-                     <field name="description"/>
-                 </page>
                 </notebook>
             </sheet>
-            <div class="oe_form_bottom">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-            </div>
-            </form>
+            <footer>
+                <field name="message_ids" widget="ThreadView"/>
+            </footer>
+          </form>
         </field>
     </record>
 
-
     <record model="ir.ui.view" id="crm_case_graph_view_job">
         <field name="name">Jobs - Recruitment Graph</field>
         <field name="model">hr.applicant</field>
@@ -233,7 +247,7 @@
                 date_start="date_action" color="user_id">
                 <field name="name" />
                 <field name="partner_name" />
-                <field name="stage_id" />
+                <field name="title_action"/>
             </calendar>
         </field>
     </record>
@@ -252,93 +266,70 @@
                 <field name="survey"/>
                 <field name="user_id"/>
                 <field name="user_email"/>
-                <templates>
-                    <t t-name="partner-infos">
-                        <div t-if="record.partner_phone.raw_value">
-                            Phone: <field name="partner_phone"/>
-                        </div>
-                        <div t-if="record.partner_mobile.raw_value">
-                            Mobile: <field name="partner_mobile"/>
-                        </div>
-                    </t>
-                    <t t-name="kanban-box">
-                        <t t-if="record.priority.raw_value == 1" t-set="border">oe_kanban_color_red</t>
-                        <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                            <div class="oe_kanban_box oe_kanban_color_border">
-                                <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                <tr>
-                                    <td align="left" valign="middle" class="oe_kanban_title" tooltip="partner-infos">
+                <field name="partner_name"/>
+                <field name="type_id"/>
+                <field name="job_id"/>
+                 <field name="title_action"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-if="record.priority.raw_value == '1'" t-set="border">oe_kanban_color_green</t>
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
+                                <a class="oe_kanban_menuaction oe_i">B</a>
+                                <ul class="oe_kanban_menu">
+                                    <li><a type="edit">Edit...</a></li>
+                                    <li><a type="delete">Delete</a></li>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                </ul>
+                                <div class="oe_kanban_content" >
+                                    <h3 class="oe_kanban_ellipsis"><field name="name"/>
+                                    </h3> 
+                                    <div style="margin-bottom:2;padding-top:5px;white-space: nowrap;" >                               
                                         <field name="partner_name"/>
-                                        <t t-if="!record.partner_name.raw_value">
-                                            <field name="email_from"/>
-                                        </t>
-                                    </td>
-                                    <td valign="top" width="22"><img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/></td>
-                                </tr>
-                                </table>
-                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
-                                    <div class="oe_kanban_right">
-                                        <span class="oe_kanban_highlight">
+                                        <div class="oe_kanban_right">
+                                          <span class="oe_kanban_highlight">
                                             <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                             <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
-                                                <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
+                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
                                             </a>
                                             <a type="object" name="set_priority" args="['5']" t-if="priority lte 3">
-                                                <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
                                             </a>
                                             <a type="object" name="set_priority" args="['2']">
-                                                <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
                                             </a>
                                             <a type="object" name="set_priority" args="['1']">
-                                                <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
                                             </a>
-                                        </span>
+                                         </span>
+                                     </div>
+                                  </div>
+                                  <div style="white-space: nowrap;" >
+                                        <div t-if="record.type_id.raw_value">
+                                          (<field name="type_id"/>)
+                                        </div>
+                                  </div>
+                                   <div style="padding-top:5px;white-space: nowrap;" >
+                                      <t t-if="record.job_id.raw_value">Applied for <field name="job_id" /></t> 
+                                   </div>
+                                   <div style="padding-top:5px;white-space: nowrap;" >
+                                      <t t-if="record.title_action.raw_value">
+                                          <field name="title_action" /> on 
+                                           <field name="date_action" />
+                                       </t>
                                     </div>
-
-                                    <field name="job_id"/>
-                                    <t t-if="!record.job_id.raw_value">
-                                        <field name="name"/>
-                                    </t>
-
-                                    <div class="oe_kanban_clear" style="padding-top: 4px"/>
-
-                                    <div t-if="record.type_id.raw_value or record.source_id.raw_value">
-                                        <span t-if="record.type_id.raw_value" class="oe_kanban_highlight oe_kanban_button" style="font-size: 100%%">
-                                            <field name="type_id"/>
-                                        </span>
-                                        <span t-if="record.source_id.raw_value" class="oe_kanban_highlight oe_kanban_button" style="font-size: 100%%">
-                                            <field name="source_id"/>
-                                        </span>
+                                    <div align="left" width="22" style="padding-top:5px;white-space: nowrap;" >
+                                      <div align="right">
+                                           <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                      </div>
                                     </div>
-                                    <div t-if="record.date_action.raw_value or record.title_action.raw_value">
-                                        <i t-if="record.date_action.raw_value"><field name="date_action"/> :</i> <field name="title_action"/>
-                                    </div>
-                                </div>
-                                <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                    <div class="oe_kanban_left">
-                                        <a string="Edit" icon="gtk-edit" type="edit"/>
-                                        <a string="Delete" icon="gtk-close" type="delete"/>
-                                        <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                        <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
-                                        <a string="Schedule Meeting" name="action_makeMeeting" type="object" icon="stock_calendar"/>
-                                        <a t-if="record.survey.raw_value" name="action_print_survey" type="object" string="Print Interview" icon="gtk-print" />
-                                    </div>
-                                    <div class="oe_kanban_right">
-                                        <a name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                                        <a name="case_open" string="In Progress" states="draft,pending" type="object" icon="kanban-apply"/>
-                                        <a name="case_pending" string="Pending" states="open" type="object" icon="kanban-pause"/>
-                                        <a name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
-                                    </div>
-                                    <br class="oe_kanban_clear"/>
                                 </div>
                             </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
     # ------------------------------------------------------
     # HR Job
     # ------------------------------------------------------
@@ -349,8 +340,15 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="department_id" position="after">
-                <field name="survey_id"/>
+            <field name="expected_employees" version="7.0" position="after">
+                <label for="survey_id" />
+                <div>
+                    <field name="survey_id" class="oe_form_inline"/>
+                    <button class="oe_form_inline"
+                        string="Interview" icon="gtk-print"
+                        name="action_print_survey" type="object"
+                        attrs="{'invisible':[('survey_id','=',False)]}"/>
+                </div>
             </field>
         </field>
     </record>
@@ -379,7 +377,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Stage" version="7.0">
-                <group col="4" string="Stage Definition">
+                <group string="Stage Definition">
                     <field name="name"/>
                     <field name="department_id"/>
                     <field name="sequence"/>
@@ -406,7 +404,7 @@
         name="Stages"
         parent="menu_hr_recruitment_recruitment"
         action="hr_recruitment_stage_act"
-        sequence="1"/>
+        sequence="1" groups="base.group_no_one"/>
 
 <!-- Degree Tree View -->
 
@@ -471,10 +469,8 @@
         <field name="model">hr.recruitment.source</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Sources of Applicants" version="7.0">
-                <group>
-                    <field name="name"/>
-                </group>
+            <form string="Sources of Applicants">
+                <field name="name"/>
             </form>
         </field>
     </record>
@@ -490,6 +486,23 @@
             action="hr_recruitment_source_action"
             sequence="10" groups="base.group_no_one"/>
 
+    <record model="ir.ui.view" id="crm_meeting_form_view">
+        <field name="name">CRM - Meetings Form</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
+        <field name="arch" type="xml">
+            <field name="partner_id" position="before">
+                <field name="applicant_id" attrs="{'invisible': [('categ_id','!=',%(hr_recruitment.categ_meet_interview)d)]}"/>
+            </field>
+            <field name="partner_id" position="attributes">
+                <attribute name="attrs">{'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}</attribute>
+            </field>
+            <field name="section_id" position="attributes">
+                <attribute name="attrs">{'invisible': [('categ_id','=',%(hr_recruitment.categ_meet_interview)d)]}</attribute>
+            </field>
+        </field>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 7d141991480..7521fab460e 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -54,14 +54,9 @@ msgstr ""
 msgid "Sources of Applicants"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,delay_open:0
-msgid "Avg. Delay to Open"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
-msgid "# of Cases"
+msgid "# of Applications"
 msgstr ""
 
 #. module: hr_recruitment
@@ -150,7 +145,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0 view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
-msgid "Create Partner"
+msgid "Create Contact"
 msgstr ""
 
 #. module: hr_recruitment
@@ -160,7 +155,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
-msgid "Refered By"
+msgid "Referred By"
 msgstr ""
 
 #. module: hr_recruitment
@@ -239,6 +234,11 @@ msgstr ""
 msgid "Interview Form"
 msgstr ""
 
+#. module: hr_recruitment
+#: view:hr.job:0
+msgid "Interview"
+msgstr ""
+
 #. module: hr_recruitment
 #: help:hr.job,survey_id:0
 msgid ""
@@ -349,7 +349,7 @@ msgstr ""
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
 #, python-format
-msgid "A partner is already defined on this job request."
+msgid "A contact is already defined on this job request."
 msgstr ""
 
 #. module: hr_recruitment
@@ -516,6 +516,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
+#: field:hr.applicant,partner_id:0 view:hr.recruitment.report:0
 msgid "Contact"
 msgstr ""
 
@@ -530,7 +531,6 @@ msgid "Qualification"
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,partner_id:0 view:hr.recruitment.report:0
 #: field:hr.recruitment.report,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -828,7 +828,12 @@ msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
-msgid "Avg Salary Proposed"
+msgid "Avg. Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp_avg:0
+msgid "Avg. Expected Salary"
 msgstr ""
 
 #. module: hr_recruitment
@@ -871,7 +876,7 @@ msgstr ""
 
 #. module: hr_recruitment
 #: view:hr.recruitment.partner.create:0
-msgid "Are you sure you want to create a partner based on this job request ?"
+msgid "Are you sure you want to create a contact based on this job request ?"
 msgstr ""
 
 #. module: hr_recruitment
@@ -959,7 +964,7 @@ msgstr ""
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
 #, python-format
-msgid "A partner is already existing with the same name."
+msgid "A contact is already existing with the same name."
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 5c74bac4a5a..e888da9ead7 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -40,8 +40,8 @@ class hr_recruitment_report(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
+        'nbr': fields.integer('# of Applications', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -59,12 +59,11 @@ class hr_recruitment_report(osv.osv):
         'department_id': fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
-        'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
+        'salary_prop_avg' : fields.float("Avg. Proposed Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),
         'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
+        'salary_exp_avg' : fields.float("Avg. Expected Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),        
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'available': fields.float("Availability"),
-        'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg",
-                                       help="Number of Days to close the project issue"),
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
     }
@@ -93,7 +92,7 @@ class hr_recruitment_report(osv.osv):
                      sum(salary_proposed) as salary_prop,
                      (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
-                     extract('epoch' from (s.date_open-s.create_date))/(3600*24) as  delay_open,
+                     (sum(salary_expected)/count(*)) as salary_exp_avg,
                      extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
                      count(*) as nbr
                  from hr_applicant s
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 6fee524157a..16281eeb918 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -9,23 +9,24 @@
             <tree string="Recruitment Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
-                <field name="job_id" invisible="1"/>
+                <field name="job_id"/>
                 <field name="stage_id" invisible="1" />
                 <field name="department_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
-                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="company_id" groups="base.group_multi_company" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
-                <field name="nbr" sum="# Cases"/>
+                <field name="nbr" sum="# of Applications"/>
                 <field name="available" sum="Available"/>
                 <field name="salary_exp" sum="Expected Salary"/>
+                <field name="salary_exp_avg" sum="Avg Expected Salary" />
                 <field name="salary_prop" sum="Proposed Salary" />
                 <field name="salary_prop_avg" sum="Avg Proposed Salary" />
-                <field name="delay_open" avg='Avg Delay to Open'/>
                 <field name="delay_close" avg='Avg Delay to Close'/>
+                <field name="priority"/>
             </tree>
         </field>
     </record>
@@ -129,7 +130,6 @@
         <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
     <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index 5e868e6f49a..ef44a4e253d 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -36,7 +36,7 @@ class hr_recruitment_partner_create(osv.osv_memory):
         for case in case_obj.browse(cr, uid, context['active_ids'], context=context):
             if case.partner_id:
                 raise osv.except_osv(_('Error !'),
-                    _('A partner is already defined on this job request.'))
+                    _('A contact is already defined on this job request.'))
         pass
 
     def make_order(self, cr, uid, ids, context=None):
@@ -53,7 +53,7 @@ class hr_recruitment_partner_create(osv.osv_memory):
         for case in case_obj.browse(cr, uid, context['active_ids'], context=context):
             partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)], context=context)
             if partner_id:
-                raise osv.except_osv(_('Error !'),_('A partner is already existing with the same name.'))
+                raise osv.except_osv(_('Error !'),_('A contact is already existing with the same name.'))
             partner_id = partner_obj.create(cr, uid, {
                 'name': case.partner_name or case.name,
                 'user_id': case.user_id.id,
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 1a779fba1f9..15bede42e96 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -9,19 +9,19 @@
             <field name="arch" type="xml">
 			<form string="Convert To Partner">
 			    <group col="4" colspan="6">
-			            <label string="Are you sure you want to create a partner based on this job request ?"/>
+			            <label string="Are you sure you want to create a contact based on this job request ?"/>
 				</group>
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="make_order" string="Create Partner" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager"/>
+					<button name="make_order" string="Create Contact" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager"/>
 				</group>
 			</form>
             </field>
         </record>
 
         <record id="action_hr_recruitment_partner_create" model="ir.actions.act_window">
-            <field name="name">Create Partner</field>
+            <field name="name">Create Contact</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.recruitment.partner.create</field>
             <field name="view_type">form</field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 3dc825e4519..4c5c22d9894 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -107,7 +107,7 @@
             </field>
         </record>
 
-        <menuitem id="menu_hr_timesheet_reports" parent="base.menu_hr_reports" sequence="5" name="Timesheet"/>
+        <menuitem id="menu_hr_timesheet_reports" parent="hr.menu_hr_reporting" sequence="5" name="Timesheet"/>
 
 
     </data>
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index df51e03b685..16ef5249809 100644
--- a/addons/hr_timesheet/i18n/ar.po
+++ b/addons/hr_timesheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -467,8 +467,8 @@ msgstr "معلومات عامة"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "سجل الدوام الخاص بي"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -667,6 +667,9 @@ msgstr "تغيير العمل"
 #~ msgid "To be invoiced"
 #~ msgstr "لتتضمن في الفاتورة"
 
+#~ msgid "My Timesheet"
+#~ msgstr "سجل الدوام الخاص بي"
+
 #~ msgid "Anlytic account"
 #~ msgstr "حساب تحليلي"
 
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 6abda281c74..17442b1f33f 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Обща информация"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Моят график"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -663,5 +663,8 @@ msgstr ""
 #~ msgid "Analytic line"
 #~ msgstr "Аналитичен ред"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Моят график"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Услуги по график"
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index 8bce7bd7023..7862ee3dc1a 100644
--- a/addons/hr_timesheet/i18n/bs.po
+++ b/addons/hr_timesheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index df7c258b044..609409c2811 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -472,8 +472,8 @@ msgstr "Informació general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "El meu part d'hores"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -809,3 +809,6 @@ msgstr "Canvia treball"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Registrar entrada/sortida per projecte"
+
+#~ msgid "My Timesheet"
+#~ msgstr "El meu part d'hores"
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index d25a516a8a2..59b1a7df048 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_timesheet
@@ -473,8 +473,8 @@ msgstr "Obecné informace"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Moje časové rozvrhy"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -722,6 +722,9 @@ msgstr "Změnit práci"
 #~ msgid "To be invoiced"
 #~ msgstr "K fakturaci"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Moje časové rozvrhy"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Souhrn analýzy"
 
diff --git a/addons/hr_timesheet/i18n/da.po b/addons/hr_timesheet/i18n/da.po
index c876b4e34e0..0025f7e00f1 100644
--- a/addons/hr_timesheet/i18n/da.po
+++ b/addons/hr_timesheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index d3fb821ad79..5c81c3a3ebc 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -479,8 +479,8 @@ msgstr "Grundinformation"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Meine Zeiterfassung"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -768,6 +768,9 @@ msgstr "Ändere Projekt /Aufgabe"
 #~ "Fehler: Die Standard Mengeneinheit (ME) sowie die Beschaffungs Mengeneinheit "
 #~ "(ME) muss in derselben Kategorie sein."
 
+#~ msgid "My Timesheet"
+#~ msgstr "Meine Zeiterfassung"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Analytisches Konto"
 
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index 2dea4974f57..517e19a988b 100644
--- a/addons/hr_timesheet/i18n/el.po
+++ b/addons/hr_timesheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -462,7 +462,7 @@ msgstr "Γενικές Πληροφορίες"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 326641598d9..d600cc7d4a6 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -471,8 +471,8 @@ msgstr "Información general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Mi parte de horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -798,6 +798,9 @@ msgstr "Cambiar trabajo"
 #~ "establecer una gestión por asunto.\n"
 #~ "    "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mi parte de horas"
+
 #~ msgid "Service on Timesheet"
 #~ msgstr "Servicio en parte de horas"
 
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index 82c9a9461fa..222bdc625fa 100644
--- a/addons/hr_timesheet/i18n/es_AR.po
+++ b/addons/hr_timesheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Información General"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/es_CR.po b/addons/hr_timesheet/i18n/es_CR.po
index 038ad5ff3f5..7c0d17f2799 100644
--- a/addons/hr_timesheet/i18n/es_CR.po
+++ b/addons/hr_timesheet/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -478,8 +478,8 @@ msgstr "Información general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Mi parte de horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -660,3 +660,6 @@ msgstr "Cambiar trabajo"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Registrar entrada/salir por proyecto"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Mi parte de horas"
diff --git a/addons/hr_timesheet/i18n/es_EC.po b/addons/hr_timesheet/i18n/es_EC.po
index 66bab56efff..7f0ae452f89 100644
--- a/addons/hr_timesheet/i18n/es_EC.po
+++ b/addons/hr_timesheet/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -476,8 +476,8 @@ msgstr "Información general"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "My horario"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -658,3 +658,6 @@ msgstr "Cambiar trabajo"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Acceder/salir del proyecto"
+
+#~ msgid "My Timesheet"
+#~ msgstr "My horario"
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index dd0ba997865..ef049db4ce9 100644
--- a/addons/hr_timesheet/i18n/et.po
+++ b/addons/hr_timesheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Üldine info"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index 5205b4bab0f..414638eae7b 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Yleiset Tiedot"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Minun tuntikortti"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -732,6 +732,9 @@ msgstr "Vaihda työtä"
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "Virhe! Osastoa, jolla työntekijä on esimiehenä, ei voi valita."
 
+#~ msgid "My Timesheet"
+#~ msgstr "Minun tuntikortti"
+
 #~ msgid "Partner Id"
 #~ msgstr "Kumppanin tunnus"
 
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 6d09af802be..080b0e0bb1f 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
@@ -481,8 +481,8 @@ msgstr "Informations générales"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Ma feuille de temps"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -764,6 +764,9 @@ msgstr "Changer de travail"
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Entrée/Sortie par projet"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Ma feuille de temps"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Compte analytique"
 
diff --git a/addons/hr_timesheet/i18n/gl.po b/addons/hr_timesheet/i18n/gl.po
index f4c564f8537..d40b8f46fbc 100644
--- a/addons/hr_timesheet/i18n/gl.po
+++ b/addons/hr_timesheet/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -471,8 +471,8 @@ msgstr "Información xeral"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "O meu parte de horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -692,6 +692,9 @@ msgstr "Cambiar traballo"
 #~ msgid "To be invoiced"
 #~ msgstr "A facturar"
 
+#~ msgid "My Timesheet"
+#~ msgstr "O meu parte de horas"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Resumo da análise"
 
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index 388828719e5..5e5f0def946 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "Language: hr\n"
 
 #. module: hr_timesheet
@@ -460,7 +460,7 @@ msgstr "Opći Podaci"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index 07450f04ca0..21027a659b1 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -446,7 +446,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index 413303c30b5..5efc5cc1002 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -473,8 +473,8 @@ msgstr "Általános információ"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Munkaidőm"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -660,6 +660,9 @@ msgstr "Másik munkára váltás"
 #~ msgid "To be invoiced"
 #~ msgstr "Számlázandó"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Munkaidőm"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Elemzés összesító"
 
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index 35d8afe5d0b..a22daba3961 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index 5a82902d664..b14f1512b3c 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -468,8 +468,8 @@ msgstr "Informazioni Generali"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Il mio Timesheet"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -754,6 +754,9 @@ msgstr "Cambia Lavoro"
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Ingresso/Uscita per Progetto"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Il mio Timesheet"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Conto analitico"
 
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 0aa5e1bbdfd..2e6071624fb 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -466,8 +466,8 @@ msgstr "一般情報"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "私の勤務表"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -645,3 +645,6 @@ msgstr "作業の変更"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "プロジェクトごとにサインイン / サインアウト"
+
+#~ msgid "My Timesheet"
+#~ msgstr "私の勤務表"
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index 4ef8fe52241..15bd67e12a7 100644
--- a/addons/hr_timesheet/i18n/ko.po
+++ b/addons/hr_timesheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr "일반 정보"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index 34aa60debf7..d19b043eb75 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index 6c8db7e11a1..a952b205b44 100644
--- a/addons/hr_timesheet/i18n/lv.po
+++ b/addons/hr_timesheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -469,8 +469,8 @@ msgstr "Vispārīgā informācija"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Personīgā Darba laika uzskaites Tabele"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -773,6 +773,9 @@ msgstr "Izmainīt Darbu"
 #~ msgid "Anlytic account"
 #~ msgstr "Analītiskais konts"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Personīgā Darba laika uzskaites Tabele"
+
 #~ msgid "Partner Id"
 #~ msgstr "Partnera ID"
 
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index 1f44a60fcd3..2d5f2c1f0b4 100644
--- a/addons/hr_timesheet/i18n/mn.po
+++ b/addons/hr_timesheet/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -468,8 +468,8 @@ msgstr "Ерөнхий мэдээлэл"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Өөрийн цаг бүртгэл"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -675,6 +675,9 @@ msgstr "Ажлыг өөрчлөх"
 #~ msgid "To be invoiced"
 #~ msgstr "Нэхэмжлэл үүсгэх"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Өөрийн цаг бүртгэл"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Аналитик данс"
 
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
index 67e57503462..18344658f5b 100644
--- a/addons/hr_timesheet/i18n/nb.po
+++ b/addons/hr_timesheet/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Generell informasjon"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Min timeliste"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -638,6 +638,9 @@ msgstr ""
 #~ msgid "Analytic Account"
 #~ msgstr "Analytisk konto"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Min timeliste"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Analytisk konto"
 
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index 83edd638525..53ce23030df 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -476,8 +476,8 @@ msgstr "Algemene informatie"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Mijn urenverantwoording"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -770,6 +770,9 @@ msgstr "Verander taak"
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "In-/Uitklokken per project"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mijn urenverantwoording"
+
 #~ msgid "Anlytic account"
 #~ msgstr "Kostenplaats"
 
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index 1a35046dd80..fdd1535cd22 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -168,7 +168,7 @@ msgstr "Ostrzeżenie !"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Błąd Użytkownika"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
@@ -290,7 +290,7 @@ msgstr "Pozycja karty czasu pracy"
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "pracownicy"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -471,8 +471,8 @@ msgstr "Informacje ogólne"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Moja karta czasu pracy"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -740,5 +740,8 @@ msgstr "Zmień pracę"
 #~ msgid "Consultancy - Senior Developer"
 #~ msgstr "Konsultacje - Straszy inżynier"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Moja karta czasu pracy"
+
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Wejścia / Wyjścia wg projektów"
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index a0b241d7d67..648c4b357fc 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -129,7 +129,7 @@ msgstr "Montante Mínimo Analítico"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr "Folha de horas mensal do funcionário"
+msgstr "Folha de Horas Mensal do Funcionário"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -320,7 +320,7 @@ msgstr "Análise de fatura"
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr "Folha de Horas do funcionário"
+msgstr "Folha de Horas do Funcionário"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
@@ -396,7 +396,7 @@ msgstr "Junho"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Print My Timesheet"
-msgstr "Imprimir a minha folha de horas"
+msgstr "Imprimir a Minha Folha de Horas"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -476,8 +476,8 @@ msgstr "Informação Geral"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "A Minha Folha de Horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -502,7 +502,7 @@ msgstr "Cancelar"
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "Horário dos Funcionários"
+msgstr "Folhas de Horas dos Funcionários"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -816,3 +816,6 @@ msgstr "Mudar Trabalho"
 
 #~ msgid "Sign In/Out By Project"
 #~ msgstr "Sign In/Out por Projeto"
+
+#~ msgid "My Timesheet"
+#~ msgstr "A Minha Folha de Horas"
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index 6a907525ac5..668b4812eb0 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,8 +460,8 @@ msgstr "Informação Geral"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Minha Planilha de Horas"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -680,3 +680,6 @@ msgstr "Alterar Trabalho"
 
 #~ msgid "Analytic line"
 #~ msgstr "Linha analítica"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Minha Planilha de Horas"
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index d137a6e4e25..e1f22e8b262 100644
--- a/addons/hr_timesheet/i18n/ro.po
+++ b/addons/hr_timesheet/i18n/ro.po
@@ -13,31 +13,31 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
-msgstr "Mie"
+msgstr "Miercuri"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr "(Pastrati necompletat pentru data curenta)"
+msgstr "(Lasati necompletat pentru data_curenta)"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "Nici un salariat nu ete definit pentru acest utilizator !"
+msgstr "Nici un angajat nu este definit pentru utilizatorul dumneavoastra !"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -47,66 +47,66 @@ msgid ""
 "analytic account. This feature allows to record at the same time the "
 "attendance and the timesheet."
 msgstr ""
-"Angajatii isi pot coda timpul petrecut cu diferite proiecte. Un proiect este "
-"un cont analitic, iar timpul petrecut la un proiect generează cheltuieli in "
-"contul analitic. Această caracteristică permite inregistrarea in acelasi "
-"timp si a prezentei si a foii de pontaj."
+"Angajatii isi pot inregistra timpul petrecut cu diferite proiecte. Un "
+"proiect este un cont analitic, iar timpul petrecut la un proiect genereaza "
+"cheltuieli in contul analitic. Aceasta caracteristica permite inregistrarea "
+"in acelasi timp si a prezentei si a fisei de pontaj."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Today"
-msgstr "Astăzi"
+msgstr "Astazi"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr "Jurnal analitic"
+msgstr "Jurnal Analitic"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr "Încetarea lucrului"
+msgstr "Incetarea lucrului"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
 msgid "Employee Timesheet"
-msgstr "Foaie de pontaj angajat"
+msgstr "Fisa de pontaj angajat"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr "Statistici sarcini îndeplinite"
+msgstr "Statistica sarcini efectuate"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
 msgid "Timesheet"
-msgstr "Foaie de pontaj"
+msgstr "Fisa de pontaj"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
-msgstr "Lun"
+msgstr "Luni"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in"
-msgstr "Intrat"
+msgstr "Autentificare"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
-msgstr "Vin"
+msgstr "Vineri"
 
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "UdeM"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -116,20 +116,20 @@ msgid ""
 "project generates costs on the analytic account. This feature allows to "
 "record at the same time the attendance and the timesheet."
 msgstr ""
-"Angajatii isi pot coda timpul petrecut cu diferite proiecte care le sunt "
-"atribuite. Un proiect este un cont analitic, iar timpul petrecut cu un "
-"proiect generează cheltuieli in contul analitic. Această caracteristică "
-"permite inregistrarea in acelasi timp si a prezentei si a foii de pontaj."
+"Angajatii isi pot inregistra timpul petrecut cu diferite proiecte care le "
+"sunt atribuite. Un proiect este un cont analitic, iar timpul petrecut cu un "
+"proiect genereaza cheltuieli in contul analitic. Aceasta caracteristica "
+"permite inregistrarea in acelasi timp si a prezentei si a fisei de pontaj."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr "Suma analitica minima"
+msgstr "Suma Analitica Minima"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr "Foaie de pontaj lunară a angajatului"
+msgstr "Fisa de pontaj lunara a angajatului"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -146,31 +146,31 @@ msgstr "Starea curenta"
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr "Nume angajați"
+msgstr "Nume angajati"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Proiect / Cont Analitic"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr "Imprima Foaia de pontaj a angajatilor"
+msgstr "Tipariti Fisa de pontaj a angajatilor"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:175
 #: code:addons/hr_timesheet/hr_timesheet.py:177
 #, python-format
 msgid "Warning !"
-msgstr "Avertisment !"
+msgstr "Avertizare !"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
-msgstr "Eroare Utilizator"
+msgstr "EroareUtilizator"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
@@ -183,18 +183,18 @@ msgstr "Nici o unitate de cost nu este definita pentru acest salariat !"
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
-msgstr "Mar"
+msgstr "Marti"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
-msgstr "Avertisment"
+msgstr "Atentionare"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -207,37 +207,37 @@ msgstr "Semnare la intrare/la iesire după Proiect"
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
-msgstr "Sam"
+msgstr "Sambata"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
-msgstr "Dum"
+msgstr "Duminica"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Cont analitic"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 #: view:hr.analytical.timesheet.users:0
 msgid "Print"
-msgstr "Tiparire"
+msgstr "Tipariti"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Lines"
-msgstr "Linii foaie de pontaj"
+msgstr "Linii Fisa de pontaj"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr "Foaie de pontaj lunară a angajatului"
+msgstr "Fisa de pontaj lunara a angajatului"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -252,7 +252,7 @@ msgstr "Iulie"
 #: field:hr.sign.in.project,date:0
 #: field:hr.sign.out.project,date_start:0
 msgid "Starting Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -263,11 +263,13 @@ msgstr "Categorii"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj "
+"Confirmata/Efectuata !."
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr "Specifică numirea angajatului drept un produs de tipul 'servici'."
+msgstr "Specifica numirea angajatului drept un produs de tipul 'servici'."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -286,7 +288,7 @@ msgstr "Septembrie"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linie foaie de pontaj"
+msgstr "Linie Fisa de pontaj"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
@@ -296,14 +298,14 @@ msgstr "angajati"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr "Statistici lunare"
+msgstr "Statistici dupa luna"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 #: field:hr.analytical.timesheet.employee,month:0
 #: field:hr.analytical.timesheet.users,month:0
 msgid "Month"
-msgstr "Lună"
+msgstr "Luna"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,info:0
@@ -313,28 +315,28 @@ msgstr "Descrierea muncii"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Analiza facturii"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr "Foaia de pontaj a salariatului"
+msgstr "Fisa de pontaj a angajatului"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
 msgid "Sign in / Sign out by project"
-msgstr "Pontaj intrari / iesiri pe proiect"
+msgstr "Pontaj intrare / iesire dupa proiect"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr ""
+msgstr "Definiti-va Structura Analitica"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in / Sign out"
-msgstr "Pontaj Intrari / Iesiri"
+msgstr "Pontaj Intrare / Iesire"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:175
@@ -350,12 +352,12 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr "(Lăsati necompletat pentru timpul curent)"
+msgstr "(Lasati necompletat pentru moment)"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "Foi de pontaj"
+msgstr "Fise de pontaj"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
@@ -364,11 +366,15 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
+"Ar trebui sa creati o structura a contului analitic in functie de nevoile d-"
+"voastra de analiza a costurilor si a veniturilor. In OpenERP, conturile "
+"analitice sunt folosite de asemenea pentru a tine evidenta contractelor "
+"clientilor."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linie analitica"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -391,12 +397,12 @@ msgstr "Iunie"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Print My Timesheet"
-msgstr "Imprimă Foaia mea de pontaj"
+msgstr "Tipareste Fisa mea de pontaj"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Date"
-msgstr "Dată"
+msgstr "Data"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -415,7 +421,7 @@ msgstr "Eroare ! Nu puteti crea Ierarhii recursive ale Angajatilor."
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
 msgid "Closing Date"
-msgstr "Data închidere"
+msgstr "Data de inchidere"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -455,7 +461,7 @@ msgstr "Analiza statistica"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr "Imprimă Foaia de Pontaj a angajatului & Imprimă Foaia mea de pontaj"
+msgstr "Tipariti Fisa de Pontaj a angajatului & Tipareste Fisa mea de pontaj"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
@@ -466,12 +472,12 @@ msgstr "ID angajat"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "General Information"
-msgstr "Informații generale"
+msgstr "Informatii generale"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Foaia mea de pontaj"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -488,7 +494,7 @@ msgstr "Decembrie"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Cancel"
-msgstr "Anulare"
+msgstr "Anulati"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
@@ -496,12 +502,12 @@ msgstr "Anulare"
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "Foaia de pontaj a angajatilor"
+msgstr "Fisa de pontaj a angajatilor"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr "Informații"
+msgstr "Informatii"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
@@ -515,17 +521,19 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
+"Prin acest meniu va puteti inregistra si urmari orele lucrate la proiect in "
+"fiecare zi."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
 #: field:hr.sign.out.project,server_date:0
 msgid "Current Date"
-msgstr "Data curentă"
+msgstr "Data curenta"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
-msgstr "Acest wizard va imprima foaia de pontaj lunară"
+msgstr "Acest wizard va imprima fisa de pontaj lunara"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -555,12 +563,12 @@ msgstr "Timp total"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(fus orar de pe server)"
+msgstr "(ora locala pe partea de server)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr "Semnare la intrare după Proiect"
+msgstr "Pontaj la intrare dupa Proiect"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -574,12 +582,12 @@ msgstr "Februarie"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr "Semnează la iesire după Proiect"
+msgstr "Pontaj la iesire dupa Proiect"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr "Angajați"
+msgstr "Angajati"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -607,7 +615,7 @@ msgid ""
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
 "Nici un cont analitic nu este definit pentru acest  proiect.\n"
-"Configurati unul altfel nu va fi posibila completarea automata a foilor de "
+"Configurati unul, altfel nu va fi posibila completarea automata a fiselor de "
 "pontaj."
 
 #. module: hr_timesheet
@@ -619,18 +627,18 @@ msgstr "Utilizatori"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Start Working"
-msgstr "Inceputul lucrului"
+msgstr "Incepeti lucrul"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr "Statistici pe utilizator"
+msgstr "Statistici dupa utilizator"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
-msgstr "Nu există nici un angajat definit pentru acest utilizator"
+msgstr "Nu exista nici un angajat definit pentru acest utilizator"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,year:0
@@ -646,7 +654,7 @@ msgstr "Contabilitate"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Change Work"
-msgstr "Schimba activitatea"
+msgstr "Schimbati activitatea"
 
 #~ msgid "Day"
 #~ msgstr "Zi"
@@ -738,9 +746,6 @@ msgstr "Schimba activitatea"
 #~ "Prin Programul de lucru puteti vă puteti inregistra orele de lucru după "
 #~ "proiect in fiecare zi."
 
-#~ msgid "Sign In/Out By Project"
-#~ msgstr "Semnare la intrare/la iesire după Proiect"
-
 #~ msgid "Anlytic account"
 #~ msgstr "Cont analitic"
 
@@ -784,3 +789,9 @@ msgstr "Schimba activitatea"
 #~ msgstr ""
 #~ "Numele obiectului trebuie să înceapă cu x_ și să nu conțină nici un caracter "
 #~ "special !"
+
+#~ msgid "Sign In/Out By Project"
+#~ msgstr "Intrare/Iesire dupa Proiect"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Fisa mea de pontaj"
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index 1a439e10f05..6ee1541e17d 100644
--- a/addons/hr_timesheet/i18n/ru.po
+++ b/addons/hr_timesheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -470,8 +470,8 @@ msgstr "Общая информация"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Моё расписание"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -777,5 +777,8 @@ msgstr "Изменить неделю"
 #~ msgid "Partner Id"
 #~ msgstr "ID контрагента"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Моё расписание"
+
 #~ msgid "Analysis summary"
 #~ msgstr "Итог анализа"
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index 91345467e54..167358c5237 100644
--- a/addons/hr_timesheet/i18n/sl.po
+++ b/addons/hr_timesheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Splošne informacije"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index a862f816f00..be89e1c0d9a 100644
--- a/addons/hr_timesheet/i18n/sq.po
+++ b/addons/hr_timesheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sr@latin.po b/addons/hr_timesheet/i18n/sr@latin.po
index 18b9c3cc334..ce4e15d5500 100644
--- a/addons/hr_timesheet/i18n/sr@latin.po
+++ b/addons/hr_timesheet/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index a0c454fcea0..e6140fb8d35 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -105,7 +105,7 @@ msgstr "Fri"
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -149,7 +149,7 @@ msgstr "Namn på anställda"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekt / objektkonto"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -192,7 +192,7 @@ msgstr "Varning"
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -217,7 +217,7 @@ msgstr "Sun"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Objektkonto"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -260,7 +260,7 @@ msgstr "Kategorier"
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Du kan inte ändra en post i en bekräftad/färdig tidrapport !"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
@@ -311,7 +311,7 @@ msgstr "Arbetsbeskrivning"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Fakturaanalys"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -327,7 +327,7 @@ msgstr "Logga in till/Logga ut från projektet"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr ""
+msgstr "Definiera din objektkontostruktur"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -341,6 +341,8 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
+"Objektjournal saknas för medarbetare %s\n"
+"Definiera en anställd för den valda användaren och tilldela en objektjournal!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -359,11 +361,14 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
+"Du bör skapa ett objektkontostruktur beroende på dina behov för att "
+"analysera kostnader och intäkter. I OpenERP, är objektkonton också "
+"användbara för att följa upp kundavtal."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Objektrad"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -465,8 +470,8 @@ msgstr "Allmän information"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "Min tidsrapport"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -510,6 +515,8 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
+"Genom denna meny kan du registrera och följa upp din arbetstid per projekt "
+"varje dag."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
@@ -752,6 +759,9 @@ msgstr "Ändra arbete"
 #~ msgid "Service on Timesheet"
 #~ msgstr "Underhåll på tidsrapporter"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Min tidsrapport"
+
 #~ msgid "Partner Id"
 #~ msgstr "Partner ID"
 
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index 7ae44d9f08d..b6eb50a7497 100644
--- a/addons/hr_timesheet/i18n/tlh.po
+++ b/addons/hr_timesheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index ab1b14e42e7..a9ab05def31 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index 2e4f591163a..2dc164d342e 100644
--- a/addons/hr_timesheet/i18n/uk.po
+++ b/addons/hr_timesheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr "Загальна інформація"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/vi.po b/addons/hr_timesheet/i18n/vi.po
index f1ce58fcc0d..4deb4682d3b 100644
--- a/addons/hr_timesheet/i18n/vi.po
+++ b/addons/hr_timesheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -460,7 +460,7 @@ msgstr "Thông tin chung"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index 529eb4f6555..a8e9eecbfa6 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -467,8 +467,8 @@ msgstr "一般信息"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
-msgstr "我的计工单"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -736,6 +736,9 @@ msgstr "修改工作"
 #~ msgid "Partner Id"
 #~ msgstr "业务伙伴ID"
 
+#~ msgid "My Timesheet"
+#~ msgstr "我的计工单"
+
 #~ msgid ""
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "错误！您不用为他选择一部门因为他是总经理(CEO)。"
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index 6255bb1d3f6..bdb7bcdf9a5 100644
--- a/addons/hr_timesheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "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:59+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -459,7 +459,7 @@ msgstr ""
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 197b3d2435d..1eda6de05cb 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -34,7 +34,7 @@
 
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
-        	parent="menu_hr_timesheet_reports"
+        	parent="menu_hr_reporting_timesheet"
         	sequence="2" icon="STOCK_PRINT"/>
 
 
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index f51ccc769c4..95b7bd3b93e 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -37,7 +37,7 @@
 
         <menuitem action="action_hr_timesheet_users"
         	id="menu_hr_timesheet_users"
-        	parent="menu_hr_timesheet_reports"
+        	parent="menu_hr_reporting_timesheet"
         	groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
 
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 99ac6edc675..56c18c82b7a 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -38,7 +38,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="hr_timesheet.menu_hr_timesheet_reports" icon="STOCK_PRINT"/>
+        	parent="hr_timesheet.menu_hr_reporting_timesheet" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 3f42c5d19a3..e66694223d2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -14,7 +14,7 @@
         </record>
 
         <record id="menu_act_hr_timesheet_sheet_form_my_current" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
+            <field name="name">My Current Timesheet</field>
             <field eval="1" name="sequence"/>
             <field name="parent_id" ref="hr_attendance.menu_hr_time_tracking"/>
             <field name="icon">STOCK_JUSTIFY_FILL</field>
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 18026822a78..9d394e9353d 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -185,6 +185,11 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
+"يفتح سجل الدوام الخاص بي  سجل دوامك بحيث يمكنك حجز نشاطاتك في النظام. من نفس "
+"الشكل، يمكنك تسجيل الحضور الخاص بك (تسجيل الدخول / خارج)، ووصف ساعات العمل "
+"يتم على مشاريع مختلفة. في نهاية المدة المحددة في الشركة، ويؤكد سجل الدوام من "
+"قبل المستخدم، ويمكن التحقق من صحتها من قبل مديره. إذا لزم الأمر، كما هو محدد "
+"في هذا المشروع، يمكنك إنشاء الفواتير بناء على سجل الدوام."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -236,7 +241,7 @@ msgstr "حساب تحليلي"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "# عدد"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -341,7 +346,7 @@ msgstr "إجمالي الوقت"
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Lines"
-msgstr "خطوط سجل الدوام"
+msgstr "خطوط الجدول الزمني"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -667,7 +672,7 @@ msgstr "يناير"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr "يسجل الموظف الدخول وسجيل الخروج."
+msgstr "يسجل الموظف الدخول وتسجيل الخروج."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -751,8 +756,8 @@ msgstr "يوم"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "سجل الدوام الخاص بي"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -820,6 +825,11 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * واستخدم الحالة \"مشروع\" عندما يقوم المستخدم بترميز سجل دوام جديد وغير "
+"مؤكد.\n"
+"* يتم استخدام الحالة \"مؤكد\" للتأكد من سجل الدوام من قبل المستخدم.\n"
+"* يتم استخدام الحالة \"تم\" عندما يتم قبول سجل الدوام للمستخدمين من قبل "
+"المدير له / لها."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -1079,9 +1089,55 @@ msgstr "يومية"
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "لايستطيع حذف السجلات التي تحتوي على مدخلات الحضور المرمزة !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "سجل الدوام الخاص بي"
+
 #~ msgid "No employee defined"
 #~ msgstr "لم يعرف الموظف"
 
 #, python-format
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "لا يمكنك تكرير سجل الدوام !"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module helps you to easily encode and validate timesheet and "
+#~ "attendances\n"
+#~ "within the same view. The upper part of the view is for attendances and\n"
+#~ "track (sign in/sign out) events. The lower part is for timesheet.\n"
+#~ "\n"
+#~ "Other tabs contains statistics views to help you analyse your\n"
+#~ "time or the time of your team:\n"
+#~ "* Time spent by day (with attendances)\n"
+#~ "* Time spent by project\n"
+#~ "\n"
+#~ "This module also implements a complete timesheet validation process:\n"
+#~ "* Draft sheet\n"
+#~ "* Confirmation at the end of the period by the employee\n"
+#~ "* Validation by the project manager\n"
+#~ "\n"
+#~ "The validation can be configured in the company:\n"
+#~ "* Period size (day, week, month, year)\n"
+#~ "* Maximal difference between timesheet and attendances\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "هذه الوحدة تساعدك على تشفير بسهولة والتحقق من صحة سجل الدوام والحضور\n"
+#~ "ضمن وجهة النظر نفسها. الجزء العلوي من وجهة النظر هو الحضور و\n"
+#~ "المسار (في التوقيع / تسجيل الخروج) أحداث. الجزء السفلي هو لسجل الدوام.\n"
+#~ "\n"
+#~ "علامات تبويب أخرى تحتوي على إحصاءات وجهات النظر التي تساعدك على تحليل الخاصة "
+#~ "بك\n"
+#~ "مرة أو مرة في فريقك:\n"
+#~ "* الوقت الذي يقضيه اليوم (مع الحضور)\n"
+#~ "* الوقت الذي يقضيه مشروع\n"
+#~ "\n"
+#~ "هذه الوحدة أيضا بتنفيذ التحقق من صحة سجل الدوام  الكامل العملية:\n"
+#~ "* سجل المشروع\n"
+#~ "* تأكيد في نهاية الفترة من قبل الموظف\n"
+#~ "* التحقق من الصحة من قبل مدير المشروع\n"
+#~ "\n"
+#~ "يمكن تكوين المصادقة في الشركة:\n"
+#~ "* حجم الفترة (يوم في الاسبوع والشهر والسنة)\n"
+#~ "*اقصى اختلاف بين سجل الدوام والحضور\n"
+#~ "    "
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index 3bd21af71dd..d62eb10f4f9 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,8 +742,8 @@ msgstr "Ден"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Моят график"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1042,5 +1042,8 @@ msgstr "Журнал"
 #~ msgid " Year "
 #~ msgstr " Година "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Моят график"
+
 #~ msgid "By Day"
 #~ msgstr "По ден"
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index c5279ac5a1b..2302c1b36b7 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-14 04:57+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 3ffa30ecfea..78062958efa 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -769,8 +769,8 @@ msgstr "Dia"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "El meu full d'assistència"
+msgid "My Current Timesheet"
+msgstr "El meu full de serveis actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1088,9 +1088,6 @@ msgstr "Diari"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Full de serveis esborrany"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "El meu full de serveis actual"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Full de serveis validat"
 
@@ -1342,3 +1339,6 @@ msgstr "Diari"
 #~ msgstr ""
 #~ "No podeu crear un full d'assistència per a un treballador que no té cap "
 #~ "usuari definit !"
+
+#~ msgid "My Timesheet"
+#~ msgstr "El meu full d'assistència"
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 8d230847655..9b200bfcbe2 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr "Den"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/da.po b/addons/hr_timesheet_sheet/i18n/da.po
index d0b571595c5..a9386ebb05a 100644
--- a/addons/hr_timesheet_sheet/i18n/da.po
+++ b/addons/hr_timesheet_sheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -743,7 +743,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index adb4f796112..248eb5b1824 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -783,7 +783,7 @@ msgstr "Tag"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr "Meine Zeiterfassung"
 
 #. module: hr_timesheet_sheet
@@ -1107,9 +1107,6 @@ msgstr "Journal"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Entwurf Zeiterfassung Tabelle"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Meine Zeiterfassung"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Bestätigte Zeiterfassung"
 
@@ -1300,6 +1297,9 @@ msgstr "Journal"
 #~ msgid " Year "
 #~ msgstr " Jahr "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Meine Zeiterfassung"
+
 #, python-format
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "Sie können Zeiterfassung nicht duplizieren!"
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 8fd0aab42ca..05585c38e45 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -748,8 +748,8 @@ msgstr "Ημέρα"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Τρέχον Φύλλο Xρόνου Eργασίας"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1060,9 +1060,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Πρόχειρο Φύλλο Xρόνου Eργασίας"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Τρέχον Φύλλο Xρόνου Eργασίας"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Επικυρωμένο Φύλλο Xρόνου Eργασίας"
 
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index e2df8d0b5d6..9efa9b7e4be 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -128,7 +128,7 @@ msgstr "Basado en la hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Agrupar por día o fecha"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
@@ -144,7 +144,7 @@ msgstr "Validar"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Aprobada"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -221,7 +221,7 @@ msgstr "Hoja de servicios por día"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Proyecto / cuenta analítica"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -363,7 +363,7 @@ msgstr "Horas"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Agrupar por mes o fecha"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -504,7 +504,7 @@ msgstr "Fichar/salir"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Esperando aprobación"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -530,7 +530,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -695,7 +695,7 @@ msgstr "Compañías"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -769,8 +769,8 @@ msgstr "Día"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Mi hoja de asistencia"
+msgid "My Current Timesheet"
+msgstr "Mi hoja de servicios actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -821,7 +821,7 @@ msgstr "Abrir hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Agrupar por año de la fecha"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -913,7 +913,7 @@ msgstr "Mueve entradas de tarea a la línea de hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Asistencias totales"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -941,7 +941,7 @@ msgstr "Febrero"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "¡El nombre de la compañía debe ser único!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1087,9 +1087,6 @@ msgstr "Diario"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Hoja de servicios borrador"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mi hoja de servicios actual"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Hoja de servicios validada"
 
@@ -1284,6 +1281,9 @@ msgstr "Diario"
 #~ "¡ No puede crear una hoja de asistencia para un empleado que no tiene ningún "
 #~ "usuario definido !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mi hoja de asistencia"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index 821ddb62d71..a47c4807a38 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -744,8 +744,8 @@ msgstr "Día"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Mi hoja de servicios actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1053,9 +1053,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Hoja de servicios borrador"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mi hoja de servicios actual"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Define entrada hoja de servicios del empleado"
 
diff --git a/addons/hr_timesheet_sheet/i18n/es_CR.po b/addons/hr_timesheet_sheet/i18n/es_CR.po
index ad12c16c44a..6633798e3e9 100644
--- a/addons/hr_timesheet_sheet/i18n/es_CR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_CR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-17 15:21+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-18 04:58+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 "Language: \n"
 
 #. module: hr_timesheet_sheet
@@ -784,8 +784,8 @@ msgstr "Día"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Mi hoja de asistencia"
+msgid "My Current Timesheet"
+msgstr "Mi hoja de servicios actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1082,6 +1082,9 @@ msgstr "Total"
 msgid "Journal"
 msgstr "Diario"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mi hoja de asistencia"
+
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Revisar final del día que la comprobación del día está completa"
 
@@ -1109,9 +1112,6 @@ msgstr "Diario"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Hoja de servicios borrador"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mi hoja de servicios actual"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Hoja de servicios validada"
 
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index edbbe3915a3..e5946f6ac67 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,8 +742,8 @@ msgstr "Päev"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Minu käesolev tööajaleht"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1044,9 +1044,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Tööajalehe lehe mustand"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Minu käesolev tööajaleht"
-
 #~ msgid "Confirm timesheet sheet"
 #~ msgstr "Kinnita tööajalehe leht"
 
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index 07c87b5c25f..d1d0eca2986 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -57,7 +57,7 @@ msgstr "Osasto"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Kuluvan vuoden tuntilista"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -85,12 +85,12 @@ msgstr "Maaliskuu"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "#kulut"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Edellisen kuukauden tuntilista"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
@@ -127,13 +127,13 @@ msgstr "Perustuu tuntilistaan"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Ryhmittele viikonpäivän mukaan"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet!"
-msgstr ""
+msgstr "Et voi muuttaa vientiä vahvistetussa tuntilistassa"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -143,7 +143,7 @@ msgstr "Vahvista"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Hyväksytty"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -162,6 +162,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"Luodaksesi tuntilistan tälle työntekijälle, työntekijälle pitää ensin "
+"määritellä analyyttinen päiväkirja!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -202,7 +204,7 @@ msgstr " Kuukausi-1 "
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Oman osaston tuntilista"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
@@ -212,7 +214,7 @@ msgstr "Tuntilista päivämäärän mukaan"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekti / Analyyttinen tili"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -354,7 +356,7 @@ msgstr "Tunnit"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Rymittele päivämäärän kuukauden mukaan"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -391,7 +393,7 @@ msgstr "Työskentele tehtävälle"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Päivittäinen"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -448,6 +450,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Luodaksesi tuntilistan tälle käyttäjälle, sinun pitää ensin linkittää "
+"työntekijä tuotteeseen, kuten 'konsultti'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -458,7 +462,7 @@ msgstr "Avaa nykyisen tuntilistasi"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Et voi kopioida tuntilistaa!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -484,6 +488,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Luodaksesi tuntilistan tälle käyttäjälle, sinun pitää ensin linkittää "
+"työntekijä tuotteeseen!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -493,7 +499,7 @@ msgstr "Kirjaudu sisään/ulos"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Odottaa hyväksyntää"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -516,7 +522,7 @@ msgstr "Sinun pitää valita nykyinen päivä joka on tuntilistalla !"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Merkintä"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -634,6 +640,8 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"2 tuntilistaa eivät voi olla päällekkäisiä!\n"
+"Ole hyvä ja käytä menuvalintaa 'oma tuntilista' välttääksesi tämän ongelman."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -655,6 +663,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"Tuntilistaa ei voida tarksitaa koska sisään ja uloskirjausten lukumäärä ei "
+"ole yhtäsuuri!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -674,7 +684,7 @@ msgstr "Yritykset"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "yhteenveto"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -682,6 +692,9 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"2 tuntilistaa eivät voi olla päällekkäisiä!\n"
+"Ole hyvä ja käytä menuvalintaa 'oma nykyinen tuntilista' välttääksesi tämän "
+"ongelman."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -692,7 +705,7 @@ msgstr "Tarkastamattomat tuntilistat"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries!"
-msgstr ""
+msgstr "Et voi poistaa tuntilistaa jolla on läsnäolotapahtumia!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -703,7 +716,7 @@ msgstr "Määrä"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Et voi poistaa tuntilistaa joka on jo vahvistettu!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -714,7 +727,7 @@ msgstr "Yleinen tili"
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Jakso johon tuntilistat vahvistetaan."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -748,7 +761,7 @@ msgstr "Päivä"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr "Oma tuntilista"
 
 #. module: hr_timesheet_sheet
@@ -764,7 +777,7 @@ msgstr "Tila on 'luonnos'."
 #. module: hr_timesheet_sheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Et voi muuttaa vientiä vahvistetussa/valmiissa tuntilistassa!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -784,7 +797,7 @@ msgstr "Laskuta työtä"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Kuluvan kuukauden tuntilista"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -800,7 +813,7 @@ msgstr "Avaa tuntilista"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Ryhmittele vuoden päivän mukaan"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -833,7 +846,7 @@ msgstr "Hae tuntilistaa"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Vahvistetut tuntilistat"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -886,7 +899,7 @@ msgstr "Siirtää tehtävänsyötön tuntilistan riville"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Läsnäolo yhteensä"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -914,7 +927,7 @@ msgstr "Helmikuu"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Yrityksen nimen pitää olla uniikki!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -955,17 +968,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"Luodaksesi tuntilistan tälle työntekijälle, sinun pitää kytkeä työntekijä "
+"analyyttiseen päiväkirjaan kuten 'tuntilista'!"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
 #, python-format
 msgid "You cannot sign in/sign out from an other date than today"
-msgstr ""
+msgstr "Et voi kirjautua sisään/ulos muulle kuin kuluvalle päivälle"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Lähetetty esimiehelle"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -985,6 +1000,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Luodaksesi tuntilistan tälle työntekijälle, sinun täytyy yhdistää se "
+"käyttäjätunnukseen!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1060,9 +1077,6 @@ msgstr "Loki"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Vedosta tuntilistan taulukko"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Oma tuntilista"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Määrittää työntekijän tuntilistan kohteen"
 
@@ -1234,6 +1248,9 @@ msgstr "Loki"
 #~ msgid " Year "
 #~ msgstr " Vuosi "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Oma tuntilista"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 6210ffbbb49..31aaae6b929 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -44,7 +44,7 @@ msgstr "Regrouper par..."
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
 msgid "Total Attendance"
-msgstr "Total des présences"
+msgstr "Total des pointages"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -56,7 +56,7 @@ msgstr "Département"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Feuille de temps de cette année"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -90,7 +90,7 @@ msgstr "Coût"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Feuille de temps du mois dernier"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
@@ -127,13 +127,14 @@ msgstr "Basé sur la feuille de temps"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Grouper par jour"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet!"
 msgstr ""
+"Vous ne pouvez pas modifier une entrée dans une feuille de temps confirmée !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -143,7 +144,7 @@ msgstr "Valider"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Approuvé"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -162,6 +163,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"Pour créer une feuille de temps pour cet employé, vous devez assigner un "
+"journal analytique à l'employé !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -189,13 +192,14 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
-"Ma Feuille de temps ouvre une feuille de temps de façon à vous permettre de "
+"Ma feuille de temps ouvre une feuille de temps de façon à vous permettre de "
 "saisir vos activités dans le système. Sur le même formulaire, vous pouvez "
 "enregistrer vos présences (entrées/sorties) et décrire les heures de travail "
-"effectuées sur les différents projets. A la fin de la période définie par la "
-"société, la feuille de temps est confirmée par l'utilisateur et peut être "
-"validée par son responsable. Si nécessaire, et comme défini pour chaque "
-"projet, vous pouvez générer les factures en fonction des feuilles de temps."
+"effectuées et les imputer sur les différents projets.\r\n"
+"A la fin de la période définie par la société, la feuille de temps est "
+"confirmée par l'utilisateur et peut être validée par son responsable. Si "
+"nécessaire, et comme défini pour chaque projet, vous pouvez générer les "
+"factures en fonction des feuilles de temps."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -210,17 +214,17 @@ msgstr " Mois -1 "
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Les feuilles de temps de mon département"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Day"
-msgstr "Feuilles de Présence par Jour"
+msgstr "Feuilles de temps par jour"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projet /Compte analytique"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -291,7 +295,7 @@ msgstr "Confirmer"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Lignes des feuilles de présence"
+msgstr "Lignes des feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
@@ -362,7 +366,7 @@ msgstr "Heures"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Regrouper par mois"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -401,7 +405,7 @@ msgstr "Travaille sur une tâche"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Quotidien"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -414,7 +418,7 @@ msgstr "Quantité"
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Total des feuilles de présence"
+msgstr "Total des feuilles de temps"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -458,6 +462,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez lier le "
+"salarié à un produit (par exemple : consultant) !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -468,7 +474,7 @@ msgstr "Ceci ouvrira votre feuille de temps actuelle"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Vous ne pouvez pas dupliquer une feuille de temps !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -494,6 +500,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez lier le "
+"salarié à un produit !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -503,7 +511,7 @@ msgstr "Pointer l'entrée / la sortie"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "En attente d'approbation"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -529,7 +537,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -601,7 +609,7 @@ msgstr ""
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by Period"
-msgstr "Feuilles de présence par période"
+msgstr "Feuilles de temps par période"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
@@ -613,7 +621,7 @@ msgstr "Utilisateur"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Account"
-msgstr "Feuilles de Présence par Compte"
+msgstr "Feuilles de temps par compte"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
@@ -654,6 +662,9 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Vous ne pouvez pas avoir 2 feuilles de temps qui se chevauchent (date de fin "
+"de la 1ère postérieure à la date de début de la seconde par exemple)!\n"
+"Vous devez utiliser le menu «Mes feuilles de temps» pour éviter ce problème."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -678,6 +689,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"La feuille de temps ne peut pas être validée car elle ne contient pas un "
+"nombre égal de pointages 'Entrée' et de de pointages 'Sortie'!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -697,7 +710,7 @@ msgstr "Sociétés"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Résumé"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -705,17 +718,22 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Vous ne pouvez pas avoir 2 feuilles de temps qui se chevauchent (date de fin "
+"de la 1ère postérieure à la date de début de la seconde par exemple)!\n"
+"Vous devez utiliser le menu «Mes feuilles de temps» pour éviter ce problème."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr "Feuilles de temps non validés"
+msgstr "Feuilles de temps non validées"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries!"
 msgstr ""
+"Vous ne pouvez pas supprimer une feuille de temps  qui contient des "
+"pointages !"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -727,6 +745,7 @@ msgstr "Quantité"
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
 msgstr ""
+"Vous ne pouvez pas supprimer une feuille de temps qui est déjà confirmée !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -737,7 +756,7 @@ msgstr "Compte général"
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Période pour laquelle vous pouvez valider vos feuille de temps"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -750,9 +769,9 @@ msgid ""
 "Allowed difference in hours between the sign in/out and the timesheet "
 "computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
-"Différence autorisée entre les heures de pointage en entrée/sortie et le "
-"calcul de la feuille de temps pour une feuille. Mettez \"0\" si vous ne "
-"souhaitez aucun contrôle."
+"Différence autorisée entre les heures de présence (pointage en "
+"entrée/sortie) et les temps saisis et imputés pour une feuille. Mettez \"0\" "
+"si vous ne souhaitez aucun contrôle."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
@@ -772,8 +791,8 @@ msgstr "Jour"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Ma feuille de temps"
+msgid "My Current Timesheet"
+msgstr "Ma Feuille de Présence actuelle"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -789,6 +808,8 @@ msgstr "L'état est 'Brouillon'"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Les relevés confirmés/terminés d'une feuille de temps ne peuvent plus être "
+"modifiés !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -808,12 +829,12 @@ msgstr "Facturé sur le réalisé"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Feuilles de temps de ce mois"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Feuille de présence par compte"
+msgstr "Feuille de temps par compte"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
@@ -824,7 +845,7 @@ msgstr "Ouvrir les feuilles de temps"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Regrouper par année"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -863,7 +884,7 @@ msgstr "Rechercher dans les feuilles de temps"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Feuilles de temps confirmées"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -916,7 +937,7 @@ msgstr "Reporte la saisie de la tâche sur une ligne de la feuille de temps"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Total des présences"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -944,7 +965,7 @@ msgstr "Février"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -985,17 +1006,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez affecter le "
+"salarié à un journal analytique, comme 'Timesheet'!"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
 #, python-format
 msgid "You cannot sign in/sign out from an other date than today"
-msgstr ""
+msgstr "Vous ne pouvez pas pointer pour un autre jour qu'aujourd'hui"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Soumettre au responsable"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1015,6 +1038,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Afin de créer une feuille de temps pour cet employé, vous devez le lier à un "
+"utilisateur !"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1076,9 +1101,6 @@ msgstr "Journal"
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Définir l'écriture de la feuille de temps de l'employé"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Ma Feuille de Présence actuelle"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Feuille de temps validée"
 
@@ -1258,6 +1280,9 @@ msgstr "Journal"
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "Impossible de supprimer une feuille qui a des saisies de présence !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Ma feuille de temps"
+
 #~ msgid ""
 #~ "\n"
 #~ "This module helps you to easily encode and validate timesheet and "
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index e54f7c0c1b5..2b184a63e55 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr "Dan"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index 70ba5d24f82..0eeae3beea5 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -761,7 +761,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index aeddf35ef58..28a77e822db 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -770,8 +770,8 @@ msgstr "Nap"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Munkaidő-kimutatásom"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1108,6 +1108,9 @@ msgstr "Napló"
 #~ "Nem lehet két egymást átfedő munkaidő-kimutatása!\n"
 #~ "Kérem, használja a Munkaidő-kimutatásom menüpontot a probléma elkerüléséhez."
 
+#~ msgid "My Timesheet"
+#~ msgstr "Munkaidő-kimutatásom"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot create a timesheet for an employee that does not have any user "
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 35890fecea9..7b1cfa8c0ee 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index 92aea2b7eca..8d6e0b6d7ad 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -753,8 +753,8 @@ msgstr "Giorno"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Il mio Timesheet"
+msgid "My Current Timesheet"
+msgstr "I Miei Orari di Lavoro attuali"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1047,9 +1047,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Bozza foglio ore"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "I Miei Orari di Lavoro attuali"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Convalida il foglio lavoro"
 
@@ -1248,6 +1245,9 @@ msgstr ""
 #~ msgid " Year "
 #~ msgstr " Anno "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Il mio Timesheet"
+
 #, python-format
 #~ msgid "You can not sign in from an other date than today"
 #~ msgstr "Non è possibile registrare una entrata in un giorno diverso da oggi"
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
index 0a4c608c839..9e1d2895fe7 100644
--- a/addons/hr_timesheet_sheet/i18n/ja.po
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "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-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -753,8 +753,8 @@ msgstr "日"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "私の勤務表"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1039,4 +1039,7 @@ msgstr "合計"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr "仕訳"
+msgstr "仕訳帳"
+
+#~ msgid "My Timesheet"
+#~ msgstr "私の勤務表"
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index 4e96b0ebaeb..92fbf537da4 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -743,8 +743,8 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "내 현재 일정"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1143,9 +1143,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "일정표 초안"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "내 현재 일정"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "직원의 일정 엔트리 정의"
 
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 8421a3588b7..eefa0f8ee47 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,8 +742,8 @@ msgstr "Diena"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Mano dabartinis darbo laiko žiniaraštis"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1030,9 +1030,6 @@ msgstr ""
 #~ msgid "My timesheets to confirm"
 #~ msgstr "Mano darbo laiko žiniaraščiai laukiantys patvirtinimo"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mano dabartinis darbo laiko žiniaraštis"
-
 #~ msgid "Project Timesheet"
 #~ msgstr "Projekto darbo laiko žiniaraštis"
 
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index e5255a83e58..dc66a04069e 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -743,7 +743,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 9b6acf24294..84782368154 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -27,8 +27,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -776,8 +776,8 @@ msgstr "Өдөр"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Өөрийн цагийн хуудас"
+msgid "My Current Timesheet"
+msgstr "Өөрийн одоогийн цаг бүртгэл"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1098,9 +1098,6 @@ msgstr "Журнал"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Цаг бүртгэлийн ноорог хүснэгт"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Өөрийн одоогийн цаг бүртгэл"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Ажилтны цаг бүртгэлийн мөрийг тодорхойлно"
 
@@ -1274,6 +1271,9 @@ msgstr "Журнал"
 #~ msgid " Year "
 #~ msgstr " Жил "
 
+#~ msgid "My Timesheet"
+#~ msgstr "Өөрийн цагийн хуудас"
+
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which are already confirmed !"
 #~ msgstr "Хэдийн батлагдсан цаг бүртгэлийг устгаж болохгүй."
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index 3478162f409..b1f15618572 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -32,7 +32,7 @@ msgstr "Service"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "Geen medewerker gedefinieerd voor uw gebruiker!"
+msgstr "Geen werknemer gedefinieerd voor uw gebruiker!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
@@ -238,7 +238,7 @@ msgstr "Waarschuwing !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr "Invullen urenstaat door medewerker"
+msgstr "Invullen urenstaat door werknemer"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
@@ -314,7 +314,7 @@ msgstr "Status is 'bevestigd'."
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr "Medewerker"
+msgstr "Werknemer"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -521,7 +521,7 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
-"De urenstaatregel toont de gewerkte tijd door een medewerker aan een "
+"De urenstaatregel toont de gewerkte tijd door een werknemer aan een "
 "specifieke dienst."
 
 #. module: hr_timesheet_sheet
@@ -543,8 +543,8 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
-"Dit overzicht doet analyse op urenstaten van personeel in het systeem. Het "
-"geeft u een volledig overzicht van de invoer van uw medewerkers. U kunt "
+"Dit overzicht doet analyse op urenstaten van werknemers in het systeem. Het "
+"geeft u een volledig overzicht van de invoer van uw werknemers. U kunt "
 "groeperen en zoeken op specifieke selectiecriteria."
 
 #. module: hr_timesheet_sheet
@@ -645,7 +645,7 @@ msgstr "U kunt niet wijzigen in een bevestigde urenstaat !"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr "My totale aanwezigheid op week"
+msgstr "Mijn totale aanwezigheid per week"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
@@ -681,7 +681,7 @@ msgid ""
 "sign ins and sign outs!"
 msgstr ""
 "Deze urenstaat kan niet worden gecontroleerd, omdat deze geen gelijke "
-"hoeveelheid aan- en uitmeldingen heeft!"
+"hoeveelheid inklok- en uitklokkingen heeft!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -691,7 +691,7 @@ msgstr "Januari"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr "De medewerker klokt in en klokt uit."
+msgstr "De werknemer klokt in en klokt uit."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -780,8 +780,8 @@ msgstr "Dag"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Mijn urenverantwoording"
+msgid "My Current Timesheet"
+msgstr "Mijn huidige urenstaat"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -901,7 +901,7 @@ msgstr "Omschrijving"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr "De medewerker bevestigt periodiek zijn eigen urenstaten."
+msgstr "De werknemer bevestigt periodiek zijn eigen urenstaten."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -959,7 +959,7 @@ msgstr "De naam van het bedrijf moet uniek zijn!"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr "Medewerkers"
+msgstr "Werknemers"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -979,7 +979,7 @@ msgstr "Bevestiging"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr "Facturatiesnelheid"
+msgstr "Factuur tarief"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
@@ -1030,7 +1030,7 @@ msgid ""
 "user!"
 msgstr ""
 "Om een urenstaat te kunnen aanmaken voor een werknemer, dient u een "
-"werknemer aan een gebruiker te koppelen!"
+"werknemer aan een gebruiker toe te wijzen!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1140,9 +1140,6 @@ msgstr "Dagboek"
 #~ msgid "You must select a Current date wich is in the timesheet dates !"
 #~ msgstr "U dient een Huidige datum te kiezen die binnen de urenstaat valt!"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mijn huidige urenstaat"
-
 #~ msgid "Defines employee's timesheet entry"
 #~ msgstr "Definieërt invullen van urenstaten"
 
@@ -1293,6 +1290,9 @@ msgstr "Dagboek"
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "U kunt een urenstaat niet dupliceren !"
 
+#~ msgid "My Timesheet"
+#~ msgstr "Mijn urenverantwoording"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index a527e0a9d35..511b49bfbde 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 4c05699f725..8502c4ebc3d 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -194,7 +194,7 @@ msgstr "Suma różnic"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Miesiąc-1 "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -209,7 +209,7 @@ msgstr "Karta czasu pracy wg dni"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Konto projektu / analityczne"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -351,7 +351,7 @@ msgstr "Godziny"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Grupuj według miesiąca"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -423,7 +423,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -744,8 +744,8 @@ msgstr "Dzień"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Moja bieżąca karta czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1055,9 +1055,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Projekt zestawień kart czasu pracy"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Moja bieżąca karta czasu pracy"
-
 #~ msgid "Defines the task work entry into timesheet line"
 #~ msgstr "Definiuje pracę zadania do pozycji karty czasu pracy"
 
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index f8bfcce58a6..ecb0f334cb4 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -26,13 +26,13 @@ msgstr "Folha"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "Nenhum funcionário definifo para o seu utilizador !"
+msgstr "Nenhum funcionário definido para o seu utilizador !"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
@@ -56,12 +56,12 @@ msgstr "Departamento"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Folha de horas no ano atual"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Tarefas da folha de horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -84,12 +84,12 @@ msgstr "Março"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "#Cost"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Folha de horas do último mês"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
@@ -106,12 +106,12 @@ msgstr "Empresa"
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "Horário"
+msgstr "Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr "Definir como esboço"
+msgstr "Definir como Rascunho"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
@@ -121,18 +121,18 @@ msgstr "Data para"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Baseado na Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Grupo por dia da data"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet!"
-msgstr ""
+msgstr "Não pode modificar uma entrada numa folha de horas confirmada!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -142,7 +142,7 @@ msgstr "Validar"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Aprovado"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -152,7 +152,7 @@ msgstr "Presente"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr "Custo total"
+msgstr "Custo Total"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
@@ -161,6 +161,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve atribuir o "
+"funcionário a um diário analítico!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -175,6 +177,7 @@ msgstr "Recusar"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"Não pode inserir uma data de atendimento fora da folha de horas atual!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -186,6 +189,12 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
+"A Folha de Horas abre os horários de maneira a que se possa reservar as "
+"atividades no sistema. Da mesma forma, pode registar o comparecimento (Sign "
+"In/Out) e descrever as horas de trabalho feitas em diferentes projetos. No "
+"final do período definido na empresa, a folha de horas é confirmada pelo "
+"utilizador e pode ser validada pelo responsável . Se necessário, conforme "
+"definido no projeto, pode gerar as faturas com base na folha de horas."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -195,22 +204,22 @@ msgstr "Diferença total"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mês-1 "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Folha de horas por departamento"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Day"
-msgstr "Horário por dia"
+msgstr "Folha de Horas por dia"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projeto / Conta Analítica"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -226,18 +235,18 @@ msgstr "Aviso !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Entrada na Folha de Horas dos Funcionários"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
 #: view:timesheet.report:0 field:timesheet.report,account_id:0
 msgid "Analytic Account"
-msgstr "Conta da Contabilidade Analítica"
+msgstr "Conta Analítica"
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "#Nbr"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -258,7 +267,7 @@ msgstr " Mês "
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
-msgstr "Horários"
+msgstr "Folhas de Horas"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -281,12 +290,12 @@ msgstr "Confirmar"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Linhas do horário"
+msgstr "Linhas da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Erro! Não pode criar empresas recursivamente."
+msgstr "Erro! Não pode criar empresas recursivas."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
@@ -302,7 +311,7 @@ msgstr "O estado é 'confirmado'."
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr "Empregado"
+msgstr "Funcionário"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -313,7 +322,7 @@ msgstr "Novo"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
-msgstr ""
+msgstr "Total de Atendimentos por Semana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
@@ -336,13 +345,13 @@ msgstr "Erro !"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr "Tempo total"
+msgstr "Tempo Total"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Lines"
-msgstr "Linhas de horário"
+msgstr "Linhas da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -352,24 +361,25 @@ msgstr "Horas"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Grupo por mês da data"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr "Erro: Entrada (Saída) deve ser seguida de Saída (Entrada)"
+msgstr ""
+"Erro: Sign In (resp. Sign Out) deve ser seguida de Sign Out(resp. Sign In)"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "Invalid action !"
-msgstr "Acção inválida !"
+msgstr "Ação Inválida!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr "O gestor de projeto valida as folhas"
+msgstr "O gestor de projeto valida as folhas de horas."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -384,17 +394,17 @@ msgstr "Configuração"
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Tarefa de Trabalho"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Diariamente"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "#Quantity"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -402,27 +412,27 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Horário total"
+msgstr "Folha de Horas total"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Atendimento disponível"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign In"
-msgstr "Entrar"
+msgstr "Sign In"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "#Total Timesheet"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "hr.timesheet.current.open"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -446,17 +456,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve ligar o "
+"funcionário a um artigo, como 'consultor'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Isto vai abrir a Folha de Horas Atual"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Não pode duplicar uma folha de horas!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -468,12 +480,12 @@ msgstr "Mês"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "#Total Diff"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Em rascunho"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
@@ -482,16 +494,18 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve ligar o "
+"funcionário a um artigo!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Sign In/Out"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Aprovação em espera"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -504,16 +518,20 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
+"A linha da folha de horas representa o tempo gasto pelo Funcionário num "
+"determinado serviço prestado."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
 msgstr ""
+"É necessário que selecione a data atual que está nas datas da folha de horas "
+"!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -523,26 +541,30 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
+"Este relatório faz análises sobre as folhas de horas criadas pelos recursos "
+"humanos no sistema. Ele permite que se tenha uma visão completa das entradas "
+"feitas pelos Funcionários. Pode agrupá-los por critérios de seleção "
+"específicos graças à ferramenta de busca."
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
 msgid "Draft"
-msgstr "Esboço"
+msgstr "Rascunho"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Diferença permitida na folha de horas(Horas)"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr ""
+msgstr "A fatura é criada com base na folha de horas."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "Rascunho da folha de horas"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -567,19 +589,19 @@ msgstr "Junho"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Current Status"
-msgstr "Estado actual"
+msgstr "Estado atual"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
-msgstr "Não pode modificar um movimento em um horário confirmado !"
+msgstr "Não pode modificar um movimento numa folha de horas confirmada !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by Period"
-msgstr ""
+msgstr "Folha de Horas por Período"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
@@ -591,7 +613,7 @@ msgstr "Utilizador"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Account"
-msgstr "Horário por conta"
+msgstr "Folha de Horas por conta"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
@@ -606,23 +628,23 @@ msgstr "Novembro"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Avançados..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Série da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr "Não pode modificar um movimento em um horário confirmado !"
+msgstr "Não pode modificar um movimento numa folha de horas confirmada !"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Total de Presenças por Semana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
@@ -631,6 +653,8 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Não pode ter 2 folhas de horas que se sobrepõem!\n"
+"Deve usar 'A Minha Folha de Horas' no menu para evitar este problema."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -644,6 +668,9 @@ msgid ""
 "on a project (i.e. an analytic account) thus generating costs in the "
 "analytic account concerned."
 msgstr ""
+"Verifique a folha de horas por um período específico. Também pode codificar "
+"o tempo gasto num projeto (ou seja, uma conta analítica) gerando custos na "
+"conta analítica em causa."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
@@ -652,6 +679,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"A folha de horas não pode ser validada como ele não contém um número igual "
+"de sign ins e sign outs!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -661,7 +690,7 @@ msgstr "Janeiro"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "O funcionário signs in e signs out."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -671,7 +700,7 @@ msgstr "Empresas"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Sumário"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -679,17 +708,21 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Não pode ter 2 folhas de horas que se sobrepõem!\n"
+"Por favor, use no menu 'As Minhas Folhas de Horas Atuais 'para evitar este "
+"problema."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr "Horários não validados"
+msgstr "Folhas de Horas não validadas"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries!"
 msgstr ""
+"Não pode excluir uma folha de horas que tenha entradas de atendimento!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -700,23 +733,23 @@ msgstr "Quantidade"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Não pode eliminar uma folha de horas que já tenha sido confirmada!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
 #: view:timesheet.report:0 field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr "Conta geral"
+msgstr "Conta Geral"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Periodicidade para validar as suas folhas de horas."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Search Account"
-msgstr ""
+msgstr "Pesquisar Conta"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -724,6 +757,8 @@ msgid ""
 "Allowed difference in hours between the sign in/out and the timesheet "
 "computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
+"Diferença permitida em horas entre o sign in/out e o cálculo da folha de "
+"horas para uma folha. Ajustar para 0 se não quiser nenhum controlo."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
@@ -743,8 +778,8 @@ msgstr "Dia"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Meu horário actual"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -760,6 +795,7 @@ msgstr "O estado é 'rascunho'."
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Não pode modificar uma entrada num folha de horas Confirmada / Concluída!."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -774,28 +810,28 @@ msgstr "Validado"
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr "Factura de Trabalho"
+msgstr "Fatura de Trabalho"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Folha de horas do mês atual"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Horário por contas"
+msgstr "Folha de Horas por contas"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Abrir Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Grupo por ano da data"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -812,41 +848,47 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * O estado 'Rascunho' é usado quando um utilizador está a registar uma "
+"folha de horas nova e não confimada                 \n"
+"* O estado 'Confirmado' é utilizado para confirmar a folha de horas pelo "
+"utilizador.                 \n"
+"* O estado 'Concluído' é utilizado quando a folha de horas do utilizador é "
+"aceite pelo seu/sua superior."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr ""
+msgstr "Análise da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Pesquisar Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Folhas de horas confirmadas"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linha Horário"
+msgstr "Linha da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
 #: view:timesheet.report:0 field:timesheet.report,product_id:0
 msgid "Product"
-msgstr "Produto"
+msgstr "Artigo"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,attendances_ids:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
 msgid "Attendances"
-msgstr "Presenças"
+msgstr "Pontualidade"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
@@ -856,7 +898,7 @@ msgstr "Descrição"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "O Funcionário periodicamente confirma a sua própria folha de horas."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -866,7 +908,7 @@ msgstr "Maio"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Define as tarefas do sumário de trabalho"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -876,18 +918,18 @@ msgstr "Sair"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "Movimentos de entrada da tarefa na linha da folha de horas"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Total de Atendimentos"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
 msgid "Timesheet Sheet Analysis"
-msgstr ""
+msgstr "Análise da Folha de Horas"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -899,7 +941,7 @@ msgstr "Diferença"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr "Ausente"
+msgstr "Falta"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -909,17 +951,17 @@ msgstr "Fevereiro"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser único!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr "Empregados"
+msgstr "Funcionários"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Informação do tempo gasto num serviço"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -934,7 +976,7 @@ msgstr "Confirmação"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr "Taxa da factura"
+msgstr "Taxa da Fatura"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
@@ -950,17 +992,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve atribuir o "
+"funcionário a um diário analítico, como a 'Folha de Horas'!"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
 #, python-format
 msgid "You cannot sign in/sign out from an other date than today"
-msgstr ""
+msgstr "Não pode signin / signout duma data diferente da de hoje"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Submetido ao Gestor"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -970,7 +1014,7 @@ msgstr "Conta da Contabilidade analítica"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr "Tipo de fatura"
+msgstr "Tipo de Faturação"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
@@ -980,11 +1024,13 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"A fim de criar uma folha de horas para este funcionário, deve atribuir um "
+"utilizador!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "#Total Attendance"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
@@ -995,12 +1041,12 @@ msgstr "Custo"
 #: field:hr_timesheet_sheet.sheet,date_current:0
 #: field:timesheet.report,date_current:0
 msgid "Current date"
-msgstr "Data actual"
+msgstr "Data atual"
 
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "Folha de Horas dos Recursos Humanos"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
@@ -1034,9 +1080,6 @@ msgstr "Diário"
 #~ msgid "Timeshet range"
 #~ msgstr "Escala do horário"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Meu horário actual"
-
 #~ msgid ""
 #~ "Allowed difference between the sign in/out and the timesheet computation for "
 #~ "one sheet. Set this to 0 if you do not want any control."
@@ -1050,9 +1093,6 @@ msgstr "Diário"
 #~ msgid "Project Timesheet"
 #~ msgstr "Horário do projecto"
 
-#~ msgid "No employee defined"
-#~ msgstr "Nenhum empregado definido"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para a arquitectura de vista"
 
@@ -1109,14 +1149,6 @@ msgstr "Diário"
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Revisão do fim de dia verificado o dia esta completo"
 
-#, python-format
-#~ msgid ""
-#~ "You can not have 2 timesheets that overlaps !\n"
-#~ "Please use the menu 'My Current Timesheet' to avoid this problem."
-#~ msgstr ""
-#~ "Não pode ter 2 horários que coincidam !\n"
-#~ "Por favor use o menu 'Meu Horario Actual' para evitar este problema."
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definição da acção."
 
@@ -1130,10 +1162,6 @@ msgstr "Diário"
 #~ msgstr ""
 #~ "Precisa seleccionar uma data Actual que esteja nas datas do horário !"
 
-#, python-format
-#~ msgid "You can not sign in from an other date than today"
-#~ msgstr "Não pode registrar-se a partir de outra data que não hoje"
-
 #~ msgid "Phone call encoding"
 #~ msgstr "Chamada Telefónica codificada"
 
@@ -1233,13 +1261,93 @@ msgstr "Diário"
 #~ msgid "My Department's Timesheet to Validate"
 #~ msgstr "Horário do Meu Departamento para Validar"
 
+#~ msgid " Year "
+#~ msgstr " Ano "
+
+#, python-format
+#~ msgid ""
+#~ "You can not have 2 timesheets that overlaps !\n"
+#~ "Please use the menu 'My Current Timesheet' to avoid this problem."
+#~ msgstr ""
+#~ "Não pode ter 2 Folhas de horas que se sobrepõem! \n"
+#~ "Por favor, use 'My Current Timesheet' no menu para evitar este problema."
+
+#, python-format
+#~ msgid "You can not sign in from an other date than today"
+#~ msgstr "Não pode registar-se a partir de outra data tem que ser a de hoje"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module helps you to easily encode and validate timesheet and "
+#~ "attendances\n"
+#~ "within the same view. The upper part of the view is for attendances and\n"
+#~ "track (sign in/sign out) events. The lower part is for timesheet.\n"
+#~ "\n"
+#~ "Other tabs contains statistics views to help you analyse your\n"
+#~ "time or the time of your team:\n"
+#~ "* Time spent by day (with attendances)\n"
+#~ "* Time spent by project\n"
+#~ "\n"
+#~ "This module also implements a complete timesheet validation process:\n"
+#~ "* Draft sheet\n"
+#~ "* Confirmation at the end of the period by the employee\n"
+#~ "* Validation by the project manager\n"
+#~ "\n"
+#~ "The validation can be configured in the company:\n"
+#~ "* Period size (day, week, month, year)\n"
+#~ "* Maximal difference between timesheet and attendances\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo ajuda facilmente a codificar e validar folhas de horas e "
+#~ "atendimentos\n"
+#~ "dentro da mesma opinião. A parte superior do ponto de vista é para "
+#~ "atendimentos e\n"
+#~ "procura (sign in/sign out) de eventos. A parte inferior é para a folha de "
+#~ "horas.\n"
+#~ "\n"
+#~ "Outras guias contém estatísticas vista para ajudá-lo a analisar o seu\n"
+#~ "tempo ou o tempo da sua equipa:\n"
+#~ "* Tempo gasto por dia (com atendimentos)\n"
+#~ "* Tempo gasto no projecto\n"
+#~ "\n"
+#~ "Este módulo também implementa a folha de horas completa para validação do "
+#~ "processo:\n"
+#~ "* Folha de Rascunho\n"
+#~ "* Confirmação, no final do período pelo funcionário\n"
+#~ "* Validação pelo gestor do projecto\n"
+#~ "\n"
+#~ "A validação pode ser configurada na empresa:\n"
+#~ "* Tamanho Período (dia, semana, mês, ano)\n"
+#~ "* Diferença máxima entre as folhas de horas e os atendimentos\n"
+#~ "    "
+
+#, python-format
+#~ msgid "You cannot duplicate a timesheet !"
+#~ msgstr "Não pode duplicar uma folha de Horas !"
+
+#~ msgid "No employee defined"
+#~ msgstr "Nenhum Funcionário definido"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot create a timesheet for an employee that does not have any user "
 #~ "defined !"
 #~ msgstr ""
-#~ "Não se pode criar uma folha para um empregado que não tenha um utilizador "
+#~ "Não se pode criar uma folha para um Funcionário que não tenha um utilizador "
 #~ "associado!"
 
-#~ msgid " Year "
-#~ msgstr " Ano "
+#~ msgid "My Timesheet"
+#~ msgstr "A Minha Folha de Horas"
+
+#, python-format
+#~ msgid ""
+#~ "The timesheet cannot be validated as it does not contain equal no. of sign "
+#~ "ins and sign outs!"
+#~ msgstr ""
+#~ "A Folha de Horas não pode ser validada visto que o número de entradas e "
+#~ "saídas não coincide"
+
+#, python-format
+#~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
+#~ msgstr "?!?!?!?!?!?!?!?!?!?Não é possível eliminar Folha(s) que têm  !"
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index c8835ffd0b4..b56b2cdd04a 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-20 05:40+0000\n"
-"X-Generator: Launchpad (build 14833)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -746,7 +746,7 @@ msgstr "Dia"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index dd4585a4d71..0744ff93d6c 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -38,13 +38,13 @@ msgstr "Nici un angajat nu este definit pentru utilizatorul dumneavoastra !"
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
 msgid "Total Attendance"
-msgstr "Prezenta totală"
+msgstr "Total Prezenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -56,12 +56,12 @@ msgstr "Departament"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current year"
-msgstr ""
+msgstr "Fise de pontaj in anul curent"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr "Activitate foaie de pontaj"
+msgstr "Fisa de pontaj activitate"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -74,7 +74,7 @@ msgstr "Astazi"
 msgid ""
 "Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
-"Va rugam sa verificati ca diferenta totala a foii sa fie mai mica de %.2f !"
+"Va rugam sa verificati ca diferenta totala a fisei sa fie mai mica de %.2f !"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -89,14 +89,14 @@ msgstr "#Cost"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet of last month"
-msgstr ""
+msgstr "Fisele de pontaj din ultima luna"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
 #: field:hr_timesheet_sheet.sheet,company_id:0 view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr "Companie"
+msgstr "Compania"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
@@ -106,12 +106,12 @@ msgstr "Companie"
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "Foaie de pontaj"
+msgstr "Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr "Setare pe Ciorna"
+msgstr "Setati ca ciorna"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
@@ -121,28 +121,28 @@ msgstr "Data pana la"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr "Bazat pe foaia de pontaj"
+msgstr "Bazat pe fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Grupati dupa ziua datei"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet!"
-msgstr ""
+msgstr "Nu puteti modifica o inregistrare dintr-o fisa de pontaj confirmata!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr "Validare"
+msgstr "Validati"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Aprobat(a)"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -161,12 +161,14 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa atribuiti "
+"angajatul unui jurnal analitic!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
 msgid "Refuse"
-msgstr "Refuz"
+msgstr "Refuzati"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
@@ -175,7 +177,7 @@ msgstr "Refuz"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
-"Nu puteti introduce o data a prezentei care sa depaseasca datele foii de "
+"Nu puteti introduce o data a prezentei care sa depaseasca datele fisei de "
 "pontaj curente!"
 
 #. module: hr_timesheet_sheet
@@ -188,18 +190,18 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
-"'Foaia mea de pontaj' deschide foile dumneavoastra de pontaj astfel incat "
+"'Fisa mea de pontaj' deschide fisele dumneavoastra de pontaj astfel incat "
 "puteti sa va inscrieti activitatile in sistem. Din acelasi formular, puteti "
 "sa va inregistrati prezenta (Intrare/Iesire) si sa descrieti orele de lucru "
-"la diferite proiecte. La sfarsitul perioadei definite in companie, foaia de "
+"la diferite proiecte. La sfarsitul perioadei definite in companie, fisa de "
 "pontaj este confirmata de catre utilizator si poate fi validata de catre "
 "managerul sau. Daca este necesar, asa cum este definit in proiect, puteti "
-"genera facturi bazate pe foaia de pontaj."
+"genera facturi bazate pe fisa de pontaj."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr ""
+msgstr "Total Diferenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
@@ -209,17 +211,17 @@ msgstr " Luna-1 "
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Fisele de pontaj ale Departamentului meu"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Day"
-msgstr ""
+msgstr "Fise de pontaj dupa Zi"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Proiect / Cont Analitic"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -230,12 +232,12 @@ msgstr "Validare"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
 #, python-format
 msgid "Warning !"
-msgstr "Avertisment !"
+msgstr "Avertizare !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr "Inregistrare foaie de pontaj angajat"
+msgstr "Inregistrarea fisei de pontaj a angajatului"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
@@ -267,13 +269,13 @@ msgstr " Luna "
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
-msgstr "Foi de pontaj"
+msgstr "Fise de pontaj"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
 #: view:timesheet.report:0 selection:timesheet.report,state:0
 msgid "Confirmed"
-msgstr "Confirmat"
+msgstr "Confirmat(a)"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
@@ -290,7 +292,7 @@ msgstr "Confirmati"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Linii foaie de pontaj"
+msgstr "Linii fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
@@ -317,12 +319,12 @@ msgstr "Angajat"
 #: selection:hr_timesheet_sheet.sheet,state:0
 #: selection:timesheet.report,state:0
 msgid "New"
-msgstr "Nou"
+msgstr "Nou(a)"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
-msgstr "Prezentele mele totale pe Saptamana"
+msgstr "Prezentele mele Totale dupa Saptamana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
@@ -345,13 +347,13 @@ msgstr "Eroare !"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr "Timpul Total"
+msgstr "Total Ore"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Lines"
-msgstr "Linii foaie de pontaj"
+msgstr "Linii Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -361,7 +363,7 @@ msgstr "Ore"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Grupeaza dupa luna datei"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -375,12 +377,12 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "Invalid action !"
-msgstr "Actiune invalida !"
+msgstr "Actiune nevalida !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr "Managerul de proiect valideaza foile de pontaj."
+msgstr "Managerul de proiect valideaza fisele de pontaj."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -400,7 +402,7 @@ msgstr "Lucrul la activitate"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Zilnic"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -413,7 +415,7 @@ msgstr "#Cantitate"
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Total foaie de pontaj"
+msgstr "Total fise de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -428,13 +430,12 @@ msgstr "Intrare"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr "#Total Foaie de pontaj"
+msgstr "#Total Fise de pontaj"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
-"hr.timesheet.current.open (resurse umane.foaie de pontaj.curenta.deschide)"
+msgstr "ru.deschide.fisa de pontaj.curenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -458,17 +459,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa il conectati "
+"la un produs, precum 'Consultant'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr "Va deschie foaia dumneavoastra de pontaj curenta"
+msgstr "Va deschie fisa dumneavoastra de pontaj curenta"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Nu puteti copia o fisa de pontaj!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -494,6 +497,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa conectati "
+"angajatul la un produs!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -503,7 +508,7 @@ msgstr "Intrare/Iesire"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Asteapta aprobare"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -516,19 +521,20 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
-"Linia foii de pontaj reprezinta timpul petrecut de catre angajat la un "
+"Linia fisei de pontaj reprezinta timpul petrecut de catre angajat la un "
 "anumit serviciu furnizat."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
 msgstr ""
-"Trebuie sa selectati o data curenta care sa existe in datele foii de pontaj !"
+"Trebuie sa selectati o data curenta care sa existe in datele fisei de pontaj "
+"!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -538,7 +544,7 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
-"Acest raport efectueaza analiza foilor de pontaj create de catre resursele "
+"Acest raport efectueaza analiza fiselor de pontaj create de catre resursele "
 "umane in sistem. Va permite sa aveti o privire de ansamblu completa asupra "
 "tuturor inregistrarilor efectuate de catre angajatii dumneavoastra. Le "
 "puteti grupa dupa criterii specifice de selectie multumita uneltei de "
@@ -552,17 +558,17 @@ msgstr "Ciorna"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr "Diferenta permisa a foii de pontaj (ore)"
+msgstr "Diferenta permisa a fisei de pontaj (Ore)"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr "Factura este creata pe baza foii de pontaj."
+msgstr "Factura este creata pe baza fisei de pontaj."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr "Foaie de pontaj ciorna"
+msgstr "Fisa de pontaj Ciorna"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -594,13 +600,13 @@ msgstr "Status curent"
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
-"Nu puteti modifica o inregistrare dintr-o foaie de pontaj confirmata !"
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj confirmata !"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by Period"
-msgstr "Foaie de pontaj dupa Perioada"
+msgstr "Fise de pontaj dupa Perioada"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
@@ -612,7 +618,7 @@ msgstr "Utilizator"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Account"
-msgstr "Foaie de pontaj dupa Cont"
+msgstr "Fisa de pontaj dupa Cont"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
@@ -627,24 +633,23 @@ msgstr "Noiembrie"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr "Limite foaie de pontaj"
+msgstr "Limita fisei de pontaj"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr ""
-"Nu puteti modifica o inregistrare intr-o foaie de pontaj confirmata !"
+msgstr "Nu puteti modifica o inregistrare intr-o fisa de pontaj confirmata !"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr "Prezenta mea totala pe Saptamana"
+msgstr "Prezenta mea totala dupa Saptamana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
@@ -653,6 +658,9 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Nu puteti avea 2 fise de pontaj care se suprapun!\n"
+"Ar trebui sa folositi meniul 'Fisa mea de pontaj' pentru a evita aceasta "
+"problema."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -666,9 +674,9 @@ msgid ""
 "on a project (i.e. an analytic account) thus generating costs in the "
 "analytic account concerned."
 msgstr ""
-"Verificati foile de pontaj pentru o anumita perioada. De asemenea, puteti "
-"coda timpul petrecut la un proiect (de exemplu, un cont analitic), astfel "
-"generand costuri in contul analitic implicat."
+"Verificati fisele de pontaj pentru o anumita perioada. De asemenea, puteti "
+"inregistra timpul petrecut la un proiect (de exemplu, un cont analitic), "
+"astfel generand costuri in contul analitic implicat."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
@@ -677,6 +685,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"Fisa de pontaj nu poate fi validata deoarece nu contine un numar egal de "
+"intrari si iesiri!"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -696,7 +706,7 @@ msgstr "Companii"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezumat"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -704,17 +714,21 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Nu puteti avea 2 fise de pontaj care se suprapun!\n"
+"Va rugam sa folositi meniul 'Fisa mea de pontaj curenta' pentru a evita "
+"aceasta problema."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr ""
+msgstr "Fise de pontaj nevalidate"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries!"
 msgstr ""
+"Nu puteti sterge o fisa de pontaj care contine inregistrari ale prezentei!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -725,7 +739,7 @@ msgstr "Cantitate"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Nu puteti sterge o fisa de pontaj care este deja confirmata!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -736,12 +750,12 @@ msgstr "Cont General"
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Periodicitatea cu care validati fisele de pontaj."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Search Account"
-msgstr "Caută Cont"
+msgstr "Cautati Cont"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -749,8 +763,8 @@ msgid ""
 "Allowed difference in hours between the sign in/out and the timesheet "
 "computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
-"Diferenta permisa in ore dintre intrare si iesire si calculul foii de pontaj "
-"pentru o foaie. Setati pe 0 daca nu doriti nici un control."
+"Diferenta permisa in ore dintre intrare si iesire si calculul fisei de "
+"pontaj pentru o fisa. Setati pe 0 daca nu doriti nici un control."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
@@ -770,8 +784,8 @@ msgstr "Zi"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Foaia mea de pontaj"
+msgid "My Current Timesheet"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -787,16 +801,18 @@ msgstr "Starea este 'ciorna'."
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj "
+"Confirmata/Efectuata !."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr "Anulare"
+msgstr "Anulati"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr "Validat"
+msgstr "Validat(a)"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -806,23 +822,23 @@ msgstr "Factura pe munca"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Fise de pontaj in luna curenta"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Foaia de pontaj dupa Conturi"
+msgstr "Fise de pontaj dupa Conturi"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr "Deschide Foaia de pontaj"
+msgstr "Deschide Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Grupeaza dupa anul datei"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -839,11 +855,11 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
-" * Starea 'Ciorna' este folosita atunci cand un utilizator codeaza o foaie "
-"de pontaj noua si neconfirmata. \t\t\t\t\n"
-"* Starea 'Confirmat(a) este folosita pentru a confirma foaia de pontaj dupa "
-"utilizator. \t\t\n"
-"*Starea 'Efectuat(a) este folosita atunci cand foaia de pontaj a "
+" * Starea 'Ciorna' este folosita atunci cand un utilizator inregistreaza o "
+"fisa de pontaj noua si neconfirmata.                 \n"
+"* Starea 'Confirmat(a) este folosita pentru a confirma fisa de pontaj dupa "
+"utilizator.                 \n"
+"*Starea 'Efectuat(a) este folosita atunci cand fisa de pontaj a "
 "utilizatorilor este acceptata de catre superior."
 
 #. module: hr_timesheet_sheet
@@ -851,22 +867,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr "Analiza foii de pontaj"
+msgstr "Analiza Fisei de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr "Cautare Foaie de pontaj"
+msgstr "Cautati Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Fise de pontaj Confirmate"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linie Foaie de pontaj"
+msgstr "Linie Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
@@ -889,7 +905,7 @@ msgstr "Descriere"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr "Angajatul isi confirma periodic propriile foi de pontaj."
+msgstr "Angajatul isi confirma periodic propriile fise de pontaj."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -909,18 +925,18 @@ msgstr "Iesire"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr "Muta inregistrarea activitatii in linia foii de pontaj"
+msgstr "Muta inregistrarea activitatii in linia fisei de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Total Prezente"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
 msgid "Timesheet Sheet Analysis"
-msgstr "Analiza foii de pontaj"
+msgstr "Analiza Fisei de pontaj"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -942,7 +958,7 @@ msgstr "Februarie"
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Numele companiei trebuie sa fie unic !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -952,7 +968,7 @@ msgstr "Angajati"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr "Informatii despre timpul petrecut cu un service"
+msgstr "Informatii despre timpul petrecut cu un serviciu"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -983,17 +999,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa-i atribuiti "
+"angajatului un jurnal analitic, precum 'Fisa de pontaj'!"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
 #, python-format
 msgid "You cannot sign in/sign out from an other date than today"
-msgstr ""
+msgstr "Nu puteti semna de intrare / iesire cu o alta data decat cea de azi"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submited to Manager"
-msgstr ""
+msgstr "Inmanat Managerului"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1013,6 +1031,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Pentru a crea o fisa de pontaj pentru acest angajat, trebuie sa ii atribuiti "
+"un utilizator!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
@@ -1033,7 +1053,7 @@ msgstr "Data curenta"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr "Foaie de pontaj Resurse umane"
+msgstr "RU Fisa de pontaj"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
@@ -1044,7 +1064,7 @@ msgstr "An"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr "Deschis"
+msgstr "Deschideti"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1159,3 +1179,6 @@ msgstr "Jurnal"
 
 #~ msgid "By Day"
 #~ msgstr "Dupa zi"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Fisa mea de pontaj"
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index b8a4883ad08..86e76dcf573 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -757,8 +757,8 @@ msgstr "День"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "Моё расписание"
+msgid "My Current Timesheet"
+msgstr "Мой текущий табель"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1048,9 +1048,6 @@ msgstr ""
 #~ msgid "Timeshet range"
 #~ msgstr "Диапазон табеля"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Мой текущий табель"
-
 #~ msgid ""
 #~ "Allowed difference between the sign in/out and the timesheet computation for "
 #~ "one sheet. Set this to 0 if you do not want any control."
@@ -1142,3 +1139,6 @@ msgstr ""
 #, python-format
 #~ msgid "You cannot duplicate a timesheet !"
 #~ msgstr "Нельзя дублировать расписания !"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Моё расписание"
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index a5db24a8d83..54a42ed507a 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr "Dan"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index 11013624c1c..e11cd4f5b34 100644
--- a/addons/hr_timesheet_sheet/i18n/sq.po
+++ b/addons/hr_timesheet_sheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -743,7 +743,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index caf71bdf4fa..e3040eea19c 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -743,8 +743,8 @@ msgstr "Day"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "My Current Timesheet"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1051,9 +1051,6 @@ msgstr ""
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "Draft Timesheet sheet"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "My Current Timesheet"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "Validated Timesheet"
 
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 70cebb34f0f..e35519321e0 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index c2e2582e54e..9d064207ba0 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,8 +742,8 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Mevcut Giriş-Çıkış Çizelgem"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1033,9 +1033,6 @@ msgstr ""
 #~ msgid "My timesheets to confirm"
 #~ msgstr "Giriş-Çıkışlarımı Onayla"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Mevcut Giriş-Çıkış Çizelgem"
-
 #~ msgid "Phone call encoding"
 #~ msgstr "Tel. Çağrısı Kodla"
 
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 591add4799d..0d6837c2d28 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,8 +742,8 @@ msgstr "День"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr ""
+msgid "My Current Timesheet"
+msgstr "Мій поточний табель"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1033,9 +1033,6 @@ msgstr ""
 #~ msgid "Timeshet range"
 #~ msgstr "Тривалість робочого часу"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "Мій поточний табель"
-
 #~ msgid ""
 #~ "Allowed difference between the sign in/out and the timesheet computation for "
 #~ "one sheet. Set this to 0 if you do not want any control."
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index f120b5415d9..c69acafe056 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -743,7 +743,7 @@ msgstr "Ngày"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index f49530fecb1..1207586b287 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:21+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -748,8 +748,8 @@ msgstr "天"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
-msgstr "我的计工单"
+msgid "My Current Timesheet"
+msgstr "我当前的时间表"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
@@ -1051,9 +1051,6 @@ msgstr "账簿"
 #~ msgid "Draft Timesheet sheet"
 #~ msgstr "时间表草稿"
 
-#~ msgid "My Current Timesheet"
-#~ msgstr "我当前的时间表"
-
 #~ msgid "Validated Timesheet"
 #~ msgstr "批准时间表"
 
@@ -1277,6 +1274,9 @@ msgstr "账簿"
 #~ "defined !"
 #~ msgstr "用户没定义员工您不能创建记工单！"
 
+#~ msgid "My Timesheet"
+#~ msgstr "我的计工单"
+
 #, python-format
 #~ msgid ""
 #~ "The timesheet cannot be validated as it does not contain equal no. of sign "
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index b0c287b7150..6d08be40d2c 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:36+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -742,7 +742,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
 #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "My Timesheet"
+msgid "My Current Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 90ffc938116..18121813e7d 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -6,7 +6,7 @@
         <field name="model">hr.timesheet.current.open</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Timesheet" version="7.0">
+            <form string="My Current Timesheet" version="7.0">
                <header>
                     <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
                     <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
@@ -17,7 +17,7 @@
     </record>
 
     <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
-        <field name="name">My Timesheet</field>
+        <field name="name">My Current Timesheet</field>
         <field name="res_model">hr.timesheet.current.open</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -26,7 +26,7 @@
         <field name="help">My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.</field>
     </record>
 
-    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index af276f48440..0a9860dc979 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,8 +9,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
-                    <field name="message_ids" widget="ThreadView" nolabel="1"
+                    <footer>
+                    <field name="message_ids" widget="ThreadView" 
                             options='{"thread_level": 1}'/>
+                    </footer>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mrp_repair/i18n/ja.po b/addons/mrp_repair/i18n/ja.po
index 95a66263593..9caee139c18 100644
--- a/addons/mrp_repair/i18n/ja.po
+++ b/addons/mrp_repair/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "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-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index b598b050410..d311d6a2da4 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-14 09:46+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-06-14 05:53+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-15 04:42+0000\n"
+"X-Generator: Launchpad (build 15414)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -39,7 +39,7 @@ msgstr ""
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "sub products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
@@ -54,7 +54,7 @@ msgstr "部件不应该是成品本身"
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "Sub Products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -89,7 +89,7 @@ msgstr "编号必须在公司内唯一！"
 #. module: mrp_subproduct
 #: field:mrp.bom,sub_products:0
 msgid "sub_products"
-msgstr "子产品"
+msgstr "副产品"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
diff --git a/addons/pad/i18n/sv.po b/addons/pad/i18n/sv.po
new file mode 100644
index 00000000000..4b4449b32f1
--- /dev/null
+++ b/addons/pad/i18n/sv.po
@@ -0,0 +1,58 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-12 21:16+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-13 04:56+0000\n"
+"X-Generator: Launchpad (build 15389)\n"
+
+#. module: pad
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: pad
+#: help:res.company,pad_url_template:0
+msgid "Template used to generate pad URL."
+msgstr ""
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
+#. module: pad
+#: model:ir.model,name:pad.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad
+#: field:res.company,pad_url_template:0
+msgid "Pad URL Template"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9
+msgid "Add Pad"
+msgstr ""
diff --git a/addons/pad_project/i18n/mn.po b/addons/pad_project/i18n/mn.po
new file mode 100644
index 00000000000..20d6178b3ee
--- /dev/null
+++ b/addons/pad_project/i18n/mn.po
@@ -0,0 +1,39 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-18 01:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
diff --git a/addons/plugin_thunderbird/i18n/sv.po b/addons/plugin_thunderbird/i18n/sv.po
new file mode 100644
index 00000000000..becd086e728
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/sv.po
@@ -0,0 +1,98 @@
+# 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-09 00:36+0000\n"
+"PO-Revision-Date: 2012-06-17 08:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Installationshandbok"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr "Beskrivning"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr "Titel"
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr "_Stäng"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installation och konfigureringssteg"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Filnamn"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr ""
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index d94ac882cda..c9a6d55c9d4 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -207,33 +207,34 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reordering Rules" version="7.0">
-                    <group col="2" colspan="2">
-                        <separator string="General Information" colspan="2" />
-                        <field name="name" />
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="product_uom"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Locations" colspan="2" />
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Quantity Rules" colspan="2" />
-                        <field name="product_min_qty"/>
-                        <field name="product_max_qty"/>
-                        <field name="qty_multiple"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2" />
-                        <field name="procurement_id" readonly="1"/>
-                        <field name="active" />
-                    </group>
-                    <group col="4" colspan="4">
-                        <separator string="Procurement Orders to Process" colspan="4" />
-                        <field name="procurement_draft_ids" colspan="4" nolabel="1"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                            </group>
+                            <group>
+                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                                <field name="product_uom"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                        </group>
+                        <group>
+                            <group string="Rules">
+                                <field name="product_min_qty" />
+                                <field name="product_max_qty" />
+                                <field name="qty_multiple" string="Quantity Multiple"/>
+                            </group>
+                            <group string="Misc">
+                                <field name="procurement_id" readonly="1"/>
+                                <field name="active" />
+                            </group>
+                        </group>
+                        <group string="Procurement Orders to Process">
+                            <field name="procurement_draft_ids" nolabel="1"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c2b6663bdb0..a479e9a72e1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -69,118 +69,124 @@
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product" layout="auto" version="7.0">
-                    <field name="product_image" widget='image' class="oe_form_avatar oe_right"/>
-                    <label for="name" class="oe_form_readonly_hidden"/>
-                    <h1><field name="name"/></h1>
-                    <label for="categ_id" class="oe_form_readonly_hidden"/>
-                    <h2><field name="categ_id"/></h2>
+                    <sheet>
+                        <field name="product_image" widget="image" class="oe_form_avatar oe_right" />
 
-                    <notebook>
-                        <page string="Information">
-                            <group>
+                        <div class="oe_form_title">
+                            <div class="oe_form_readonly_hidden">
+                                <label for="name" string="Product Name" /> 
+                            </div>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                            <label for="categ_id" class="oe_form_readonly_hidden" />
+                            <h2><field name="categ_id" /></h2>
+                        </div>
+                        <notebook>
+                            <page string="Information">
                                 <group>
-                                    <field name="default_code"/>
-                                    <field name="ean13" placeholder="5901234123457" />
-                                    <field groups="product.group_product_variant" name="variants" />
-                                </group>
-                                <group>
-                                    <field name="sale_ok"/>
-                                    <field name="purchase_ok"/>
-                                </group>
-                                <group string="Procurement">
-                                    <field name="type"/>
-                                    <field name="procure_method"/>
-                                    <field name="supply_method"/>
-                                </group>
-                                <group string="Base Prices">
-                                    <field name="list_price"/>
-                                    <field name="cost_method"/>
-                                    <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                                    <field name="price_margin" groups="product.group_product_variant"/>
-                                    <field name="price_extra" groups="product.group_product_variant"/>
-                                </group>
-
-                                <group groups="product.group_stock_packaging" string="Weights">
-                                    <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                                </group>
-
-                                <group name="status" string="Status">
-                                    <field name="state"/>
-                                    <field name="product_manager"/>
-                                </group>
-
-                                <group name="uom" groups="product.group_uom" string="Unit of Measure">
-                                    <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                    <field name="uom_po_id"/>
-                                </group>
-
-                                <group name="uos" groups="product.group_uos" string="Second Unit of Measure">
-                                    <field name="uos_id"/>
-                                    <field name="uos_coeff"/>
-                                    <field name="mes_type"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Procurement &amp; Locations">
-                            <group>
-                                <group name="delay" string="Delays">
-                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                    <field name="warranty"/>
-                                </group>
-                                <group name="store" string="Storage Localisation">
-                                    <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
-                                    <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                    <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                </group>
-                                <group name="misc" string="Miscellaneous">
-                                    <field name="active"/>
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                </group>
-                            </group>
-
-                        </page>
-                        <page string="Suppliers">
-                            <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                        </page>
-                        <page string="Descriptions">
-                            <separator string="Description"/>
-                            <field name="description"/>
-                            <separator string="Sale Description"/>
-                            <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
-                            <separator string="Purchase Description"/>
-                            <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
-                        </page>
-                        <page groups="product.group_stock_packaging" string="Packaging">
-                            <field name="packaging">
-                                <form string="Packaging" version="7.0">
-                                    <group col="4">
-                                        <field name="ean"/>
-                                        <field name="sequence" invisible="1"/>
-                                        <newline/>
-                                        <field name="qty"/>
-                                        <field name="ul"/>
-                                        <field name="weight_ul"/>
-                                        <separator colspan="4" string="Palletization"/>
-                                        <field name="ul_qty"/>
-                                        <field name="rows"/>
-                                        <field name="weight"/>
-                                        <separator colspan="4" string="Pallet Dimension"/>
-                                        <field name="height"/>
-                                        <field name="width"/>
-                                        <field name="length"/>
+                                    <group>
+                                        <field name="default_code"/>
+                                        <field name="ean13" placeholder="5901234123457" />
+                                        <field groups="product.group_product_variant" name="variants" />
                                     </group>
-                                    <separator colspan="4" string="Description"/>
-                                    <field name="name"/>
-                                </form>
-                            </field>
-                        </page>
-                    </notebook>
-                <footer>
-                    <field name="message_ids" widget="ThreadView"/>
-                </footer>
+                                    <group>
+                                        <field name="sale_ok"/>
+                                        <field name="purchase_ok"/>
+                                    </group>
+                                    <group string="Procurement">
+                                        <field name="type"/>
+                                        <field name="procure_method"/>
+                                        <field name="supply_method"/>
+                                    </group>
+                                    <group string="Prices">
+                                        <field name="list_price"/>
+                                        <field name="cost_method"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                        <field name="price_margin" groups="product.group_product_variant"/>
+                                        <field name="price_extra" groups="product.group_product_variant"/>
+                                    </group>
+
+                                    <group groups="product.group_stock_packaging" string="Weights">
+                                        <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+
+                                    <group name="uom" groups="product.group_uom" string="Unit of Measure">
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                        <field name="uom_po_id"/>
+                                        <field name="uos_id"/>
+                                        <field name="uos_coeff"/>
+                                        <field name="mes_type"/>
+                                    </group>
+
+                                    <group name="status" string="Status">
+                                        <field name="state"/>
+                                        <field name="product_manager"/>
+                                    </group>
+
+                                </group>
+                            </page>
+                            <page string="Procurement &amp; Locations">
+                                <group>
+                                    <group name="delay" string="Delays">
+                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                                        <field name="warranty"/>
+                                    </group>
+                                    <group name="store" string="Storage Localisation">
+                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
+                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
+                                    </group>
+                                    <group name="misc" string="Miscellaneous">
+                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    </group>
+                                </group>
+
+                            </page>
+                            <page string="Suppliers">
+                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                            </page>
+                            <page string="Descriptions">
+                                <separator string="Description"/>
+                                <field name="description"/>
+                                <separator string="Sale Description"/>
+                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
+                                <separator string="Purchase Description"/>
+                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
+                            </page>
+                            <page groups="product.group_stock_packaging" string="Packaging">
+                                <field name="packaging">
+                                    <form string="Packaging" version="7.0">
+                                        <group col="4">
+                                            <field name="ean"/>
+                                            <field name="sequence" invisible="1"/>
+                                            <newline/>
+                                            <field name="qty"/>
+                                            <field name="ul"/>
+                                            <field name="weight_ul"/>
+                                            <separator colspan="4" string="Palletization"/>
+                                            <field name="ul_qty"/>
+                                            <field name="rows"/>
+                                            <field name="weight"/>
+                                            <separator colspan="4" string="Pallet Dimension"/>
+                                            <field name="height"/>
+                                            <field name="width"/>
+                                            <field name="length"/>
+                                        </group>
+                                        <separator colspan="4" string="Description"/>
+                                        <field name="name"/>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" widget="ThreadView"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 194d8f26ec4..1021622f637 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "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-Launchpad-Export-Date: 2012-06-13 04:55+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: project
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e8d2455be89..66b50a20433 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -336,7 +336,7 @@
                         <button name="do_draft" string="Draft" type="object"
                                 states="cancel,done"/>
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                states="pending,open,draft"/>
+                                states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
                                 states="draft,open,pending" />
                         <button name="stage_previous" string="Previous Stage" type="object"
@@ -356,18 +356,18 @@
                     </h2>
                     <group>
                         <group>
+                            <field name="effective_hours"
+                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="partner_id" />
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
+                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
                                 groups="project.group_time_work_estimation_tasks"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
 
-                            <field name="effective_hours"
-                                widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/>
                             <label for="remaining_hours" string="+ Remaining"/>
                             <div>
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
@@ -380,8 +380,9 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Information">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}"/>
+                        <page string="Description">
+                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..." />
+                            <separator string="Task Works" />
                             <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
@@ -391,7 +392,7 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Delegations History">
+                        <page string="Delegations History" groups="project.group_delegate_task">
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -414,8 +415,6 @@
                                 <field name="sequence"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="notes"/>
                         </page>
                     </notebook>
                     </sheet>
@@ -697,16 +696,15 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="state"/>
+                            <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="case_default"/>
+                            <field name="state" string="Related State"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
                     </group>
-                    <separator string="Description"/>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..."/>
                 </form>
             </field>
         </record>
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 21281110fb9..0d3c548c913 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -54,7 +54,10 @@ class project_configuration(osv.osv_memory):
             help="Allows you to compute work on tasks."),
         'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
             implied_group='project.group_time_work_estimation_tasks',
-            help="Allows you to compute Time Estimation on tasks."),                                
+            help="Allows you to compute Time Estimation on tasks."),
+        'group_manage_delegation_task': fields.boolean("Manage Taks Delegation",
+            implied_group='project.group_delegate_task',
+            help="Allows you to delegate tasks to other users."),                                
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index cf371a39672..9d1e19a7c81 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -20,6 +20,7 @@
                             <field name="module_pad"/>
                             <field name="group_tasks_work_on_tasks"/>
                             <field name="group_time_work_estimation_tasks"/>
+                            <field name="group_manage_delegation_task"/>
 
                             <separator string="Planning" colspan="4"/>
                             <field name="module_project_long_term"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 2bfe967e675..199d3c0c422 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -29,6 +29,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>		
 
+    <record id="group_delegate_task" model="res.groups">
+        <field name="name">Task Delegation</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record model="ir.rule" id="project_comp_rule">
         <field name="name">Project multi-company</field>
         <field name="model_id" ref="model_project_project"/>
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index 7e5122b0f42..fcd18045839 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "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-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: project_issue
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b7089cac129..30e6bfa91dd 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -84,13 +84,8 @@
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                            <label for="task_id"/>
-                            <div>
-                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_form_inline"/>
-                                <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
-                                    attrs="{'invisible':[('task_id','!=',False)]}" />
-                            </div>
                         </group><group>
+                            <field name="task_id" on_change="onchange_task_id(task_id)" />
                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                             <field name="version_id" widget="selection"/>
                             <field name="priority"/>
@@ -98,7 +93,7 @@
                             <field name="state" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <field name="description"/>
+                    <field name="description" placeholder="Add a description..." />
 
                     <notebook groups="base.group_no_one">
                         <page string="Extra Info">
@@ -258,7 +253,6 @@
                                         <a string="Edit" icon="gtk-edit" type="edit"/>
                                         <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                         <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                                        <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
                                         <a string="Escalate" name="case_escalate"  icon="gtk-go-up" type="object"/>
                                         <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
                                     </div>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 32d2113727b..93417cf2ac8 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -29,9 +29,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-            <xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
-                <field name="sale_line_id"/>
-            </xpath>
+                <field name="state" position="after">
+                    <field name="sale_line_id" string="Order Line"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/project_timesheet/i18n/ja.po b/addons/project_timesheet/i18n/ja.po
index c013f46c2f6..eef3fc94119 100644
--- a/addons/project_timesheet/i18n/ja.po
+++ b/addons/project_timesheet/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "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-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 "X-Generator: Launchpad (build 15389)\n"
 
 #. module: project_timesheet
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index dfec215ca00..d1a48e7f556 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -8,60 +8,60 @@ 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-12 04:54+0000\n"
+"PO-Revision-Date: 2012-06-14 05:06+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"
+"X-Launchpad-Export-Date: 2012-06-15 04:42+0000\n"
+"X-Generator: Launchpad (build 15414)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
-msgstr ""
+msgstr "買い手は仕入先に送られる前に見積依頼（RFQ）を承認しなければなりません。見積依頼（RFQ）は確認された発注オーダーになります。"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "制御のために入ってくる製品"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr ""
+msgstr "請求済＆支払済"
 
 #. module: purchase
 #: field:purchase.order,location_id:0 view:purchase.report:0
 #: field:purchase.report,location_id:0
 msgid "Destination"
-msgstr ""
+msgstr "宛先"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "発注オーダーを削除するためには、最初にそれをキャンセルする必要があります。"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr ""
+msgstr "このドキュメントが作成された日付"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
 #: view:stock.picking:0
 msgid "Group By..."
-msgstr ""
+msgstr "グループ化…"
 
 #. module: purchase
 #: field:purchase.order,create_uid:0 view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "担当"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -75,34 +75,37 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"仕入先に対して製品を購入したいが、しかし、まだ発注を確認していない場合に見積依頼を作成できます。このメニューは物流ルール（最小在庫、MTOなど）を基本とし"
+"て自動的に作成された見積要求をレビューするためにも使用されます。オーダーが確認されると、見積要求から発注オーダーに変換することができます。拡張インタフェー"
+"ス（ユーザ設定から）を使用すると、仕入先請求書を制御する方法を選択できます：オーダー基準、受領基準、または手動エンコード。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "承認済発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
 #: view:purchase.order.line:0 view:purchase.report:0
 #: field:purchase.report,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "仕入先"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "請求対象"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices?"
-msgstr ""
+msgstr "仕入先請求書を作成しますか？"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -111,29 +114,31 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"このメニューは、発注オーダーを参照、仕入先、製品などによる検索のために使用します。各発注オーダーのために、受け取った製品の追跡、そして仕入先請求書の制御が"
+"できます。"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
 #, python-format
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "仕入先請求書"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "発注オーダー統計値"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "集荷リストから"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "価格リストがありません。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
@@ -143,44 +148,44 @@ msgstr ""
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Receptions"
-msgstr ""
+msgstr "受領基準"
 
 #. module: purchase
 #: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
 #: view:purchase.report:0 field:purchase.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "これは各発注オーダーのためのリード / 保証時間です。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "分類別月次発注"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "ドラフトに設定"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "請求書の例外"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "ドラフト発注価格リスト"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -188,96 +193,96 @@ msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
-msgstr ""
+msgstr "仕入先から直接顧客に配達することを望む場合は住所を入れます。このケースでは、倉庫へのリンクは削除され、顧客の場所がセットされます。"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
 msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
-msgstr ""
+msgstr "この価格リストは、現在のパートナからの発注のためにデフォルトの価格リストの代わりに使用されます。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "FAX ："
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "仕入属性"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "部分集荷処理ウィザード"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "発注の承認"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "生成されたドラフト請求書に基づく"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "日順"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "分類別月間発注"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "発注"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "ドラフト状態の発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr ""
+msgstr "起点"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,notes:0
 #: view:purchase.order.line:0 field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
 #: view:purchase.order.line:0 field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "税金"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -287,70 +292,70 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: field:purchase.order,name:0 view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "合計："
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
 msgid "Products"
-msgstr ""
+msgstr "製品"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "月別合計数量と金額"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
+msgstr "集荷リストは請求書を作成します。受注オーダーの請求書制御に依存する請求書は、配信またはオーダー数量に基づいています。"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "キャンセル済"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "発注オーダーに変換"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0 field:purchase.report,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "輸送例外"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "請求書行"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr ""
+msgstr "入ってくる製品"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
@@ -360,49 +365,49 @@ msgstr "出て行く製品"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "手動で修正"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr ""
+msgstr "参照"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
-msgstr ""
+msgstr "最初に、この発注オーダーに関連する全請求書をキャンセルすべきです。"
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "宛先住所の宛名"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA ："
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "発注オーダー %s はドラフト状態に設定されています。"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "分析アカウント"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "行数"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
@@ -410,97 +415,97 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: purchase
 #: field:purchase.order,validator:0 view:purchase.report:0
 msgid "Validated by"
-msgstr ""
+msgstr "検証者"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "先月のオーダー"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "最初に、この発注オーダーに関連する全ての受領をキャンセルすべきです。"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Price"
-msgstr ""
+msgstr "正価"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr ""
+msgstr "オーダー行"
 
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "それは集荷は行われたことを示しています。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "発注オーダーは例外状態です。"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
+msgstr "検証者"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 #: selection:purchase.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "確認済"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均価格"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "内部出荷は処理済です。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr ""
+msgstr "合計："
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
 #: view:purchase.order.line_invoice:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "受領基準"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "仕入先参照"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -508,7 +513,7 @@ msgid ""
 "A Pick list generates a supplier invoice. Depending on the Invoicing control "
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
-msgstr ""
+msgstr "集荷リストは仕入先請求書を生成します。発注オーダーの請求書制御に応じて、請求書は受領基準あるいは注文数量基準となります。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -519,85 +524,87 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"発注オーダーで発注オーダー行基準として請求書制御をセットした場合、ここから、まだ仕入先請求書を受領していないもののために全ての発注オーダー行を追跡できます"
+"。仕入先請求書を受領するための準備ができたら、このメニューから行基準のドラフト仕入先請求書を生成できます。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "発注オーダーは例外状態です。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
 msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
-msgstr ""
+msgstr "受領分析はチェックの簡易化のため、会社のオーダー受領と仕入先の配達の実績の分析を行うことができます。"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "TEL："
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr ""
+msgstr "集荷リスト"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "印刷"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "発注オーダーの集約"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "オーダー行"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:737
 #, python-format
 msgid "No Partner!"
-msgstr ""
+msgstr "パートナが指定されていません。"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Fax:"
-msgstr ""
+msgstr "FAX："
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "合計価格"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "仕入先の作成またはインポート"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Available"
-msgstr ""
+msgstr "利用可能"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "住所宛名"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "送付先："
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "発注オーダーの請求書生成"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285 code:addons/purchase/purchase.py:348
@@ -605,12 +612,12 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_line_invoice.py:111
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "エラー"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:737
@@ -619,12 +626,14 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
+"発注フォームからパートナを選択する必要があります。\n"
+"製品を選択する前にひとつのパートナをセットして下さい。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:349
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この会社のために定義された発注仕訳帳がありません：%s (id:%d)"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -633,11 +642,12 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"発注オーダーの請求書制御が集荷時の時には、請求書は自動的に作成されます。請求書は会計士によって、手動で作成することもできます（請求書制御を手動にする）。"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "発注オーダー確認番号"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -646,82 +656,83 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"発注分析はチェックの簡易化と会社の発注履歴と実績の分析が可能です、このメニューから交渉の実績や仕入先の配信実績などを追跡することができます。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "その他"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "選択仕入先は%s によりこの製品のみを売ります。"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "参照単位"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0 view:purchase.report:0
 #: field:purchase.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "請求書作成"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "予約宛先"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無効なアクションです。"
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "会計ポジション"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "設定"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "受領"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "行を持たない発注オーダーは確認できません。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -731,276 +742,278 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"このメニューは仕入先から受け取る請求書の制御に使用します。OpenERPは設定に応じて発注オーダーまたは受領からドラフト請求書を事前に生成します。仕入先請"
+"求書を受け取ったなら、ドラフト請求書と突き合せて検証できます。"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDIの価格リスト（%s）"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "承認待ち"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "発注オーダーの自動Eメール確認"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: report:purchase.order:0 view:purchase.order:0
 #: field:purchase.order,date_order:0 field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0 view:stock.picking:0
 msgid "Order Date"
-msgstr ""
+msgstr "オーダー日"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "この製品に製造ロットを割り当てる必要があります。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0 view:stock.picking:0
 msgid "Partner"
-msgstr ""
+msgstr "パートナ"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "ドラフト請求書"
 
 #. module: purchase
 #: report:purchase.order:0 report:purchase.quotation:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
 msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
-msgstr ""
+msgstr "これは、全発注オーダー行の製品のもっとも小さい予定日として計算されます。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "発注オーダーの集約"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "今月のオーダー"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "配達日数"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "製品の受領"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "調達"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "請求書"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: purchase
 #: field:purchase.config.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "画像"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "ユーザの月別合計オーダー行"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "承認済発注オーダー"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "見積依頼："
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "承認待ち発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "税抜合計"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_user
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: purchase
 #: field:purchase.order,shipped:0 field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr ""
+msgstr "受信済"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "オーダー製品のリスト"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "これはこの発注のために生成された集荷リストです。"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "会計士によってレビューされます。"
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "税金："
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "請求済"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "分類"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "発注オーダーの状態"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "宛先住所"
 
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "オーダー状態"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr ""
+msgstr "製品分類"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "発注オーダー基準のドラフト請求書の事前作成"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "請求書作成"
 
 #. module: purchase
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "会社名は固有でなければいけません。"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0 field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "発注オーダー行"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr ""
+msgstr "カレンダービュー"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "発注オーダー行基準"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "税抜金額"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "選択した単位は製品単位と同じ分類に属していません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
 #, python-format
 msgid "PO: %s"
-msgstr ""
+msgstr "発注オーダー：%s"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1009,16 +1022,17 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"発注オーダーは購入者により確認されるとすぐに仕入先請求書を生成します。発注オーダーの請求書制御に応じて、請求書は受領基準あるいは注文数量基準となります。"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "非課税金額"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "これは請求書は既に支払われたことを意味しています。"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
@@ -1028,27 +1042,27 @@ msgstr "請求するための出て行く製品"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "違う製品のロットを割り当てることはできません。"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "このドキュメントの作成日"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "受注と発注"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1057,54 +1071,55 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"発注オーダーの請求書制御がオーダー時である場合は、請求書は自動的に作成されます。請求書は会計士により、手動で生成することもできます（請求書制御を手動）。"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
 #: model:ir.ui.menu,name:purchase.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Eメールテンプレート"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "手動作成請求書"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "請求書制御"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "単位の分類"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "発注の請求書制御"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "リストビューで集約する複数のオーダーを選択して下さい。"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1113,94 +1128,95 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"このフォームから仕入先と彼らの連絡先を作成またはインポートするか、インポートデータウィザードからCSVの表計算より既存パートナをインポートできます。"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "生成された集荷リスト"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "例外"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Compute"
-msgstr ""
+msgstr "計算"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "内部出荷可能"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "アドレス帳"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "会社"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "発注オーダーのキャンセル"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "この発注オーダーはキャンセルできません。"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "入ってくる製品を追跡するために集荷リストが作成されます。"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
 msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
-msgstr ""
+msgstr "価格リストはこの発注オーダーのために使用される通貨をセットします。また、選択した製品 / 数量の仕入先価格を計算します。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "ダッシュボード"
 
 #. module: purchase
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "参照は会社ごとに固有でなければいけません。"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "製品の価値"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
-msgstr ""
+msgstr "パートナ分類"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "税金額"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "見積"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -1210,37 +1226,40 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"発注オーダー行基準：請求書制御 > 発注基準の中で各独立した行を選択して請求書を作成\n"
+"生成請求書基準：ドラフト請求書を作成し後で検証\n"
+"受領基準：受領が確認された時に請求書を作成"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "住所"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "分類別製品"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "検証日数"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "この発注オーダー要求を生成したドキュメントの参照"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "まだ発注オーダーは承認されていません。"
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1252,80 +1271,83 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"発注オーダーまたは見積要求の状態。見積はドラフト状態の発注オーダーです。そして、オーダーがユーザにより確認されると状態は確認済に切り替わります。それから、"
+"仕入先は状態を承認済に変えるためにオーダーの確認が必要です。発注オーダーが支払われそして受け取った時に状態は完了になります。請求書や製品の到着でキャンセル"
+"アクションが発生すると、状態は例外になります。"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "小計"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0 view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "倉庫"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:289
 #, python-format
 msgid "Purchase order '%s' is confirmed."
-msgstr ""
+msgstr "発注オーダー %s は確認されました。"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "発注オーダーの承認日"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,state:0
 #: view:purchase.order.line:0 field:purchase.order.line,state:0
 #: view:purchase.report:0 view:stock.picking:0
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 #: view:purchase.order:0 selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr ""
+msgstr "承認済"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "一般情報"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "請求外"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "単価"
 
 #. module: purchase
 #: view:purchase.order:0 selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0 selection:purchase.report,state:0
 #: view:stock.picking:0
 msgid "Done"
-msgstr ""
+msgstr "完了"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "見積依頼番号"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "請求のための確認済発注オーダー"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1333,17 +1355,17 @@ msgstr ""
 #: view:purchase.order:0 view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "発注オーダー行"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "仕入先は発注オーダーを承認します。"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:80
@@ -1353,99 +1375,99 @@ msgstr ""
 #: view:purchase.report:0
 #, python-format
 msgid "Purchase Orders"
-msgstr ""
+msgstr "発注オーダー"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "基となるドキュメント"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
-msgstr ""
+msgstr "オーダーの集約"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "発注オーダー行は請求書を作成します。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "内部出荷"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "ユーザの月別合計オーダー"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Request for Quotation"
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr ""
+msgstr "TEL ："
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "月順"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Our Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "発注オーダーの検索"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "デフォルト請求書制御方法をセット"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "見積依頼"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "日付要求"
 
 #. module: purchase
 #: field:purchase.order,date_approve:0 field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr ""
+msgstr "承認日"
 
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "仕入先確認待ち"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "ドラフト請求書基準"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "配送と請求"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:772
@@ -1453,57 +1475,57 @@ msgstr ""
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
-msgstr ""
+msgstr "選択した仕入先の最小数量は %s %s に設定されています。それ未満の発注はできません。"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: purchase
 #: field:purchase.order,product_id:0 view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0 view:purchase.report:0
 #: field:purchase.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "製品"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "確認"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,name:0
 #: report:purchase.quotation:0
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "年順"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr ""
+msgstr "予想配達住所："
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr ""
+msgstr "受領分析"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "発注リードタイム"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1512,103 +1534,105 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"仕入先レコードにアクセスして、仕入先との良好な関係を維持して下さい。履歴タブから仕入先との全ての相互のやりとりを追跡できます：Eメール、オーダー、ミーティ"
+"ングなど"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "配達"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in done state."
-msgstr ""
+msgstr "発注オーダーは完了状態です。"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "製品単位"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "それでは、よろしくお願いいたします。"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "待機中"
 
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "住所"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "単位の参照"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
-msgstr ""
+msgstr "予約"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "請求なしの行を含む発注オーダー"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "税抜金額"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "請求のための集荷"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
-msgstr ""
+msgstr "このツールは仕入先請求書の制御に使いたい方法を選択するのに役立ちます。"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
 msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
-msgstr ""
+msgstr "この製品のための仕入先がないケースでは、買い手はフォームを手動で埋めて、確認をします。見積依頼は発注オーダー確認済となります。"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "発注分析"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr ""
+msgstr "オーダー参照"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,minimum_planned_date:0
 #: report:purchase.quotation:0 field:purchase.report,expected_date:0
 #: view:stock.picking:0
 msgid "Expected Date"
-msgstr ""
+msgstr "予定日"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "TVA："
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -1616,22 +1640,22 @@ msgid ""
 "If you set the Invoicing Control on a purchase order as \"Based on "
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
-msgstr ""
+msgstr "発注オーダーの請求書制御で受領基準をセットした場合、全での製品受領をここで追跡し、それらの受領のために請求書を作成できます。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr ""
+msgstr "発注制御"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1648,47 +1672,57 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" 次のことに注意して下さい： \n"
+" \n"
+" 次の条件の時にのみオーダーは集約されます： \n"
+" ・ 発注オーダーがドラフトである。\n"
+" ・ 発注オーダーが同じ仕入先に属している\n"
+" ・ 発注オーダーが同じ在庫場所で同じ価格リストである\n"
+" \n"
+" 次の条件の時に行は集約されます：\n"
+" ・ オーダー行は製品の数量と単位以外は完全に同じである \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "発注標準価格"
 
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "デフォルト請求書制御方法"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
+msgstr "発注価格リスト"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "請求書制御"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "バックオーダー"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr ""
+msgstr "デフォルト発注価格リストバージョン"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr ""
+msgstr "請求"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1701,44 +1735,48 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" ドラフト状態は、発注オーダーがドラフト状態の時に自動的にセットされます。\n"
+"確認済状態は、発注オーダーが確認状態の時に自動的にセットされます。\n"
+"完了状態は、発注オーダーが完了としてセットされると自動的にセットされます。\n"
+"キャンセル済状態は、、ユーザが発注オーダーをキャンセルすると自動的にセットされます。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr ""
+msgstr "発注オーダー %s はキャンセルされます。"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "合計"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "価格リストバージョン"
 
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー：再帰的なメンバーを作ることはできません。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
 #: code:addons/purchase/wizard/purchase_line_invoice.py:112
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この製品のために定義された費用勘定がありません：%s（ID：%d）"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders?"
-msgstr ""
+msgstr "本当にこれらのオーダーを集約しますか？"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "発注オーダーから"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1747,6 +1785,8 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"発注フォームから価格リストまたは仕入先を選択する必要があります。\n"
+"製品を選択する前にどちらかをセットして下さい。"
 
 #. module: purchase
 #: model:email.template,body_text:purchase.email_template_edi_purchase
@@ -1804,21 +1844,71 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''} 様、\n"
+"\n"
+"これは発注の確認です。 ${object.company_id.name}:\n"
+"       | オーダー番号： *${object.name}*\n"
+"       | オーダー合計： *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | オーダー日： ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | オーダーの参照： ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | あなた様の参照： ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | あなた様の連絡先： ${object.validator.name} ${object.validator.user_email "
+"and '<%s>'%(object.validator.user_email) or ''}\n"
+"\n"
+"オーダー確認を閲覧またはダウンロードできます。次のリンクをご利用ください。\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"もし、何かございましたら、ご遠慮なくお知らせ下さい。\n"
+"\n"
+"ありがとうございます。\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "ドラフト状態の発注オーダー"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "マネジャ"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1828,56 +1918,56 @@ msgstr ""
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "今年のオーダー"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "発注"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "発注オーダー行基準"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase Management"
-msgstr ""
+msgstr "発注管理"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "在庫移動"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "開いている受注オーダーの選択"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "オーダー"
 
 #. module: purchase
 #: help:purchase.order,name:0
 msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
-msgstr ""
+msgstr "発注オーダーが作成される時に発注オーダーの固有番号は自動的に計算されます。"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "発注ダッシュボード"
diff --git a/addons/purchase_requisition/i18n/ja.po b/addons/purchase_requisition/i18n/ja.po
new file mode 100644
index 00000000000..ea9c2804e7a
--- /dev/null
+++ b/addons/purchase_requisition/i18n/ja.po
@@ -0,0 +1,448 @@
+# 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-16 21:11+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: purchase_requisition
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
+#, python-format
+msgid "No Product in Tender"
+msgstr "申し出に製品がありません。"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "要求書"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "担当"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "見積の作成"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Purchase Requisition in negociation"
+msgstr "交渉での発注要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "仕入先"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "製品詳細"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "要求日"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: model:ir.module.category,name:purchase_requisition.module_category_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "発注要求書"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "発注要求書行"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "見積"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr "このボックスをチェックすると、要求書は直接の見積要求の代わりに発注要求書を生成します。"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:136
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "見積要求"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "複数の要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "製品単位"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "仕入先による承認"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "ドラフトに再設定"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Current Purchase Requisition"
+msgstr "現在の発注要求書"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
+msgid "User"
+msgstr "ユーザ"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "住所"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "オーダー参照"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is the step before a request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to suppliers. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"発注要求書は見積依頼の前段階です。発注要求書では（または発注申し出）、購入が必要な製品を記録し、仕入先に見積依頼の作成のきっかけとなります。交渉の後、全仕"
+"入先の申し出をレビューし、幾つかを検証して、他をキャンセルします。"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned  Requisition"
+msgstr "未割当の要求書"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "発注要求書"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:136
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr "このパートナに既に %s の発注オーダーを持っています、新しい見積を作成するためにはこの発注オーダーをキャンセルする必要があります。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "要求書の参照"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "発注する製品"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "要求書の締切"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "発注要求書の検索"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"発注要求書（排他）：発注オーダーの確認により、残りの発注オーダーをキャンセルします。\n"
+"発注要求書（複数）：複数の発注オーダーを持つことができます。発注オーダーの確認をしても、残りのオーダーはキャンセルされません。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "発注オーダーのキャンセル"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "要求書タイプ"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
+msgstr "新規発注要求書"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "製品"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "オーダー日"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "］"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "キャンセル済"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "［"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "発注要求書パートナ"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start"
+msgstr "開始"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "見積詳細"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "要求書のための発注"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "発注オーダー"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "起点"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "調達"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "最終要求書"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "発注要求書（排他）"
+
+#. module: purchase_requisition
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "発注オーダーの確認"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "未割当"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "発注オーダー"
diff --git a/addons/report_designer/i18n/ja.po b/addons/report_designer/i18n/ja.po
new file mode 100644
index 00000000000..786dc32fc5d
--- /dev/null
+++ b/addons/report_designer/i18n/ja.po
@@ -0,0 +1,103 @@
+# 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: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-06-15 22:44+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: report_designer
+#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+#: view:report_designer.installer:0
+msgid "Reporting Tools Configuration"
+msgstr "レポートツールの設定"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "クエリビルダー"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure"
+msgstr "設定"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "タイトル"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr ""
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "OpenOfficeレポートデザイナ"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "レポートツール"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid ""
+"OpenERP's built-in reporting abilities can be improved even further with "
+"some of the following applications"
+msgstr "OpenERPの組み込みレポートの能力は次のアプリケーションの幾つかの機能をさらに改良します。"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
+msgstr "レポートツールの設定"
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_creator:0
+msgid ""
+"Allows you to create any statistic reports  on several objects. It's a SQL "
+"query builder and browser for end users."
+msgstr "幾つかのオブジェクト上に任意の統計レポートを作成できます。それはエンドユーザのためのSQLクエリービルダーとブラウザです。"
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_designer:0
+msgid ""
+"Adds wizards to Import/Export .SXW report which you can modify in "
+"OpenOffice.Once you have modified it you can upload the report using the "
+"same wizard."
+msgstr ""
+".SXWレポートのインポート / "
+"エクスポートするためのウィザードを追加します。これはOpenOfficeの変更を行うことができます。これを変更した後、同じウィザードを使ってレポートをアッ"
+"プロードできます。"
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+"レポートツールを選択するためのインストーラ\n"
+"    "
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "設定の進行状況"
diff --git a/addons/report_intrastat/i18n/ja.po b/addons/report_intrastat/i18n/ja.po
new file mode 100644
index 00000000000..1012c122c8a
--- /dev/null
+++ b/addons/report_intrastat/i18n/ja.po
@@ -0,0 +1,343 @@
+# 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-15 23: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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Cancelled Invoice"
+msgstr "キャンセル済請求書"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr "国の名前は固有であるべきです。"
+
+#. module: report_intrastat
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr "国のコードは固有でなければなりません。"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Disc. (%)"
+msgstr "割引（%）"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Invoice"
+msgstr "仕入先請求書"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: report_intrastat
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr "エラー：デフォルトの単位と発注単位は同じ分類でなければいけません。"
+
+#. module: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Import"
+msgstr "インポート"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "VAT :"
+msgstr "消費税："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Document"
+msgstr "ドキュメント"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "PRO-FORMA"
+msgstr "プロフォーマ"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes:"
+msgstr "税金："
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: report_intrastat
+#: field:report.intrastat,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: report_intrastat
+#: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
+msgid "Invoice Intrastat"
+msgstr "州内の請求書"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice Date"
+msgstr "請求日"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tel. :"
+msgstr "TEL："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Base"
+msgstr "基本"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Year"
+msgstr "今年"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat_code
+#: field:product.template,intrastat_id:0
+#: field:report.intrastat,intrastat_id:0
+#: view:report.intrastat.code:0
+msgid "Intrastat code"
+msgstr "州内コード"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "This Month"
+msgstr "今月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Partner Ref."
+msgstr "パートナの参照"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (inclu. taxes):"
+msgstr "合計（税込）"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_report_intrastat
+msgid "Intrastat report"
+msgstr "州内レポート"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_res_country
+msgid "Country"
+msgstr "国"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Taxes"
+msgstr "税金"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: report_intrastat
+#: view:report.intrastat:0
+msgid "Intrastat Data"
+msgstr "州内データ"
+
+#. module: report_intrastat
+#: field:report.intrastat,value:0
+msgid "Value"
+msgstr "値"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
+#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
+msgid "Intrastat"
+msgstr "州内"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Draft Invoice"
+msgstr "ドラフト請求書"
+
+#. module: report_intrastat
+#: field:report.intrastat,supply_units:0
+msgid "Supply Units"
+msgstr "供給単位"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat.code,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Refund"
+msgstr "返金"
+
+#. module: report_intrastat
+#: field:report.intrastat,ref:0
+msgid "Source document"
+msgstr "元となるドキュメント"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fiscal Position Remark :"
+msgstr "会計ポジションの注釈："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+#: field:report.intrastat,weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: report_intrastat
+#: model:ir.model,name:report_intrastat.model_product_template
+msgid "Product Template"
+msgstr "製品テンプレート"
+
+#. module: report_intrastat
+#: field:res.country,intrastat:0
+msgid "Intrastat member"
+msgstr "州内メンバー"
+
+#. module: report_intrastat
+#: selection:report.intrastat,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Tax"
+msgstr "税金"
+
+#. module: report_intrastat
+#: field:report.intrastat,code:0
+msgid "Country code"
+msgstr "国コード"
+
+#. module: report_intrastat
+#: field:report.intrastat,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: report_intrastat
+#: field:report.intrastat,currency_id:0
+msgid "Currency"
+msgstr "通貨"
+
+#. module: report_intrastat
+#: selection:report.intrastat,type:0
+msgid "Export"
+msgstr "エクスポート"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Fax :"
+msgstr "FAX："
+
+#. module: report_intrastat
+#: field:report.intrastat,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Supplier Refund"
+msgstr "仕入先返金"
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Total (excl. taxes):"
+msgstr "合計（税抜）："
+
+#. module: report_intrastat
+#: report:account.invoice.intrastat:0
+msgid "Price"
+msgstr "価格"
+
+#. module: report_intrastat
+#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
+#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
+#: field:report.intrastat.code,name:0
+msgid "Intrastat Code"
+msgstr "州内コード"
diff --git a/addons/report_webkit/i18n/ja.po b/addons/report_webkit/i18n/ja.po
new file mode 100644
index 00000000000..ab5c9eb0fb6
--- /dev/null
+++ b/addons/report_webkit/i18n/ja.po
@@ -0,0 +1,558 @@
+# 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-16 00:51+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "WebKitテンプレート（レポートファイルが見つからない時に使用）"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr "タブロイド 29 279.4 x 431.8 mm"
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "WebKit実行可能ファイルのパス"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr "レジャー 28 431.8 x 279.4 mm"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:223
+#, python-format
+msgid "No header defined for this Webkit report!"
+msgstr "WebKit"
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "画像タイプ（png、gif、jpeg）"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,precise_mode:0
+msgid ""
+"This mode allow more precise element                                         "
+"                    position as each object is printed on a separate HTML.   "
+"                                                         but memory and disk "
+"usage is wider"
+msgstr ""
+"このモジュールは別個のHTMLに印刷される各オブジェクトをより正確な位置づけを可能にします。しかし、メモリとディスクの使用量が大きくなります。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr "エグゼクティブ 4 7.5 x 10 inches, 190.5 x 254 mm"
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:100
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr "Wkhtmltopdfへのパスが絶対パスではありません。"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Company and Page Setup"
+msgstr "会社とページの設定"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:252
+#: code:addons/report_webkit/webkit_report.py:263
+#: code:addons/report_webkit/webkit_report.py:272
+#: code:addons/report_webkit/webkit_report.py:285
+#: code:addons/report_webkit/webkit_report.py:296
+#, python-format
+msgid "Webkit render"
+msgstr "WebKit描画"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "ヘッダー"
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "画像の名前"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:94
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+"会社に設定されたWkhtmltopdfへのパスが間違っています。'+\n"
+"                                '指定されたパスは実行可能でないか、間違っています。"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:167
+#, python-format
+msgid "Webkit raise an error"
+msgstr "WebKitはエラーを起こしました。"
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
+#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
+msgid "Webkit Headers/Footers"
+msgstr "WebKitヘッダー / フッター"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr "リーガル 3 8.5 x 14 inches, 215.9 x 355.6 mm"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr "A4 0 210 x 297 mm, 8.26 x 11.69 インチ"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:82
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company "
+"form.'+\n"
+"                             'Minimal version is 0.9.9"
+msgstr ""
+"実行可能ファイルをシステムにインストールして下さい。'+\n"
+"                             ' (sudo apt-get install "
+"wkhtmltopdf)、または、ここからダウンロードして下さい：'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list そして、'+\n"
+"                             ' 会社フォームの実行可能ファイルへのパスをセットして下さい。'+\n"
+"                             '最低バージョンは 0.9.9 です。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr ""
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,precise_mode:0
+msgid "Precise Mode"
+msgstr "正確さモード"
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:137
+#, python-format
+msgid "Client Actions Connections"
+msgstr "顧客アクションの連結"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "利用可能画像"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr "WebKitヘッダー"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "ヘッダーをレポートにリンクしました。"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:81
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr "Wkhtmltopdfライブラリパスが会社にセットされていません。"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr "WebKit"
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "適切な用紙サイズを選択します。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,report_webkit_data:0
+msgid "This template will be used if the main report file is not found"
+msgstr "このテンプレートはメインレポートファイルが見つからないときに使用されます。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "上部余白（mm）"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:224
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "会社設定の中にヘッダーをセットして下さい。"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr "OK"
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr "対応するドキュメントタイプのサイドバーの中にこのレポートのための印刷アクションを加えためには、これをチェックします。"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "Webkit Header"
+msgstr "WebKitヘッダー"
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "WebKitエンジンデバッガを有効化"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "画像"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "HTML使用可能"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr "それを作成した後で（技術的なビュー）内部の印刷アクションを新しくビューに追加するためには、これをチェックします。 "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "画像"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "縦向き"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "横向き"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "印刷ボタンの追加"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Footer"
+msgstr "フッター"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "下部余白（mm）"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "WebKitアクション"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "追加アクションを開く"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "右余白（mm）"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "向き"
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid ""
+"Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
+"Install a static version of the library if you experience missing "
+"header/footers on Linux."
+msgstr ""
+"wkhtmltopdf 実行可能ファイルへのフルパス。バージョン 0.9.9 が必須です。Linuxでヘッダー / "
+"フッターの欠落を経験するなら、ライブラリは静的なバージョンをインストールします。"
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "WebKitレポートヘッダーのセット"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "用紙サイズ"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Header"
+msgstr "ヘッダー"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "CSS Style"
+msgstr "CSSスタイル"
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "ヘッダーCSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_img
+#: model:ir.ui.menu,name:report_webkit.menu_header_img
+msgid "Webkit Logos"
+msgstr "WebKitロゴ"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "WebKitテンプレート"
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "WebKitフッター"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr "WebKitデバッグ"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr "レター 2 8.5 x 11 インチ, 215.9 x 279.4 mm"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr ""
+
+#. module: report_webkit
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
+#: view:report.webkit.actions:0
+msgid "Add Print Buttons"
+msgstr "印刷ボタンの追加"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:218
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "WebKitレポートテンプレートが見つかりません。"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "左余白（mm）"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:218
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "WebKitレポートフッターの設定"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/addons/report_webkit_sample/i18n/ja.po b/addons/report_webkit_sample/i18n/ja.po
new file mode 100644
index 00000000000..9d1d8fa1813
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/ja.po
@@ -0,0 +1,123 @@
+# 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-15 23:12+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
+msgid "Refund"
+msgstr "返金"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
+msgid "Fax"
+msgstr "FAX"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
+msgid "Tel"
+msgstr "電話"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Description"
+msgstr "説明"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
+msgid "Supplier Invoice"
+msgstr "仕入先請求書"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "WebKit請求書"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Price"
+msgstr "価格"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Invoice Date"
+msgstr "請求日"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Taxes"
+msgstr "税金"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "QTY"
+msgstr "数量"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
+msgid "E-mail"
+msgstr "Eメール"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Amount"
+msgstr "金額"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
+msgid "Base"
+msgstr "基本"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
+msgid "Supplier Refund"
+msgstr "仕入先返金"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Document"
+msgstr "ドキュメント"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
+msgid "Partner Ref."
+msgstr "パートナの参照"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
+msgid "VAT"
+msgstr "消費税"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
+msgid "Total"
+msgstr "合計"
diff --git a/addons/resource/i18n/ja.po b/addons/resource/i18n/ja.po
new file mode 100644
index 00000000000..52af13290d6
--- /dev/null
+++ b/addons/resource/i18n/ja.po
@@ -0,0 +1,354 @@
+# 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-16 02:00+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr "空の場合、これは会社の一般的な休日です。リソースがセットされている場合、休日 / 休暇はこのリソースのためだけです。"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "材料"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "リソースタイプ"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "休暇の詳細"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "休暇リソース"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Time"
+msgstr "作業時間"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "木曜"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "日曜"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "リソースの検索"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "リソース"
+
+#. module: resource
+#: code:addons/resource/resource.py:392
+#, python-format
+msgid "Make sure the Working time has been configured with proper week days!"
+msgstr "作業時間に適切な曜日が設定されていることを確認して下さい。"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup Manager"
+msgstr "作業グループマネジャ"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr "作業開始時間"
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "リソースカレンダー」"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "金曜"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of Week"
+msgstr "曜日"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr "作業終了時間"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "開始日"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr "作業時間の検索"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr "理由"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "日付"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "作業期間休暇の検索"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency Factor"
+msgstr "効率性の因子"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "閉鎖日数"
+
+#. module: resource
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "リソース"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "水曜"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Working Period"
+msgstr "作業期間"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "リソースの詳細"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr "アクティブ項目をFalse にセットすると、リソースレコードは削除することなく非表示にできます。"
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "リソースカレンダー"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "作業開始時間"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_calendar_form
+msgid ""
+"Define working hours and time table that could be scheduled to your project "
+"members"
+msgstr "プロジェクトメンバーにスケジュールする作業時間数とタイムテーブルを定義します。"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "そのアクセスを管理するためのリソースに関連するユーザ名"
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "リソースのスケジュールを定義します。"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Starting Date of Leave"
+msgstr "休暇開始日"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "コード"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "月曜"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "作業終了時間"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+"この項目は完了したタスクに対するリソースの効率を表します。例えば、リソースを彼に5つのタスクで5日の期間を単独で置いた場合、デフォルトによればその期間は1"
+"00％の負荷であることを表します。しかし、200％の効率を置く場合、彼の負荷はわずか50％になります。"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "火曜日"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+msgid "Working time"
+msgstr "作業時間"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
+msgstr "休暇リソース"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+"リソースは特定のプロジェクトフェーズに関与すべきリソースの作成と管理ができます。それらの効率レベルと週間作業時間を基本とする作業負荷を設定できます。"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr "非アクティブ"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr "（休暇）"
+
+#. module: resource
+#: code:addons/resource/resource.py:392
+#, python-format
+msgid "Configuration Error!"
+msgstr "設定エラー"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "人間"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "作業詳細"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: resource
+#: code:addons/resource/resource.py:310
+#, python-format
+msgid " (copy)"
+msgstr " （コピー）"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "土曜"
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
new file mode 100644
index 00000000000..5ac44be08b1
--- /dev/null
+++ b/addons/sale/i18n/ja.po
@@ -0,0 +1,2167 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-18 04:09+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr "勤務表を基本"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr "受注オーダー行は確認済、完了、または例外状態であり、まだ請求されていません。"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr "過去90日間の販売員による販売"
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr "全てを一度に配達するための十分な在庫を持っていない場合、部分的な出荷を認めますか？"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "販売単位"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "現在の受注オーダーの出荷住所"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "オーダーのキャンセル"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "見積 %s は受注オーダーに変換されました。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr "見積の印刷"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "消費税"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "全ての受注オーダー行のために調達オーダーを駆動します。"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+"これは請求される各受注オーダー行のリストです。受注オーダー行の単位で部分的な受注オーダーの請求ができます。配達オーダーから請求する場合、または、受注合計で"
+"請求する場合は、このリストは必要ではありません。"
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+"確認済受注オーダーを削除するためには、先に次のものをキャンセルする必要があります。受注オーダーのキャンセルのためには、最初に関連する集荷あるいは配達オーダ"
+"ーをキャンセルせねばなりません。"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "調達オーダー"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "配達基準の請求書"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "オーダー行"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+"受注オーダーは顧客からの見積とオーダーの管理と助けます。OpenERPは見積の作成から開始することを提案します。それが確認されると見積は受注オーダーに変換"
+"されます。受注オーダーはタスク、配達オーダー、製造オーダー、発注などを引き起こすようにOpenERPは製品の幾つかのタイプを取り扱うことができます。受注オ"
+"ーダーの設定を基本として、ドラフト請求書は顧客に請求したい時に、確認しなければならないように作成されます。"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"受注オーダーは請求書案（ドラフト請求書）を自動的に作成します。オーダーされたものと、配達された数量は同じでは無いかもしれません。あなたはオーダー基準または"
+"出荷数量基準のどちらで請求するのかを決める必要があります。製品がサービスである場合は、出荷数量は関連したタスクに費やされた時間を意味します。"
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "デフォルト支払条件"
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr "配達オーダー基準"
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr "主作業時間単位"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "状態"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "同じ顧客のために請求書をグループ化するにはこのボックスをチェックします。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ea7f6eb230e..dbdfcbc4fbd 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -212,7 +212,7 @@ class sale_order(osv.osv):
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
+            ], 'Status', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b439c7ff4f0..9688fb69802 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -90,7 +90,6 @@
                     <field name="user_id"/>
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="amount_untaxed" sum="Total Tax Excluded"/>
                     <field name="amount_total" sum="Total Tax Included"/>
                     <field name="state"/>
                 </tree>
@@ -149,11 +148,16 @@
                         <page string="Order Lines">
                             <field name="order_line">
                                 <form string="Sales Order Lines" version="7.0">
-                                    <field name="product_id"
-                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
-                                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
-                                    <field name="name" placeholder="Porduct/Service characteristics"/>
-                                    <group>
+                                    <header>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                    </header>
+                                    <group col="4" colspan="4">
+                                        <group>
+                                            <field name="product_id"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                            <field name="name" placeholder="Product/Service characteristics"/>
+                                        </group>
                                         <group>
                                             <label for="product_uom_qty"/>
                                             <div>
@@ -172,14 +176,16 @@
                                             </div>
                                             <field name="price_unit"/>
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
-                                        </group><group>
+                                        </group>
+                                    </group>
+                                    <group>
+                                        <group>
                                             <field name="product_packaging"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                                 domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
                                                 colspan="3"/>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <field name="invoiced"/>
-                                            <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                                             <button name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
                                         </group>
                                         <group col="4">
@@ -189,7 +195,7 @@
                                             <field name="address_allotment_id"/>
                                         </group>
                                         <separator string="Properties" colspan="2"/>
-                                        <field name="property_ids"/>
+                                        <field name="property_ids" colspan="4" nolabel="1" />
                                         <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
                                         <field name="notes" groups="base.group_sale_notes_subtotal"/>
                                         <div groups="base.group_no_one">
diff --git a/addons/sale_analytic_plans/i18n/ja.po b/addons/sale_analytic_plans/i18n/ja.po
new file mode 100644
index 00000000000..1c624b29176
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/ja.po
@@ -0,0 +1,28 @@
+# 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-16 02: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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "分析分布"
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
diff --git a/addons/sale_crm/i18n/mn.po b/addons/sale_crm/i18n/mn.po
new file mode 100644
index 00000000000..2e9e1eef739
--- /dev/null
+++ b/addons/sale_crm/i18n/mn.po
@@ -0,0 +1,136 @@
+# Mongolian 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-18 01:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr "Ангилал"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr "Борлуулалтын Үнийн санал руу хөрвүүлэгдсэн (%s)."
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Үнийн санал руу хөрвүүлэх"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Өгөгдөл хангалтгүй байна!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "Захиалагчид хаяг тодорхойлогдоогүй байна!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "Борлуулалт хийх"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Үүсгэх"
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr "Миний Борлуулалтын Баг"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+"Борлуулалтын захиалга үүссэн дараа боломжийг хаахын тулд үүнийг тэмдэглэ."
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr "Миний боломж"
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Үнийн санал руу хөрвүүлэх"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Дэлгүүр"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Үйлчлүүлэгч"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Боломж: %s"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Боломжийг Хаах"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr "Миний төлөвлөсөн орлого Шатаар"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr "'%s' боломж Үнийн санал рүү хөрвүүлэгдлээ."
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Борлуулалтын баг"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Үнийн Санал Үүсгэх"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 49e7686542c..60ef80db245 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <field name="state" position="before">
+                    <xpath expr="/form/header/button[@name='stage_previous']" position="before">
                         <button string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
-                    </field>
+                    </xpath>
                 </data>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 3923336eb5b..9484b87652e 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -120,6 +120,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids and new_ids[0]
                 }
             else:
@@ -130,6 +131,7 @@ class crm_make_sale(osv.osv_memory):
                     'res_model': 'sale.order',
                     'view_id': False,
                     'type': 'ir.actions.act_window',
+                    'name' : _('Quotation'),
                     'res_id': new_ids
                 }
             return value
@@ -145,9 +147,9 @@ class crm_make_sale(osv.osv_memory):
         'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
     }
     _defaults = {
-         'shop_id': _get_shop_id,
-         'close': False,
-         'partner_id': _selectPartner,
+        'shop_id': _get_shop_id,
+        'close': False,
+        'partner_id': _selectPartner,
     }
 
 crm_make_sale()
diff --git a/addons/sale_journal/i18n/ja.po b/addons/sale_journal/i18n/ja.po
new file mode 100644
index 00000000000..3618e160e47
--- /dev/null
+++ b/addons/sale_journal/i18n/ja.po
@@ -0,0 +1,132 @@
+# 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-16 21:45+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "注記"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Type"
+msgstr "請求タイプ"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid ""
+"This invoicing type will be used, by default, for invoicing the current "
+"partner."
+msgstr "この請求タイプは現在のパートナの請求のため、デフォルトで使用されます。"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "受注と発注"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr "アクティブ項目をFalseにセットした場合、請求タイプは削除することなく非表示にできます。"
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "請求方法"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr "請求書タイプ"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "非グループ化"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "グループ化"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"請求書タイプはパートナ、受注オーダー、配達オーダーのために使用されます。顧客ニーズに応じて請求をグループ化するための固有の請求仕訳帳を作成できます：毎日、"
+"毎水曜日、月次など"
+
+#. module: sale_journal
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "請求書タイプ"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "集荷リスト"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "請求"
diff --git a/addons/sale_layout/i18n/ja.po b/addons/sale_layout/i18n/ja.po
new file mode 100644
index 00000000000..e3611ca677b
--- /dev/null
+++ b/addons/sale_layout/i18n/ja.po
@@ -0,0 +1,254 @@
+# 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-16 04:52+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "小計"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "タイトル"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "割引（%）"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "注記"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Line Type"
+msgstr "行タイプ"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "オーダー番号"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "オーダー行"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "請求書行"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "単位"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "製品"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "説明"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "販売員"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "TEL："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "見積番号"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "消費税"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "請求書作成"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "属性"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "請求書住所："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "FAX："
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "送付先住所："
+
+#. module: sale_layout
+#: view:sale.order:0
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "税金"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "合計："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "合計："
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "支払条件"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "履歴"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "区切り線"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "参照"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "見積日"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "状態"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "受注オーダー行"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "レイアウト付きオーダー"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "税金："
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "改ページ"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "オーダー行"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "価格"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "在庫移動"
diff --git a/addons/sale_mrp/i18n/ja.po b/addons/sale_mrp/i18n/ja.po
new file mode 100644
index 00000000000..0f1b13f4752
--- /dev/null
+++ b/addons/sale_mrp/i18n/ja.po
@@ -0,0 +1,53 @@
+# 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-16 02:40+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr "受注オーダーから顧客参照を示します。"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sales Reference"
+msgstr "受注参照"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "製造オーダー"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sales Name"
+msgstr "販売名"
+
+#. module: sale_mrp
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: sale_mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "オーダー数量は負または0にはできません。"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr "受注オーダーの名前を示します。"
diff --git a/addons/sale_order_dates/i18n/ja.po b/addons/sale_order_dates/i18n/ja.po
new file mode 100644
index 00000000000..7a66700e568
--- /dev/null
+++ b/addons/sale_order_dates/i18n/ja.po
@@ -0,0 +1,58 @@
+# 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-16 02:37+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "顧客が販売のために要求した日付"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "契約日"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "有効日"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "集荷が作成された日付"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "要求日"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "製品の配達がなされる日付"
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 17e5126e824..4d281cb9c0f 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/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-05-10 18:13+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-06-18 03:14+0000\n"
+"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:39+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -35,6 +35,7 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
+"在做实时库存盘点时，除非在源库位有一个特定的估价科目，否则所有进仓调拨在对应的的账簿将登入这科目。这是该类别产品的默认值。它也可以直接设定在每个产品上。"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -44,7 +45,7 @@ msgstr "如果固定为连锁库位"
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Put in a new pack"
-msgstr "放到新托盘"
+msgstr "放入到新的包裹"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
@@ -77,7 +78,7 @@ msgstr "版本号"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders processed Today or planned for Today"
-msgstr ""
+msgstr "今天处理或计划处理的单据"
 
 #. module: stock
 #: view:stock.partial.move.line:0 view:stock.partial.picking:0
@@ -123,12 +124,12 @@ msgstr "定期盘点表用于盘点每个库位的可用产品数量.你可以
 #: code:addons/stock/wizard/stock_change_product_qty.py:87
 #, python-format
 msgid "Quantity cannot be negative."
-msgstr ""
+msgstr "数量不能为负"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr "装箱单"
+msgstr "分拣单列表"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -189,13 +190,13 @@ msgstr "本月"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "无法分配所有到这个调拨里！"
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr "库存调拨#%s丢失部分装箱单"
+msgstr "库存调拨#%s 丢失部分分拣单"
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
@@ -212,7 +213,7 @@ msgstr "您不能删除任何记录！"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders to invoice"
-msgstr ""
+msgstr "送货单开发票"
 
 #. module: stock
 #: view:stock.picking:0
@@ -223,7 +224,7 @@ msgstr "安排送货单"
 #: field:stock.partial.move.line,update_cost:0
 #: field:stock.partial.picking.line,update_cost:0
 msgid "Need cost update"
-msgstr ""
+msgstr "需要更新成本"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -232,7 +233,7 @@ msgid ""
 "The current move line is already assigned to a pack, please remove it first "
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
-msgstr "当前调拨明细已分配到托盘,如果你真想修改产品: \"%s\" (id: %d)请先删除它."
+msgstr "当前调拨明细已分配到分拣单,如果你真想修改产品: \"%s\" (id: %d)请先删除它."
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -242,18 +243,18 @@ msgstr "无效"
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr "其它单号或序列号"
+msgstr "其它相关单号或序列号"
 
 #. module: stock
 #: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
 msgid "Origin"
-msgstr "来源"
+msgstr "源"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
 msgid "Incoming Products"
-msgstr "进仓单"
+msgstr "入库货品"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -271,7 +272,7 @@ msgstr "向后追溯"
 #: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
-msgstr "单号"
+msgstr "相关单号"
 
 #. module: stock
 #: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
@@ -289,13 +290,13 @@ msgstr "如果勾选，所有产品数量将设为零以确保实物盘点操作
 #. module: stock
 #: view:stock.partial.move:0 view:stock.partial.picking:0
 msgid "_Validate"
-msgstr "验证(_V)"
+msgstr "审核（_V）"
 
 #. module: stock
 #: code:addons/stock/stock.py:1149
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
-msgstr "库存调拨在完成状态，不能取消装箱单!"
+msgstr "你不能取消这分拣单因为库存调拨在已完成状态!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
@@ -327,7 +328,7 @@ msgstr "业务伙伴"
 msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Valuation account on category of this product are same."
-msgstr ""
+msgstr "不能建立账簿的分录。因为这产品的入仓科目和这产品类别的估价科目相同。"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -354,12 +355,12 @@ msgstr "贸易术语代码"
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr "这托盘的库存调拨"
+msgstr "这分拣单的库存调拨"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "可用的进货"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -466,7 +467,7 @@ msgstr "平均价格使用的币别"
 msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
-msgstr "产品当开启实时盘点估值时,此科目将记录产品的当前价格."
+msgstr "在进行产品实时盘点估价时，此科目记录产品的当前价值。"
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
@@ -504,7 +505,7 @@ msgstr "["
 msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
-msgstr "生产批次在公司仓库内的可用产品数量"
+msgstr "在公司仓库可用生产批次的当前产品数量"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -540,13 +541,13 @@ msgstr ""
 #: code:addons/stock/stock.py:760
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "您不能处理没有调拨的装箱单"
+msgstr "您不能处理没有库存调拨的分拣单"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "装箱单"
+msgstr "分拣"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -597,7 +598,7 @@ msgstr "收货"
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr "附加单号"
+msgstr "附加的相关单号"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
@@ -611,7 +612,7 @@ msgid ""
 "specific journal according to the type of operation to perform or the "
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
-msgstr "系统允许你根据执行操作的类型或员工/团队将执行的操作对每个库存操作指定一个具体的账簿.例如质量控制,领料单,装箱单等."
+msgstr "系统允许你根据执行的操作或将要执行的操作对每个库存操作指定一个具体的账簿。例如质量控制，领料单，分拣单等."
 
 #. module: stock
 #: field:stock.location,complete_name:0 field:stock.location,name:0
@@ -628,7 +629,7 @@ msgid ""
 "any\n"
 "queries regarding your account, please contact us.\n"
 "Thank you in advance.\n"
-msgstr ""
+msgstr "我们的记录显示下列款项为欠款。如果已经支付请付略这提示。但要是你对这有任何疑问请联系我们！\n"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -642,12 +643,12 @@ msgid ""
 "suppliers. An incoming shipment contains a list of products to be received "
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
-msgstr ""
+msgstr "进货单是您将从供应商那收货的所有订单列表。进货单来源于采购订单，包含要接收产品的列表。您可以拿着它来验货。"
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "父向导（现有的明细）"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -660,7 +661,7 @@ msgstr "调拨信息"
 msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
-msgstr ""
+msgstr "这个产品类别: \"%s\" (id: %d) 没有定义盘点估计科目！"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -678,12 +679,12 @@ msgstr "8月"
 #: model:ir.model,name:stock.model_stock_tracking
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0
 msgid "Packs"
-msgstr "托盘"
+msgstr "包裹"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "您尝试为不同的产品分配批次"
+msgstr "您尝试为不同的产品分配同一批次"
 
 #. module: stock
 #: view:res.partner:0
@@ -718,7 +719,7 @@ msgstr "收件人"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator
 msgid "Refrigerator"
-msgstr ""
+msgstr "冷藏室"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
@@ -746,12 +747,12 @@ msgstr "在进行实时盘点估值时,库存调拨处理将自动登入这账
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr "处理装箱单"
+msgstr "分拣"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "编号必须在公司内唯一！"
+msgstr "必须在公司内唯一！"
 
 #. module: stock
 #: code:addons/stock/product.py:417
@@ -776,7 +777,7 @@ msgstr "勾选此选项在列表中选择列表中现有的批次,否则您输
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "这产品类别: %s 未指定估价科目。"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -899,17 +900,17 @@ msgstr "单价"
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "日程表日期"
+msgstr "安排日期"
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr "托盘搜索"
+msgstr "分拣搜索"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "已处理的分拣"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 49e0e9c1880..135c2c79fa4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,13 +60,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="standard_price" position="replace">
+                <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0"/>
-                    <group col="2" colspan="1">
+                    <div>
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="Update"
                             type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
-                    </group>
+                    </div>
                 </field>
             </field>
         </record>
@@ -78,7 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
+                <xpath expr="//group[@name='properties']" position="before">
                     <group groups="stock.group_inventory_valuation">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
@@ -102,22 +102,20 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="status" position="after">
-                    <group colspan="2" col="3">
-                        <separator string="Stocks" colspan="4"/>
+                <group name="status" position="before" version="7.0">
+                    <group string="Stock and Expected Variations">
                         <field name="qty_available"/>
-                        <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user"/>
-                        <newline/>
-                        <field name="virtual_available"/>
-                    </group>
-                    <group colspan="2" col="2" name="stock_variations">
-                        <separator string="Expected Stock Variations" colspan="2"/>
                         <field name="incoming_qty"/>
+                        <label for="virtual_available" />
+                        <div>
+                            <field name="virtual_available" class="oe_form_inline" />
+
+                            <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
+                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_form_inline" />
+                        </div>
                         <field name="outgoing_qty"/>
                     </group>
-                    <group colspan="2" col="2" name="lot" groups="stock.group_tracking_lot,stock.group_production_lot">
-                        <separator string="Lots" colspan="4"/>
+                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
                         <field name="track_incoming" groups="stock.group_tracking_lot"/>
                         <field name="track_outgoing" groups="stock.group_tracking_lot"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0154af26d95..8f18b89ed1f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,15 +119,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="name"  /> 
+                        </div>
+                        <h1>
+                            <field name="name" placeholder="Annual inventory"/>
+                        </h1>
+                    </div>
                 <group>
-                    <label for="name" clas="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="name" placeholder="Annual invetory 2013"/>
-                    </h1>
-                    <group col="4">
+                    <group>
                         <field name="date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
+                </group>
                     <notebook>
                     <page string="General Informations">
                         <field name="inventory_line_id">
@@ -182,7 +187,6 @@
                          </field>
                     </page>
                     </notebook>
-                    </group>
                     </sheet>
                 </form>
             </field>
@@ -783,62 +787,62 @@
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <field name="state" widget="statusbar"/>
+                                        <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
                                     </header>
                                     <group>
-                                    <group string="Move Information">
-                                        <field name="name" invisible="1"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                        <label for="product_qty"/>
-                                        <div>
-                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
-                                            <button name="%(stock.move_scrap)d"
-                                                    string="Scrap" type="action"
-                                                    icon="gtk-convert" context="{'scrap': True}"
-                                                    states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        </div>
-                                        <label for="product_uos_qty" groups="product.group_uos"/>
-                                        <div>
-                                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
-                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
-                                        </div>
-                                        <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                    </group>
+                                        <group string="Move Information">
+                                            <field name="name" invisible="1"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                                            <label for="product_qty"/>
+                                            <div>
+                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+                                                <button name="%(stock.move_scrap)d"
+                                                        string="Scrap" type="action"
+                                                        icon="gtk-convert" context="{'scrap': True}"
+                                                        states="draft,waiting,confirmed,assigned" colspan="1"/>
+                                            </div>
+                                            <label for="product_uos_qty" groups="product.group_uos"/>
+                                            <div>
+                                                <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_form_inline"/>
+                                                <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                            </div>
+                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                                        </group>
 
-                                    <group string="Locations" groups="stock.group_locations">
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                    </group>
+                                        <group string="Dates">
+                                            <field name="create_date" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                                        </group>
 
-                                    <group string="Dates">
-                                        <field name="create_date" invisible="1"/>
-                                        <field name="date"/>
-                                        <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                    </group>
+                                        <group string="Locations" groups="stock.group_locations">
+                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                        </group>
 
-                                    <group groups="stock.group_tracking_lot" string="Traceability">
-                                        <label for="tracking_id"/>
-                                        <div>
-                                            <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
-                                            <button name="%(split_into)d" string="New Pack" type="action"
-                                                  groups="product.group_stock_packaging"
-                                                  icon="terp-stock_effects-object-colorize"
-                                                  states="draft,assigned,confirmed"/>
-                                        </div>
+                                        <group groups="stock.group_tracking_lot" string="Traceability">
+                                            <label for="tracking_id"/>
+                                            <div>
+                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
+                                                <button name="%(split_into)d" string="New Pack" type="action"
+                                                      groups="product.group_stock_packaging"
+                                                      icon="terp-stock_effects-object-colorize"
+                                                      states="draft,assigned,confirmed"/>
+                                            </div>
 
-                                        <label for="prodlot_id"/>
-                                        <div>
-                                            <field name="prodlot_id" groups="stock.group_production_lot"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
-                                            <button name="%(track_line)d"
-                                                groups="stock.group_tracking_lot"
-                                                states="draft,waiting,confirmed,assigned"
-                                                string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                        </div>
-                                    </group>
+                                            <label for="prodlot_id"/>
+                                            <div>
+                                                <field name="prodlot_id" groups="stock.group_production_lot"
+                                                    context="{'location_id':location_id, 'product_id':product_id}"
+                                                    domain="[('product_id','=?',product_id)]"
+                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+                                                <button name="%(track_line)d"
+                                                    groups="stock.group_tracking_lot"
+                                                    states="draft,waiting,confirmed,assigned"
+                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                            </div>
+                                        </group>
                                     </group>
                                 </form>
                             </field>
@@ -1219,32 +1223,37 @@
                             <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+                                <field name="product_qty"
+                                    on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
+                                    class="oe_form_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_form_inline"/>
                                 <button name="%(stock.move_scrap)d"
                                         string="Scrap" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
                                         states="draft,waiting,confirmed,assigned" colspan="1"/>
                             </div>
+                            <label for="product_uso_qty" />
+                            <div>
+                                <field name="product_uos_qty" 
+                                    groups="product.group_uos" 
+                                    on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" 
+                                    class="oe_form_inline"/>
+                                <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_form_inline"/>
+                            </div>
+                            <field name="name" string="Reason"/>
+                        </group>
+                        <group>
+                            <field name="picking_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"/>
-                        </group>
-                        <group string="Move Information">
-                            <field name="name" string="Reason"/>
-                            <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                            <field name="product_uos" groups="product.group_uos" colspan="4"/>
-                        </group>
-                        <group string="Picking" name="picking">
-                            <field name="picking_id"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group string="Dates">
                             <field name="create_date" groups="base.group_no_one" />
                             <field name="date" groups="base.group_no_one" />
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+
                         </group>
-                        <group string="Traceability">
+                        <group>
                             <label for="tracking_id"/>
                             <div>
                                 <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_inline"/>
@@ -1418,16 +1427,13 @@
                             <field name="product_uos" groups="product.group_uos"/>
                         </div>
                         <field name="name" string="Reason"/>
-                    </group><group>
+                    </group>
+                    <group>
+                        <field name="picking_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
                         <field name="partner_id"/>
-                    </group>
-                    <group name="picking">
-                        <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <group>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
diff --git a/addons/subscription/i18n/ja.po b/addons/subscription/i18n/ja.po
new file mode 100644
index 00000000000..cd6abc3b64f
--- /dev/null
+++ b/addons/subscription/i18n/ja.po
@@ -0,0 +1,310 @@
+# 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-16 21:20+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: subscription
+#: field:subscription.subscription,doc_source:0
+#: field:subscription.subscription.history,document_id:0
+msgid "Source Document"
+msgstr "元となるドキュメント"
+
+#. module: subscription
+#: field:subscription.document,model:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "This Week"
+msgstr "今週"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Search Subscription"
+msgstr "サブスクリプションの検索"
+
+#. module: subscription
+#: field:subscription.subscription,date_init:0
+msgid "First Date"
+msgstr "初回日"
+
+#. module: subscription
+#: field:subscription.document.fields,field:0
+msgid "Field"
+msgstr "項目"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription_history
+msgid "Subscription history"
+msgstr "サブスクリプションの履歴"
+
+#. module: subscription
+#: selection:subscription.subscription,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "Current Date"
+msgstr "現在の日付"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Weeks"
+msgstr "週"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Today"
+msgstr "本日"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:136
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_subscription_form
+#: model:ir.ui.menu,name:subscription.menu_action_subscription_form
+#: view:subscription.subscription:0
+msgid "Subscriptions"
+msgstr "サブスクリプション"
+
+#. module: subscription
+#: field:subscription.subscription,interval_number:0
+msgid "Interval Qty"
+msgstr "間隔の量"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Stop"
+msgstr "停止"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Running"
+msgstr "期間中"
+
+#. module: subscription
+#: view:subscription.subscription.history:0
+msgid "Subscription History"
+msgstr "サブスクリプション履歴"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: subscription
+#: field:subscription.subscription,interval_type:0
+msgid "Interval Unit"
+msgstr "間隔の単位"
+
+#. module: subscription
+#: field:subscription.subscription.history,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: subscription
+#: field:subscription.subscription,exec_init:0
+msgid "Number of documents"
+msgstr "ドキュメントの数"
+
+#. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr "アクティブ項目をFalseにセットすると、サブスクリプションドキュメントは削除することなく非表示にできます。"
+
+#. module: subscription
+#: field:subscription.document,name:0
+#: field:subscription.subscription,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:136
+#, python-format
+msgid "You cannot delete an active subscription !"
+msgstr "アクティブなサブスクリプションを削除できません。"
+
+#. module: subscription
+#: field:subscription.document,field_ids:0
+msgid "Fields"
+msgstr "項目"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,note:0
+#: field:subscription.subscription,notes:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Months"
+msgstr "月"
+
+#. module: subscription
+#: selection:subscription.subscription,interval_type:0
+msgid "Days"
+msgstr "日"
+
+#. module: subscription
+#: field:subscription.document,active:0
+#: field:subscription.subscription,active:0
+msgid "Active"
+msgstr "アクティブ"
+
+#. module: subscription
+#: field:subscription.subscription,cron_id:0
+msgid "Cron Job"
+msgstr "Cronジョブ"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_subscription
+#: field:subscription.subscription.history,subscription_id:0
+msgid "Subscription"
+msgstr "サブスクリプション"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: subscription
+#: help:subscription.subscription,cron_id:0
+msgid "Scheduler which runs on subscription"
+msgstr "サブスクリプション上で実行中のスケジューラ"
+
+#. module: subscription
+#: model:ir.ui.menu,name:subscription.config_recuuring_event
+#: model:ir.ui.menu,name:subscription.next_id_45
+msgid "Recurring Events"
+msgstr "定期的イベント"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Subsription Data"
+msgstr "サブスクリプションデータ"
+
+#. module: subscription
+#: help:subscription.subscription,note:0
+msgid "Description or Summary of Subscription"
+msgstr "サブスクリプションの詳細または要約"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document
+#: view:subscription.document:0
+#: field:subscription.document.fields,document_id:0
+msgid "Subscription Document"
+msgstr "サブスクリプションドキュメント"
+
+#. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr "アクティブ項目をFalseにセットすると、サブスクリプションを削除することなく非表示にできます。"
+
+#. module: subscription
+#: help:subscription.document.fields,value:0
+msgid "Default value is considered for field when new document is generated."
+msgstr "新規ドキュメントが生成された時にデフォルトの値が項目にセットされます。"
+
+#. module: subscription
+#: selection:subscription.document.fields,value:0
+msgid "False"
+msgstr ""
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: subscription
+#: view:subscription.subscription:0
+msgid "Process"
+msgstr "処理"
+
+#. module: subscription
+#: help:subscription.subscription,doc_source:0
+msgid ""
+"User can choose the source document on which he wants to create documents"
+msgstr "ユーザは作成したいドキュメントの元となるドキュメントを選択できます。"
+
+#. module: subscription
+#: model:ir.actions.act_window,name:subscription.action_document_form
+#: model:ir.ui.menu,name:subscription.menu_action_document_form
+msgid "Document Types"
+msgstr "ドキュメントタイプ"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:109
+#, python-format
+msgid "Wrong Source Document !"
+msgstr "元となるドキュメントが誤っています。"
+
+#. module: subscription
+#: model:ir.model,name:subscription.model_subscription_document_fields
+#: view:subscription.document.fields:0
+msgid "Subscription Document Fields"
+msgstr "サブスクリプションドキュメント項目"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: selection:subscription.subscription,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: subscription
+#: code:addons/subscription/subscription.py:109
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"他の元となるドキュメントを提供して下さい。\n"
+"これは存在しません。"
+
+#. module: subscription
+#: field:subscription.document.fields,value:0
+msgid "Default Value"
+msgstr "デフォルト値"
+
+#. module: subscription
+#: view:subscription.subscription:0
+#: field:subscription.subscription,doc_lines:0
+msgid "Documents created"
+msgstr "ドキュメントは作成されました。"
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 86380e98037..8c7fabca427 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -358,7 +358,7 @@ class survey_question_wiz(osv.osv_memory):
                     fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
                     etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
                     etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
-
+                    
                     if pre_button:
                         etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"
@@ -450,6 +450,7 @@ class survey_question_wiz(osv.osv_memory):
             
             # hr.applicant: if survey answered directly in system: attach report to applicant
             if context.get('active_model') == 'hr.applicant':
+                self.pool.get('hr.applicant').write(cr,uid,[context.get('active_ids')[0]],{'response':context.get('response_id')})
                 result = base64.b64encode(result)
                 file_name = file_name + '.pdf'
                 ir_attachment = self.pool.get('ir.attachment').create(cr, uid, 
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 004ed043ab6..162e820c059 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -5,13 +5,12 @@
         <!--
             Survey Question Wizard
          -->
-
         <record id="view_survey_question_message" model="ir.ui.view">
-            <field name="name">Survey Question</field>
+            <field name="name">Answer Survey</field>
             <field name="model">survey.question.wiz</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Your Messages" version="7.0">
+                <form string="Your Messages"  version="7.0">
                     <field name="name" nolabel="1" colspan="4" />
                 </form>
             </field>
@@ -29,7 +28,7 @@
         </record>
 
         <record id="action_view_survey_question_message" model="ir.actions.act_window">
-            <field name="name">Survey Question</field>
+            <field name="name">Answer Survey</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">survey.question.wiz</field>
             <field name="view_type">form</field>
@@ -37,6 +36,5 @@
             <field name="target">new</field>
         </record>
 
-
     </data>
 </openerp>
diff --git a/addons/users_ldap/i18n/ja.po b/addons/users_ldap/i18n/ja.po
new file mode 100644
index 00000000000..79bdcb4ef59
--- /dev/null
+++ b/addons/users_ldap/i18n/ja.po
@@ -0,0 +1,178 @@
+# 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-16 22:21+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+"LDAPサーバへの接続時に安全なTLS/SSL暗号化を要求します。このオプションはサーバがSTARTTLSが使用可能であることを要求します。そうでない場合"
+"は全ての認証要求は失敗します。"
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP設定"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAPバインディング"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "データベースにない場合、ユーザを作成します。"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "ユーザ作成のために使用するモデル"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "会社"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAPサーバアドレス"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAPサーバポート"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr "LDAPサーバ上のユーザアカウントはディレクトリへのクエリーのために使用されます。匿名接続する場合は空のままにして下さい。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAPベース"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "ユーザー情報"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "処理パラメータ"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "TLS を使用"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "ログイン情報"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "サーバー情報"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "LDAPサーバの設定"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは２つのユーザを持てません。"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAPパラメータ"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr "LDAPサーバのユーザアカウントのパスワードはディレクトリへのクエリー使用されます。"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAPパスワード"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "モデルユーザ"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAPフィルタ"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "ユーザの作成"
diff --git a/addons/warning/i18n/ja.po b/addons/warning/i18n/ja.po
new file mode 100644
index 00000000000..f736f73ba5b
--- /dev/null
+++ b/addons/warning/i18n/ja.po
@@ -0,0 +1,242 @@
+# 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-16 21:49+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr "発注オーダー行"
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sale Order Line"
+msgstr "受注オーダー行のためのメッセージ"
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr "発注オーダー行のためのメッセージ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr "集荷リスト"
+
+#. module: warning
+#: field:product.product,sale_line_warn:0
+msgid "Sale Order Line"
+msgstr "受注オーダー行"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr "この製品の支払時に警告"
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr "製品"
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr "警告"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr "警告"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr "メッセージをブロック"
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr "在庫集荷"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr "請求書上の警告"
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr "メッセージなし"
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr "この製品の販売時に警告"
+
+#. module: warning
+#: field:res.partner,sale_warn:0
+msgid "Sale Order"
+msgstr "受注オーダー"
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr "請求書のためのメッセージ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr "発注オーダー"
+
+#. module: warning
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sale Order"
+msgstr "受注オーダーのためのメッセージ"
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr "発注オーダーのためのメッセージ"
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+"警告オプションを選択するとユーザにメッセージを通知します。メッセージをブロックを選択するとメッセージとともに例外が発生しその流れがブロックされます。メッセ"
+"ージは次の項目で記述する必要があります。"
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
+#, python-format
+msgid "Alert for %s !"
+msgstr "%s の注意です。"
+
+#. module: warning
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "請求書番号は会社ごとに固有である必要があります。"
+
+#. module: warning
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
+
+#. module: warning
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr "集荷時に警告"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr "発注オーダー時に警告"
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
+#, python-format
+msgid "Warning for %s"
+msgstr "%s の警告です。"
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sale Order"
+msgstr "受注オーダー時に警告"
+
+#. module: warning
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr "在庫集荷のためのメッセージ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
diff --git a/addons/web_livechat/i18n/ja.po b/addons/web_livechat/i18n/ja.po
new file mode 100644
index 00000000000..1c50534b3ab
--- /dev/null
+++ b/addons/web_livechat/i18n/ja.po
@@ -0,0 +1,28 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-16 21:21+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: web_livechat
+#: sql_constraint:publisher_warranty.contract:0
+msgid "That contract is already registered in the system."
+msgstr "この契約は既にシステムに登録されています。"
+
+#. module: web_livechat
+#: model:ir.model,name:web_livechat.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
diff --git a/addons/wiki/i18n/ja.po b/addons/wiki/i18n/ja.po
new file mode 100644
index 00000000000..97728365f6d
--- /dev/null
+++ b/addons/wiki/i18n/ja.po
@@ -0,0 +1,438 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-16 05:47+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: wiki
+#: field:wiki.groups,template:0
+msgid "Wiki Template"
+msgstr "Wikiテンプレート"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
+msgid "Wiki Pages"
+msgstr "Wikiページ"
+
+#. module: wiki
+#: field:wiki.groups,method:0
+msgid "Display Method"
+msgstr "表示方法"
+
+#. module: wiki
+#: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
+msgid "Author"
+msgstr "著者"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
+#: view:wiki.wiki.page.open:0
+msgid "Open Page"
+msgstr "ページを開く"
+
+#. module: wiki
+#: field:wiki.groups,menu_id:0
+msgid "Menu"
+msgstr "メニュー"
+
+#. module: wiki
+#: field:wiki.wiki,section:0
+msgid "Section"
+msgstr "セクション"
+
+#. module: wiki
+#: help:wiki.wiki,toc:0
+msgid "Indicates that this pages have a table of contents or not"
+msgstr "このページは目次を持つかどうかを表します。"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
+msgid "Wiki History"
+msgstr "Wiki履歴"
+
+#. module: wiki
+#: field:wiki.wiki,minor_edit:0
+msgid "Minor edit"
+msgstr "細部の編集"
+
+#. module: wiki
+#: view:wiki.wiki:0 field:wiki.wiki,text_area:0
+msgid "Content"
+msgstr "コンテンツ"
+
+#. module: wiki
+#: field:wiki.wiki,child_ids:0
+msgid "Child Pages"
+msgstr "子ページ"
+
+#. module: wiki
+#: field:wiki.wiki,parent_id:0
+msgid "Parent Page"
+msgstr "親ページ"
+
+#. module: wiki
+#: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
+msgid "Last Contributor"
+msgstr "最終貢献者"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "親メニュー"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_make_index.py:52
+#, python-format
+msgid "There is no section in this Page"
+msgstr "このページにセクションがありません。"
+
+#. module: wiki
+#: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
+msgid "Wiki Group"
+msgstr "Wikiグループ"
+
+#. module: wiki
+#: field:wiki.wiki,name:0
+msgid "Title"
+msgstr "タイトル"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_create_menu
+msgid "Wizard Create Menu"
+msgstr "メニュー作成ウィザード"
+
+#. module: wiki
+#: field:wiki.wiki,history_id:0
+msgid "History Lines"
+msgstr "履歴行"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Page Content"
+msgstr "ページコンテンツ"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: wiki
+#: code:addons/wiki/wiki.py:237
+#, python-format
+msgid "There are no changes in revisions"
+msgstr "リビジョンの変更はありません。"
+
+#. module: wiki
+#: help:wiki.wiki,section:0
+msgid "Use page section code like 1.2.1"
+msgstr "1.2.1のようなページセクションコードを使用します。"
+
+#. module: wiki
+#: field:wiki.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr "メニュー名"
+
+#. module: wiki
+#: field:wiki.groups,notes:0
+msgid "Description"
+msgstr "説明"
+
+#. module: wiki
+#: field:wiki.wiki,review:0
+msgid "Needs Review"
+msgstr "要レビュー"
+
+#. module: wiki
+#: help:wiki.wiki,review:0
+msgid ""
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
+msgstr "他の貢献者の関心を高めて、このページはレビューされる必要があることを示しています。"
+
+#. module: wiki
+#: view:wiki.create.menu:0 view:wiki.make.index:0
+msgid "Menu Information"
+msgstr "メニュー情報"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
+msgid "Page History"
+msgstr "ページ履歴"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "Tree"
+msgstr "ツリー"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Page Template"
+msgstr "ページテンプレート"
+
+#. module: wiki
+#: field:wiki.wiki,tags:0
+msgid "Keywords"
+msgstr "キーワード"
+
+#. module: wiki
+#: model:ir.actions.act_window,help:wiki.action_wiki
+msgid ""
+"With Wiki Pages you can share ideas and questions with your coworkers. You "
+"can create a new document that can be linked to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
+msgstr ""
+"Wikiページで同僚とアイディアや疑問を共有することができます。ひとつまたは幾つかのアプリケーション（CRM、販売など）とリンクさせる新しいドキュメントを"
+"作成できます。Wikiページにアクセスを簡単にするためのキーワードを使用することができます。テキスト形式の基本Wiki編集機能があります。"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: wiki
+#: help:wiki.groups,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr "表示方法がホームページの時はホームページの選択が要求されます。"
+
+#. module: wiki
+#: field:wiki.wiki.history,create_date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: wiki
+#: view:wiki.make.index:0
+msgid "Want to create a Index on Selected Pages ? "
+msgstr "選択ぺーじにインデックスを作成しますか？ "
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
+#: view:wizard.wiki.history.show_diff:0
+msgid "Difference"
+msgstr "差分"
+
+#. module: wiki
+#: field:wiki.groups,page_ids:0
+msgid "Pages"
+msgstr "ページ"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Group Description"
+msgstr "グループの説明"
+
+#. module: wiki
+#: view:wiki.wiki.page.open:0
+msgid "Want to open a wiki page? "
+msgstr "Wikiページを開きますか？ "
+
+#. module: wiki
+#: field:wiki.groups,section:0
+msgid "Make Section ?"
+msgstr "セクションを作りますか？"
+
+#. module: wiki
+#: field:wiki.wiki.history,text_area:0
+msgid "Text area"
+msgstr "テキストエリア"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Meta Information"
+msgstr "メタ情報"
+
+#. module: wiki
+#: field:wiki.wiki,create_date:0
+msgid "Created on"
+msgstr "作成日"
+
+#. module: wiki
+#: view:wiki.groups:0 view:wizard.wiki.history.show_diff:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: wiki
+#: selection:wiki.groups,method:0
+msgid "List"
+msgstr "リスト"
+
+#. module: wiki
+#: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: wiki
+#: field:wiki.groups,create_date:0
+msgid "Created Date"
+msgstr "作成日"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_history
+msgid "All Page Histories"
+msgstr "全ページの履歴"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki
+msgid "wiki.wiki"
+msgstr ""
+
+#. module: wiki
+#: help:wiki.groups,method:0
+msgid "Define the default behaviour of the menu created on this group"
+msgstr "このグループに作成されたメニューのデフォルトの振る舞いを定義します。"
+
+#. module: wiki
+#: view:wizard.wiki.history.show_diff:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
+msgid "wizard.wiki.history.show_diff"
+msgstr ""
+
+#. module: wiki
+#: field:wiki.wiki.history,wiki_id:0
+msgid "Wiki Id"
+msgstr "Wiki ID"
+
+#. module: wiki
+#: field:wiki.groups,home:0 selection:wiki.groups,method:0
+msgid "Home Page"
+msgstr "ホームページ"
+
+#. module: wiki
+#: help:wiki.wiki,parent_id:0
+msgid "Allows you to link with the other page with in the current topic"
+msgstr "現在のトピックで　他のページにリンクすることができます。"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Modification Information"
+msgstr "変更情報"
+
+#. module: wiki
+#: help:wiki.wiki,group_id:0
+msgid "Topic, also called Wiki Group"
+msgstr "トピックはWikiグループとも呼ばれます。"
+
+#. module: wiki
+#: model:ir.ui.menu,name:wiki.menu_wiki_configuration view:wiki.wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: wiki
+#: field:wiki.wiki,write_date:0
+msgid "Modification Date"
+msgstr "変更日"
+
+#. module: wiki
+#: view:wiki.groups:0
+msgid "Configuration"
+msgstr "設定"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
+#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
+#: model:ir.model,name:wiki.model_wiki_make_index view:wiki.make.index:0
+msgid "Create Index"
+msgstr "インデックスを作成"
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
+#, python-format
+msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgstr "最低１つまたは２つの履歴リビジョンを選択する必要があります。"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
+#: view:wiki.create.menu:0 view:wiki.groups:0 view:wiki.make.index:0
+msgid "Create Menu"
+msgstr "メニューの作成"
+
+#. module: wiki
+#: field:wiki.wiki.history,minor_edit:0
+msgid "This is a major edit ?"
+msgstr "これは主要な編集ですか？"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups
+#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
+#: model:ir.model,name:wiki.model_wiki_groups
+#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups view:wiki.groups:0
+msgid "Wiki Groups"
+msgstr "Wikiグループ"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Topic"
+msgstr "トピック"
+
+#. module: wiki
+#: field:wiki.wiki.history,write_uid:0
+msgid "Modify By"
+msgstr "変更者"
+
+#. module: wiki
+#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
+#: field:wiki.wiki,toc:0
+#, python-format
+msgid "Table of Contents"
+msgstr "目次"
+
+#. module: wiki
+#: view:wiki.groups:0 view:wiki.wiki.page.open:0
+msgid "Open Wiki Page"
+msgstr "Wikiページを開く"
+
+#. module: wiki
+#: model:ir.model,name:wiki.model_wiki_wiki_page_open
+msgid "wiz open page"
+msgstr "ページを開くウィザード"
+
+#. module: wiki
+#: view:wiki.create.menu:0 view:wiki.make.index:0 view:wiki.wiki.page.open:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: wiki
+#: field:wizard.wiki.history.show_diff,file_path:0
+msgid "Diff"
+msgstr "差分"
+
+#. module: wiki
+#: view:wiki.wiki:0
+msgid "Need Review"
+msgstr "要レビュー"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.action_wiki_review
+msgid "Pages Waiting Review"
+msgstr "レビュー待ちページ"
+
+#. module: wiki
+#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
+msgid "Search Page"
+msgstr "ページの検索"
diff --git a/addons/wiki_faq/i18n/ja.po b/addons/wiki_faq/i18n/ja.po
new file mode 100644
index 00000000000..ac15d84c27f
--- /dev/null
+++ b/addons/wiki_faq/i18n/ja.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2012-06-16 05:48+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"このモジュールはWiki FAQテンプレートを提供します。\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "ドキュメント管理 - Wiki - FAQ"
diff --git a/addons/wiki_quality_manual/i18n/ja.po b/addons/wiki_quality_manual/i18n/ja.po
new file mode 100644
index 00000000000..5d8e984575a
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/ja.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2012-06-16 05:49+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-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+"品質マニュアルのテンプレート\n"
+"    "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "ドキュメント管理 - Wiki - 品質マニュアル"
diff --git a/addons/wiki_sale_faq/i18n/ja.po b/addons/wiki_sale_faq/i18n/ja.po
new file mode 100644
index 00000000000..b9c15b4d987
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/ja.po
@@ -0,0 +1,62 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-16 06:04+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid ""
+"Wiki pages allow you to share ideas and questions with coworkers. You can "
+"create a new document that can be linked to one or several applications "
+"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
+"used to easily tag wiki pages. You should use this application with the "
+"OpenERP web client interface."
+msgstr ""
+"Wikiページは同僚とアイディアを疑問を共有できます。１つまたは幾つかのアプリケーション（プロジェクトの仕様、販売チームのFAQなど）にリンクすることがで"
+"きる新しいドキュメントを作成できます。キーワードはWikiページに簡単にタグをつけるために使用できます。OpenERP "
+"Webクライアントインタフェースとともにこのアプリケーションを使うべきです。"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid ""
+"Documents give you access to all files attached to any record. It is a "
+"repository of all documents such as emails, project-related attachments or "
+"any other documents. From this view, you can search through the content of "
+"the documents. OpenERP automatically assign meta data based on the record "
+"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
+"and .PDF documents."
+msgstr ""
+"ドキュメントは任意のレコードに添付されている全てのファイルにアクセスできます。Eメール、プロジェクトに関連する添付物、そのほかのドキュメントなどの全てのド"
+"キュメントの貯蔵庫です。このビューからドキュメントのコンテンツを検索できます。OpenERPは自動的に関連したパートナや "
+".DOC、.ODT、.TXT、.SXW、.PDFドキュメントのコンテンツのインデックスのようなレコードを基準としたメタデータを割り当てます。"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr "ドキュメント"
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr "FAQ"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr "Wikiページ"