From 986a1dbdbf2793ba0d205d6feaf730d0bbafbc0c Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 18 Mar 2010 23:44:32 +0100
Subject: [PATCH 01/15] [FIX] Fixed comma and colon in workflow string
 generation.

bzr revid: jth@openerp.com-20100318224432-w0t81ok5hh3fdlla
---
 addons/base_module_record/base_module_record.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index e80a43ad1c8..8f69d082f26 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -447,7 +447,7 @@ class workflow(yaml.YAMLObject):
         self.ref = ref
         self.action=action
     def __repr__(self):
-        return '!workflow {model: %s, action: %s ref: %s}:' % (str(self.model,), str(self.action,), str(self.ref,))
+        return '!workflow {model: %s, action: %s, ref: %s}' % (str(self.model,), str(self.action,), str(self.ref,))
         
 class ref(yaml.YAMLObject):
     yaml_tag = u'!ref'

From 9881a90a9f95cf2ea060e3aeee7eb65b6a22762e Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Fri, 19 Mar 2010 09:53:34 +0530
Subject: [PATCH 02/15] [FIX] hr_evaluation: Mission date file on terp

bzr revid: mra@tinyerp.com-20100319042334-hnl0cafhievtrylh
---
 addons/hr_evaluation/__terp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__terp__.py
index 26b71c795c8..6472bc80496 100644
--- a/addons/hr_evaluation/__terp__.py
+++ b/addons/hr_evaluation/__terp__.py
@@ -32,7 +32,6 @@
     "update_xml" : [
                     "security/ir.model.access.csv",
                     "hr_evaluation_view.xml",
-                    "hr_evaluation_data.xml",
                     "report/hr_evaluation_report_view.xml"],
     "active": False,
     "installable": True

From 92f3fde4ac487e3add2e553c9d4769eb210d7366 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 19 Mar 2010 11:35:37 +0530
Subject: [PATCH 03/15] [FIX] CRM : Meeting View had additional state field

lp bug: https://launchpad.net/bugs/541456 fixed

bzr revid: jvo@tinyerp.com-20100319060537-1ph9utsglcr26gh8
---
 addons/crm/crm_meeting_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a1f1cef502e..8161b504306 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -148,8 +148,7 @@
                                         <field name="rsvp" select="1" />
                                         <field name="cutype" select="1" />
                                         <field name="role" select="1" />
-                                        <separator colspan="4" string="" />
-                                        <field name="state" />
+                                        <separator colspan="4" string=""/>
                                         <group col="6" colspan="4">
                                             <field name="state" select="2" />
                                             <button name="do_tentative" states="needs-action,declined,accepted"

From 3d93d77e6efea8931714bb3570d4885cd37b784e Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 19 Mar 2010 07:50:27 +0000
Subject: [PATCH 04/15] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100319075002-jgh9fqg4aw3z9t05
bzr revid: codehost@crowberry-20100319075027-6u0v2tzqayb3uguj
---
 addons/account/i18n/fi.po            |   6 +-
 addons/account_balance/i18n/pt_BR.po |   2 +-
 addons/point_of_sale/i18n/zh_CN.po   |  60 +++++++--------
 addons/project_gtd/i18n/pt_BR.po     | 110 +++++++++++++--------------
 addons/report_document/i18n/it.po    |  26 +++----
 addons/sale/i18n/it.po               |   6 +-
 addons/sale_journal/i18n/it.po       |   8 +-
 addons/subscription/i18n/zh_CN.po    |  38 ++++-----
 bin/addons/base/i18n/et.po           |  19 ++---
 bin/addons/base/i18n/hr.po           |   4 +-
 bin/addons/base/i18n/ja.po           |   4 +-
 bin/addons/base/i18n/sv.po           |   4 +-
 bin/addons/base/i18n/uk.po           |   4 +-
 bin/addons/base/i18n/zh_CN.po        |   4 +-
 14 files changed, 148 insertions(+), 147 deletions(-)

diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 26a51ff5469..c26e1b0416a 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-16 13:30+0000\n"
+"PO-Revision-Date: 2010-03-18 14:20+0000\n"
 "Last-Translator: Henri Kovalainen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4928,7 +4928,7 @@ msgstr "Tili sovittelu"
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr "Hyväksy"
+msgstr "Vahvista"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
diff --git a/addons/account_balance/i18n/pt_BR.po b/addons/account_balance/i18n/pt_BR.po
index ed13516eb17..b1db3930d94 100644
--- a/addons/account_balance/i18n/pt_BR.po
+++ b/addons/account_balance/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 5b8f754901a..13ef9e5738e 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-07 08:31+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-18 11:01+0000\n"
+"Last-Translator: 冯超 <rainofchaos@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -605,7 +605,7 @@ msgstr "添加商品（_A）"
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid ":"
-msgstr ""
+msgstr "："
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -681,7 +681,7 @@ msgstr "折扣百分比"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
 msgid "Receipt"
-msgstr ""
+msgstr "收据"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
@@ -766,12 +766,12 @@ msgstr ""
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "总折扣"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "新建发票"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
@@ -792,14 +792,14 @@ msgstr ""
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr ""
+msgstr "总计"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,product:0
 #: rml:pos.details:0
 #: field:pos.order.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -818,27 +818,27 @@ msgstr ""
 #. module: point_of_sale
 #: wizard_field:pos.scan_product,init,gencod:0
 msgid "Barcode"
-msgstr ""
+msgstr "条形码"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "已取消发票"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr ""
+msgstr "销售点"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr ""
+msgstr "销售单明细"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "电话："
 
 #. module: point_of_sale
 #: field:pos.payment,payment_nb:0
@@ -854,37 +854,37 @@ msgstr ""
 #: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3
 msgid "All orders"
-msgstr ""
+msgstr "全部订单"
 
 #. module: point_of_sale
 #: wizard_field:pos.sale.get,init,picking_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
 msgid "Sales of the month"
-msgstr ""
+msgstr "当月销售"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "D_iscount"
-msgstr ""
+msgstr "折扣（_D）"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "订购日期"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Payments"
-msgstr ""
+msgstr "付款"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -898,7 +898,7 @@ msgstr ""
 #: field:pos.payment,name:0
 #: rml:pos.receipt:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -909,7 +909,7 @@ msgstr ""
 #: wizard_field:pos.payment,ask_pay,payment_id:0
 #: field:pos.payment,payment_id:0
 msgid "Payment Term"
-msgstr ""
+msgstr "付款条件"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -917,12 +917,12 @@ msgstr ""
 #: wizard_field:pos.payment,ask_pay,amount:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "数量"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Actions"
-msgstr ""
+msgstr "动作"
 
 #. module: point_of_sale
 #: help:pos.order,salesman_id:0
@@ -939,18 +939,18 @@ msgstr ""
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Print Date:"
-msgstr ""
+msgstr "打印时间："
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Company:"
-msgstr ""
+msgstr "公司："
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Print Date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
@@ -961,7 +961,7 @@ msgstr ""
 #: rml:pos.lines:0
 #: field:pos.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "总计"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -969,4 +969,4 @@ msgstr ""
 #: rml:pos.lines:0
 #: rml:pos.receipt:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index edb66f96648..6b0ce3e9ecd 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:25+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-19 01:52+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Visible Columns"
-msgstr ""
+msgstr "Colunas visíveis"
 
 #. module: project_gtd
 #: constraint:ir.model:0
@@ -32,22 +32,22 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
 msgid "project.gtd.timebox"
-msgstr ""
+msgstr "project.gtd.timebox"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
 msgid "My Deadlines"
-msgstr ""
+msgstr "Meus Prazos Finais"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensalmente"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,parent_id:0
 msgid "Parent Timebox"
-msgstr ""
+msgstr "Período de tempo pai"
 
 #. module: project_gtd
 #: constraint:ir.ui.view:0
@@ -57,205 +57,205 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,task_ids:0
 msgid "Tasks selection"
-msgstr ""
+msgstr "Seleção de tarefas"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioridade"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_inbox
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_myinbox
 msgid "My Inbox"
-msgstr ""
+msgstr "Minhas tarefas"
 
 #. module: project_gtd
 #: field:project.gtd.context,project_default_id:0
 msgid "Default Project"
-msgstr ""
+msgstr "Projeto Padrão"
 
 #. module: project_gtd
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context4_id:0
 msgid "Context 4"
-msgstr ""
+msgstr "Contexto 4"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
 msgid "Set to Timebox"
-msgstr ""
+msgstr "Definir um período"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_task_inbox
 msgid "Inbox Tasks"
-msgstr ""
+msgstr "Caixa de tarefas"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 #: field:project.gtd.timebox,name:0
 #: field:project.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "Período de tempo"
 
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "Pegando coisas feitas - Módulo de administração de tempo"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
 msgid "Timebox Tasks"
-msgstr ""
+msgstr "Tarefas do período"
 
 #. module: project_gtd
 #: wizard_view:project.gtd.timebox.fill,init:0
 msgid "Timebox tasks selection"
-msgstr ""
+msgstr "Seleção de tarefas do período"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_effective_hours:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Horas efetivas"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty
 msgid "Empty Timebox"
-msgstr ""
+msgstr "Período vazio"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
 msgid "My Pending Tasks"
-msgstr ""
+msgstr "Minhas Tarefas Pendentes"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr ""
+msgstr "Definição do período"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_daily
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_daily_inbox
 msgid "My Daily Timebox"
-msgstr ""
+msgstr "Meu período diário"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
 msgid "project.gtd.context"
-msgstr ""
+msgstr "project.gtd.context"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context1_id:0
 msgid "Context 1"
-msgstr ""
+msgstr "Contexto 1"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context2_id:0
 msgid "Context 2"
-msgstr ""
+msgstr "Contexto 2"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context3_id:0
 msgid "Context 3"
-msgstr ""
+msgstr "Contexto 3"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,process:0
 msgid "Add to Timebox"
-msgstr ""
+msgstr "Adicionar ao período"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context5_id:0
 msgid "Context 5"
-msgstr ""
+msgstr "Contexto 5"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context6_id:0
 msgid "Context 6"
-msgstr ""
+msgstr "Contexto 6"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
 #: view:project.gtd.timebox:0
 msgid "Contexts"
-msgstr ""
+msgstr "Contextos"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Daily"
-msgstr ""
+msgstr "Diário"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_fill
 msgid "Plannify Timebox"
-msgstr ""
+msgstr "Período planejado"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_project:0
 msgid "Project"
-msgstr ""
+msgstr "Projeto"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_all
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree_my
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_my_timeboxes
 msgid "My Timeboxes"
-msgstr ""
+msgstr "Meus períodos"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
 #: view:project.gtd.timebox:0
 msgid "Timeboxes"
-msgstr ""
+msgstr "Período de tempo"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planejado"
 
 #. module: project_gtd
 #: view:project.gtd.context:0
 #: field:project.gtd.context,name:0
 #: field:project.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "Contexto"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Minhas Tarefas Abertas"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
 #: model:ir.ui.menu,name:project_gtd.menu_open_time
 msgid "Time Management"
-msgstr ""
+msgstr "Administração de tempo"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Pegando coisas feitas(GTD)"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,task1_ids:0
@@ -272,44 +272,44 @@ msgstr "Tarefas"
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequencia"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,child_ids:0
 msgid "Child Timeboxes"
-msgstr ""
+msgstr "Períodos filhos"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_allinbox
 msgid "All My Timeboxes"
-msgstr ""
+msgstr "Todos os meus períodos"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Prazo final"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_id:0
 msgid "Get from Timebox"
-msgstr ""
+msgstr "Pegando do período"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Data de início"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Horas planejadas"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Semanalmente"
diff --git a/addons/report_document/i18n/it.po b/addons/report_document/i18n/it.po
index 89af5318e35..01a1828f6dc 100644
--- a/addons/report_document/i18n/it.po
+++ b/addons/report_document/i18n/it.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-16 16:02+0000\n"
-"Last-Translator: yoruk <yoruk87@gmail.com>\n"
+"PO-Revision-Date: 2010-03-18 08:30+0000\n"
+"Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
 #: field:report.document.user,create_date:0
 #: field:report.files.partner,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Data creazione"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
 msgid "Files Per Month"
-msgstr ""
+msgstr "File per mesi"
 
 #. module: report_document
 #: constraint:ir.model:0
@@ -45,7 +45,7 @@ msgstr "Muro della vergogna"
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Dettagli file per Partner"
 
 #. module: report_document
 #: field:report.document.file,file_size:0
@@ -57,7 +57,7 @@ msgstr "Dimensione file"
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
@@ -73,7 +73,7 @@ msgstr "I Miei File"
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "File per utenti"
 
 #. module: report_document
 #: view:report.document.user:0
@@ -83,17 +83,17 @@ msgstr "Files"
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "File per mesi"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr ""
+msgstr "I Miei file (Tutti i mesi)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr ""
+msgstr "Ultimo file inviato"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report
@@ -103,7 +103,7 @@ msgstr "Reportistica"
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Utenti che non inviano documenti da un mese"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
@@ -114,7 +114,7 @@ msgstr "Gestione Documentale"
 #: field:report.document.user,type:0
 #: field:report.files.partner,type:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Tipo Cartella"
 
 #. module: report_document
 #: view:report.files.partner:0
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index b12089576df..ee980674201 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-09 11:23+0000\n"
+"PO-Revision-Date: 2010-03-18 10:45+0000\n"
 "Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -650,7 +650,7 @@ msgstr "Stato Ordine"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
 msgid "Uninvoiced Lines"
-msgstr "RIghe non fatturate"
+msgstr "Righe non fatturate"
 
 #. module: sale
 #: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index d305a9f4997..f961b0fafab 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 11:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-18 10:48+0000\n"
+"Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -36,7 +36,7 @@ msgstr "assegnato"
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index fb0dd99e2a3..2b436638e7f 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 17:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-18 11:01+0000\n"
+"Last-Translator: 冯超 <rainofchaos@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -25,13 +25,13 @@ msgstr "源单据"
 #. module: subscription
 #: field:subscription.document,model:0
 msgid "Object"
-msgstr ""
+msgstr "对象"
 
 #. module: subscription
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -46,17 +46,17 @@ msgstr "字段名称"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
 msgid "Subscription history"
-msgstr ""
+msgstr "订阅历史记录"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "Current Date"
-msgstr ""
+msgstr "当前日期"
 
 #. module: subscription
 #: constraint:ir.actions.act_window:0
@@ -66,17 +66,17 @@ msgstr ""
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
-msgstr ""
+msgstr "周"
 
 #. module: subscription
 #: field:subscription.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 msgid "Subscription document fields"
-msgstr ""
+msgstr "订阅单据字段"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
@@ -102,7 +102,7 @@ msgstr ""
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "正在运行"
 
 #. module: subscription
 #: view:subscription.subscription.history:0
@@ -142,7 +142,7 @@ msgstr ""
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: subscription
 #: field:subscription.document,name:0
@@ -183,7 +183,7 @@ msgstr "活动的"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 msgid "Subscription document"
-msgstr ""
+msgstr "订阅单据"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -194,7 +194,7 @@ msgstr "定时作业"
 #: model:ir.model,name:subscription.model_subscription_subscription
 #: field:subscription.subscription.history,subscription_id:0
 msgid "Subscription"
-msgstr ""
+msgstr "订阅"
 
 #. module: subscription
 #: field:subscription.subscription,partner_id:0
@@ -226,7 +226,7 @@ msgstr "处理"
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
 #: model:ir.ui.menu,name:subscription.menu_action_subscription_form
 msgid "All Subscriptions"
-msgstr ""
+msgstr "所有订阅"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.next_id_45
@@ -248,12 +248,12 @@ msgstr "多次订货文档字段"
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: subscription
 #: field:subscription.document.fields,value:0
@@ -269,4 +269,4 @@ msgstr "文档已建立"
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "工具"
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index d4461213af4..e799c7d2187 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-16 05:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-03-18 11:18+0000\n"
+"Last-Translator: Tanel Kurvits <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-17 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -174,7 +174,7 @@ msgstr "ir.report.custom.fields"
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Otsi partnerit"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -574,7 +574,7 @@ msgstr "Papua Uus Guinea"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr "Elementaarne partner"
+msgstr "Elementaarne klient"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -584,7 +584,7 @@ msgstr ","
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "Minu partnerid"
 
 #. module: base
 #: model:res.country,name:base.es
@@ -1319,6 +1319,7 @@ msgstr "Kommertsperspektiiv"
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
 msgstr ""
+"Ei saanud genereerida järgmist id-d sest osadel partneritel on täheline id!"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3096,7 +3097,7 @@ msgstr "Sisemine kasutaja, kes vastutab selle partneriga suhtlemise eest."
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr ""
+msgstr "Ülem partner"
 
 #. module: base
 #: view:ir.module.module:0
@@ -6203,7 +6204,7 @@ msgstr "Algusaeg"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
 msgid "Gold Partner"
-msgstr "Kuldpartnerid"
+msgstr "Kuldpartner"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner
@@ -6402,7 +6403,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr ""
+msgstr "Teised partnerid"
 
 #. module: base
 #: view:ir.model:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 96d5ca04a71..cbd967f6bf0 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-17 05:13+0000\n"
+"PO-Revision-Date: 2010-03-18 04:57+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 22fb11fc66a..09a712e6589 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-17 05:14+0000\n"
+"PO-Revision-Date: 2010-03-18 04:55+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\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: 2010-03-18 04:33+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index ffafa36c6b0..3415c7fd6b4 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-17 05:09+0000\n"
+"PO-Revision-Date: 2010-03-18 04:58+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 55cbba030fc..97f5c876733 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-17 05:13+0000\n"
+"PO-Revision-Date: 2010-03-18 04:58+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 147fb54dc58..76d3525e164 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-17 05:11+0000\n"
+"PO-Revision-Date: 2010-03-18 04:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 2bca08ed03d6fc028926906e57d1ec7895341cad Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 19 Mar 2010 14:16:15 +0530
Subject: [PATCH 05/15] [FIX] MRP/Purchase : Seller delay has to be converted
 into integer for date calculations.

lp bug: https://launchpad.net/bugs/541006 fixed

bzr revid: jvo@tinyerp.com-20100319084615-8e9jovyuohatu97j
---
 addons/mrp/schedulers.py    | 2 +-
 addons/purchase/purchase.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 509d50b46b9..fb9b1edf6a8 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -197,7 +197,7 @@ class mrp_procurement(osv.osv):
                     if reste > 0:
                         qty += op.qty_multiple - reste
                     newdate = DateTime.now() + DateTime.RelativeDateTime(
-                            days=op.product_id.seller_delay)
+                            days=int(op.product_id.seller_delay))
                     if op.product_id.supply_method == 'buy':
                         location_id = op.warehouse_id.lot_input_id
                     elif op.product_id.supply_method == 'produce':
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f512406738b..887950bc746 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -522,7 +522,7 @@ class purchase_order_line(osv.osv):
                         'uom': uom,
                         'date': date_order,
                         })[pricelist]
-        dt = (datetime.now() + relativedelta(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
+        dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
 
 

From 63dd4cb226f073d138cf9a162eb958c3ca6149f6 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 19 Mar 2010 12:34:16 +0100
Subject: [PATCH 06/15] [IMP]	l10n_be: chart of account inmproved

bzr revid: qdp-launchpad@tinyerp.com-20100319113416-rxo0pxbct459mj8n
---
 addons/l10n_be/account_pcmn_belgium.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 8f45f3dd940..b2d5a405ee8 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -3084,35 +3084,35 @@
             <field ref="a41" name="parent_id"/>
         </record>
         <record id="a4110" model="account.account.template">
-            <field name="name">T.V.A. due</field>
+            <field name="name">T.V.A. déductible</field>
             <field name="code">4110</field>
             <field name="type">view</field>
             <field name="user_type" ref="user_type_view"/>
             <field ref="a411" name="parent_id"/>
         </record>
         <record id="vat_refund0" model="account.account.template">
-            <field name="name">T.V.A. due 0%</field>
+            <field name="name">T.V.A. déductible 0%</field>
             <field name="code">411000</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund06" model="account.account.template">
-            <field name="name">T.V.A. due 6%</field>
+            <field name="name">T.V.A. déductible 6%</field>
             <field name="code">4110001</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund12" model="account.account.template">
-            <field name="name">T.V.A. due 12%</field>
+            <field name="name">T.V.A. déductible 12%</field>
             <field name="code">4110002</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>
             <field ref="a4110" name="parent_id"/>
         </record>
         <record id="vat_refund21" model="account.account.template">
-            <field name="name">T.V.A. due 21%</field>
+            <field name="name">T.V.A. déductible 21%</field>
             <field name="code">4110003</field>
             <field name="type">other</field>
             <field name="user_type" ref="user_type_tax"/>

From c569b8ae58f10474307086c119904f6aaa7dd51e Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Fri, 19 Mar 2010 18:52:00 +0530
Subject: [PATCH 07/15] FIX reference field support browse in property field

bzr revid: hda@tinyerp.com-20100319132200-17wgnm4ljn3lafsc
---
 bin/osv/fields.py |  2 +-
 bin/osv/orm.py    | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 475c3234705..bbe21b9a321 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -921,7 +921,7 @@ class property(function):
             res[id] = default_val
         for prop in property.browse(cr, uid, nids):
             if prop.value.find(',') >= 0:
-                res[int(prop.res_id.split(',')[1])] = (prop.value and \
+                res[int(prop.res_id.id)] = (prop.value and \
                         int(prop.value.split(',')[1])) or False
             else:
                 res[int(prop.res_id.split(',')[1])] = prop.value or ''
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c580474b8b9..165b9a21137 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -249,11 +249,14 @@ class browse_record(object):
                         new_data[n] = self._list_class([browse_record(self._cr, self._uid, id, self._table.pool.get(f._obj), self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process) for id in data[n]], self._context)
                     elif f._type in ('reference'):
                         if data[n]:
-                            ref_obj, ref_id = data[n].split(',')
-                            ref_id = long(ref_id)
-                            obj = self._table.pool.get(ref_obj)
-                            compids = False
-                            new_data[n] = browse_record(self._cr, self._uid, ref_id, obj, self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process)
+                            if isinstance(data[n], browse_record):
+                                new_data[n] = data[n]    
+                            else:
+                                ref_obj, ref_id = data[n].split(',')
+                                ref_id = long(ref_id)
+                                obj = self._table.pool.get(ref_obj)
+                                compids = False
+                                new_data[n] = browse_record(self._cr, self._uid, ref_id, obj, self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process)
                         else:
                             new_data[n] = browse_null()
                     else:

From c4a4cebdd258a97414158eae4b21e31e4b6c2848 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sun, 21 Mar 2010 04:43:06 +0000
Subject: [PATCH 08/15] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100321044306-wlt0ryirr2s3wrc1
---
 addons/account/i18n/zh_CN.po                  |  548 ++++---
 addons/account_analytic_analysis/i18n/et.po   |    8 +-
 .../account_analytic_analysis/i18n/zh_CN.po   |  108 +-
 addons/account_analytic_default/i18n/oc.po    |  115 ++
 addons/account_analytic_default/i18n/zh_CN.po |   38 +-
 addons/account_analytic_plans/i18n/zh_CN.po   |  157 +-
 addons/account_balance/i18n/zh_CN.po          |  112 +-
 addons/account_budget/i18n/zh_CN.po           |  144 +-
 addons/account_chart/i18n/zh_CN.po            |   13 +-
 addons/account_date_check/i18n/zh_CN.po       |   35 +-
 addons/account_followup/i18n/zh_CN.po         |  228 ++-
 addons/account_invoice_layout/i18n/zh_CN.po   |  147 +-
 addons/account_payment/i18n/zh_CN.po          |  237 +--
 addons/account_report/i18n/zh_CN.po           |  158 +-
 addons/account_reporting/i18n/zh_CN.po        |   77 +-
 addons/account_tax_include/i18n/zh_CN.po      |   33 +-
 addons/account_voucher/i18n/zh_CN.po          |  194 +--
 .../i18n/zh_CN.po                             |   48 +-
 addons/analytic_user_function/i18n/zh_CN.po   |   44 +-
 addons/auction/i18n/zh_CN.po                  |  168 +-
 addons/audittrail/i18n/zh_CN.po               |  116 +-
 addons/base_iban/i18n/zh_CN.po                |   27 +-
 addons/base_module_merge/i18n/zh_CN.po        |   55 +-
 addons/base_module_publish/i18n/zh_CN.po      |   76 +-
 addons/base_module_record/i18n/zh_CN.po       |  122 +-
 addons/base_report_creator/i18n/zh_CN.po      |  124 +-
 addons/base_report_designer/i18n/zh_CN.po     |   57 +-
 addons/base_setup/i18n/zh_CN.po               |   80 +-
 addons/base_vat/i18n/zh_CN.po                 |   19 +-
 addons/board/i18n/fi.po                       |  220 +++
 addons/board/i18n/zh_CN.po                    |   37 +-
 addons/board_account/i18n/zh_CN.po            |   54 +-
 addons/board_association/i18n/zh_CN.po        |   20 +-
 addons/board_auction/i18n/zh_CN.po            |   48 +-
 addons/board_crm_configuration/i18n/zh_CN.po  |   65 +-
 addons/board_document/i18n/zh_CN.po           |   33 +-
 addons/board_manufacturing/i18n/zh_CN.po      |   35 +-
 addons/board_project/i18n/zh_CN.po            |   53 +-
 addons/board_sale/i18n/zh_CN.po               |   45 +-
 addons/crm/i18n/zh_CN.po                      |   25 +-
 addons/crm_vertical/i18n/zh_CN.po             |   10 +-
 addons/delivery/i18n/zh_CN.po                 |   73 +-
 addons/document/i18n/fi.po                    |   22 +-
 addons/document/i18n/zh_CN.po                 |  102 +-
 addons/document_ics/i18n/fi.po                |   18 +-
 addons/document_ics/i18n/zh_CN.po             |   97 +-
 addons/document_webdav/i18n/zh_CN.po          |  201 ++-
 addons/event/i18n/zh_CN.po                    |  200 +--
 addons/event_project/i18n/zh_CN.po            |   29 +-
 addons/google_map/i18n/zh_CN.po               |   24 +-
 addons/hr/i18n/zh_CN.po                       |  111 +-
 addons/hr_attendance/i18n/zh_CN.po            |   86 +-
 addons/hr_contract/i18n/zh_CN.po              |   97 +-
 addons/hr_evaluation/i18n/fi.po               |  277 ++++
 addons/hr_expense/i18n/zh_CN.po               |  181 ++-
 addons/hr_holidays/i18n/zh_CN.po              |  276 ++--
 addons/hr_timesheet/i18n/es.po                |   31 +-
 addons/hr_timesheet/i18n/zh_CN.po             |   90 +-
 addons/hr_timesheet_invoice/i18n/zh_CN.po     |  185 ++-
 addons/hr_timesheet_sheet/i18n/zh_CN.po       |  260 +--
 addons/idea/i18n/zh_CN.po                     |  137 +-
 addons/l10n_chart_uk_minimal/i18n/zh_CN.po    |   12 +-
 addons/membership/i18n/zh_CN.po               |  156 +-
 addons/mrp/i18n/zh_CN.po                      |  430 ++---
 addons/mrp_jit/i18n/zh_CN.po                  |   37 +-
 addons/mrp_operations/i18n/zh_CN.po           |  215 ++-
 addons/mrp_repair/i18n/zh_CN.po               |  209 +--
 addons/mrp_subproduct/i18n/zh_CN.po           |   10 +-
 addons/olap/i18n/de.po                        | 1399 +++++++++++++++++
 addons/olap_extract/i18n/de.po                |   56 +
 addons/point_of_sale/i18n/zh_CN.po            |  290 ++--
 addons/process/i18n/zh_CN.po                  |   67 +-
 addons/product/i18n/zh_CN.po                  |  394 +++--
 addons/product_margin/i18n/zh_CN.po           |   88 +-
 addons/profile_accounting/i18n/zh_CN.po       |   43 +-
 addons/profile_crm/i18n/zh_CN.po              |   11 +-
 addons/profile_manufacturing/i18n/zh_CN.po    |   73 +-
 addons/project/i18n/zh_CN.po                  |  285 ++--
 addons/project_gtd/i18n/pt_BR.po              |    2 +-
 addons/project_gtd/i18n/zh_CN.po              |   88 +-
 addons/project_mrp/i18n/zh_CN.po              |   30 +-
 addons/project_retro_planning/i18n/zh_CN.po   |   18 +-
 addons/project_timesheet/i18n/zh_CN.po        |    8 +-
 addons/purchase/i18n/es.po                    |   10 +-
 addons/purchase/i18n/zh_CN.po                 |  220 +--
 addons/purchase_analytic_plans/i18n/zh_CN.po  |   12 +-
 addons/report_account/i18n/zh_CN.po           |   95 +-
 addons/report_analytic/i18n/zh_CN.po          |   32 +-
 addons/report_analytic_line/i18n/zh_CN.po     |   39 +-
 addons/report_analytic_planning/i18n/zh_CN.po |  122 +-
 addons/report_crm/i18n/zh_CN.po               |   86 +-
 addons/report_document/i18n/zh_CN.po          |   78 +-
 addons/report_intrastat/i18n/zh_CN.po         |   58 +-
 addons/report_mrp/i18n/zh_CN.po               |   25 +-
 addons/report_project/i18n/zh_CN.po           |   38 +-
 addons/report_purchase/i18n/zh_CN.po          |   60 +-
 addons/report_sale/i18n/zh_CN.po              |  120 +-
 addons/report_task/i18n/zh_CN.po              |  103 +-
 addons/report_timesheet/i18n/zh_CN.po         |   99 +-
 addons/sale/i18n/zh_CN.po                     |  304 ++--
 addons/sale_analytic_plans/i18n/zh_CN.po      |   12 +-
 addons/sale_crm/i18n/zh_CN.po                 |   56 +-
 addons/sale_delivery_report/i18n/zh_CN.po     |   19 +-
 addons/sale_journal/i18n/zh_CN.po             |  184 ++-
 addons/scrum/i18n/zh_CN.po                    |  280 ++--
 addons/stock/i18n/zh_CN.po                    |  595 +++----
 addons/stock_invoice_directly/i18n/zh_CN.po   |    8 +-
 addons/stock_location/i18n/zh_CN.po           |   63 +-
 addons/stock_no_autopicking/i18n/zh_CN.po     |   14 +-
 addons/subscription/i18n/zh_CN.po             |   66 +-
 addons/warning/i18n/zh_CN.po                  |   36 +-
 addons/wiki/i18n/zh_CN.po                     |   84 +-
 112 files changed, 8340 insertions(+), 4929 deletions(-)
 create mode 100644 addons/account_analytic_default/i18n/oc.po
 create mode 100644 addons/board/i18n/fi.po
 create mode 100644 addons/hr_evaluation/i18n/fi.po
 create mode 100644 addons/olap/i18n/de.po
 create mode 100644 addons/olap_extract/i18n/de.po

diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 8939ed15837..8b5131c0683 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-09 08:50+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:43+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -40,7 +40,7 @@ msgstr "凭证录入"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr "为滞纳款项报告指定通知信息。"
+msgstr "设定这逾期应付款表单的消息"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -115,7 +115,7 @@ msgstr "上级科目"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr "日记账原始凭证"
+msgstr "原始凭证分类帐"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -139,7 +139,7 @@ msgstr "选择未对账凭证"
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "错误！这周期的持续时间无效 "
+msgstr "错误!这会计期间无效 "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -182,7 +182,7 @@ msgstr "科目表"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr "选择凭证明细"
+msgstr "选择凭证行"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -266,7 +266,7 @@ msgid ""
 "view tell Open ERP which fields should be visible, required or readonly and "
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
-msgstr "给出日记账凭证浏览和写入时使用的视图.这视图规定系统那个字段可见、必须或者只读.你能为每个日记账创建你自己的快速视图"
+msgstr "给出分类帐的凭证浏览和写入的视图.这视图规定系统那个字段可见、必须或只读.你能为每个分类帐创建你自己的视图"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -313,7 +313,7 @@ msgstr "来源"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "过帐名称"
+msgstr "凭证名称"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -323,7 +323,7 @@ msgstr "参考"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr "预定计算"
+msgstr "周期性计算"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -353,7 +353,7 @@ msgstr "借方交易"
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr "核算科目"
+msgstr "辅助核算项目"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -366,7 +366,7 @@ msgstr "子税"
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "日记账名称"
+msgstr "分类帐名称"
 
 #. module: account
 #: view:account.payment.term:0
@@ -376,7 +376,7 @@ msgstr "发票说明"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误！你不能创建一个循环的分析科目。"
+msgstr "错误!你不能创建递归的辅助核算项目"
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -387,7 +387,7 @@ msgstr "分录合计"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr "科目源"
+msgstr "源科目"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -423,12 +423,12 @@ msgstr "负数"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "（帐户/业务伙伴）名称"
+msgstr "(业务伙伴/科目)名称"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr "抵销"
+msgstr "反向"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -444,7 +444,7 @@ msgstr "状态"
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr "未支付的采购退款"
+msgstr "未支付的供应商退款"
 
 #. module: account
 #: view:account.tax:0
@@ -462,12 +462,12 @@ msgstr "从草稿确认将不对账"
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr "银行对账单"
+msgstr "银行对账"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr "降价(%)"
+msgstr "折扣(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -493,18 +493,18 @@ msgstr "在下一个税额计算前，如果本税额必须包含在下一税基
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr "定期处理"
+msgstr "期间处理"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr "核算凭证统计"
+msgstr "辅助核算凭证统计"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "税代码模板"
+msgstr "税务模板"
 
 #. module: account
 #: view:account.invoice:0
@@ -515,7 +515,7 @@ msgstr "供应商发票"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr "对账已付"
+msgstr "对账的付款"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -541,13 +541,13 @@ msgstr "递延方法"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "含基本金额"
+msgstr "基础金额"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "退税基础的代码"
+msgstr "退税基于"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -570,7 +570,7 @@ msgstr "真"
 msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
-msgstr "天数在计算月日期前加入,如果日期=15/01,天数=22,月=1,到期日期是28/02"
+msgstr "天数在计算前加入月的天数,如日期为01/15,天数是22,月是1,则应付日期是02/28"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -591,7 +591,7 @@ msgstr "过帐"
 #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "旧的业务伙伴余额"
+msgstr "账龄分析表"
 
 #. module: account
 #: view:account.journal:0
@@ -635,7 +635,7 @@ msgstr "凭证对账"
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr "打开银行对账单"
+msgstr "打开银行对账"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -646,7 +646,7 @@ msgstr "折扣(%)"
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr "勾销金额"
+msgstr "补差额金额"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
@@ -656,12 +656,12 @@ msgstr "如果这会计年度属于几个公司留空"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "核算会计"
+msgstr "成本会计"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Sub-Total :"
-msgstr "小计 ："
+msgstr "小计 :"
 
 #. module: account
 #: field:account.analytic.account,line_ids:0
@@ -669,7 +669,7 @@ msgstr "小计 ："
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr "核算凭证"
+msgstr "辅助核算凭证"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -679,7 +679,7 @@ msgstr "月"
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr "相关的业务伙伴"
+msgstr "相关业务伙伴"
 
 #. module: account
 #: field:account.invoice,comment:0
@@ -712,17 +712,17 @@ msgstr "客户欠款金额合计"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr "状态"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_line_open
 msgid "account.move.line"
-msgstr "account.move.line"
+msgstr "科目.凭证.明细"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr "核算发票"
+msgstr "辅助核算发票"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -738,7 +738,7 @@ msgstr "上级符号"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "年度期末日记账凭证"
+msgstr "年度期末分类帐"
 
 #. module: account
 #: view:product.product:0
@@ -811,20 +811,20 @@ msgstr "凭证明细"
 #. module: account
 #: model:ir.model,name:account.model_account_config_wizard
 msgid "account.config.wizard"
-msgstr "向导"
+msgstr "科目.设置.向导"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr "成本和收入日记账"
+msgstr "辅助核算项目统计"
 
 #. module: account
 #: help:account.account.template,user_type:0
 msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
-msgstr "这定义的类型根据你的国家.这类型包含更多的信息如：科目和特定的信息"
+msgstr "这定义的类型根据你的国家.这类型包含更多的信息如:科目和特定的信息"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -834,7 +834,7 @@ msgstr "6"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr "银行对账单"
+msgstr "银行对账"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -846,19 +846,19 @@ msgstr "科目模板"
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "核算科目"
+msgstr "辅助核算项目"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr "打印日记账"
+msgstr "打印分类帐"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "银行.科目.向导"
+msgstr "科目.银行.科目.向导"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -874,7 +874,7 @@ msgstr "取消发票"
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr "必需项"
+msgstr "必须的"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
@@ -885,7 +885,7 @@ msgstr "费用科目"
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr "勾销日记账"
+msgstr "补差额分类帐"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
@@ -896,7 +896,7 @@ msgstr "货币金额"
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr "费用分类科目"
+msgstr ""
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -949,7 +949,7 @@ msgstr "基础代码金额"
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "这日记账的责任用户"
+msgstr "这分类帐的责任用户"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -960,7 +960,7 @@ msgstr "默认借方科目"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr "输入银行结算单凭证"
+msgstr "银行对账单"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1069,7 +1069,7 @@ msgstr "主序列"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr "打印核算日记账"
+msgstr "打印辅助核算分类帐"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1086,7 +1086,7 @@ msgstr "序列字段用于付款条款行的排序从低到高."
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr "勾销金额合计"
+msgstr "补差额金额合计"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1105,18 +1105,18 @@ msgstr "税代码"
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "图表模板"
+msgstr "列表模板"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr "收入分类科目"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr "新的核算科目"
+msgstr "新的辅助核算项目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1133,7 +1133,7 @@ msgstr "单价"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr "时期从"
+msgstr "会计期间从:"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1211,8 +1211,7 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"这将选择将要结束的交易的当前汇率计算.在大多数国家法定为平均但是只有少数软件系统能够管理.所以如果你导入另一个软件系统你必须使用当日汇率导入的交易总是使用"
-"这当日汇率"
+"这将选择将要兑换的当前计算汇率.在大多数国家法定为\"平均\"但只有少数软件系统能够管理.所以如果你导入另一个软件系统,你可能需要使用当日汇率"
 
 #. module: account
 #: field:account.account,company_currency_id:0
@@ -1227,12 +1226,12 @@ msgstr "财务结构模板科目一览"
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr "上级核算科目"
+msgstr "上级辅助核算项目"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr "勾销时对账"
+msgstr "补差额时对账"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -1247,7 +1246,7 @@ msgstr "科目代码使用数字"
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr "期末余额"
+msgstr "期末结余"
 
 #. module: account
 #: view:product.product:0
@@ -1267,7 +1266,7 @@ msgstr "固定金额"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr "核算贷方"
+msgstr "辅助核算贷方"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -1278,7 +1277,7 @@ msgstr "部分对账"
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "没对账的交易"
+msgstr "没对账的业务"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1301,7 +1300,7 @@ msgstr "值"
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr "勾销科目"
+msgstr "补差额科目"
 
 #. module: account
 #: field:account.model.line,model_id:0
@@ -1323,7 +1322,7 @@ msgstr "汇总副本"
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr "消息"
+msgstr "信息"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1351,7 +1350,7 @@ msgstr "所有"
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr "核算明细"
+msgstr "辅助核算明细"
 
 #. module: account
 #: help:account.tax,type:0
@@ -1362,7 +1361,7 @@ msgstr "税金的计算方法"
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr "确认凭证"
+msgstr "审核凭证"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1370,7 +1369,7 @@ msgstr "确认凭证"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr "如果未对账交易你必须检验交易所有操作.因为他们不会被禁止."
+msgstr "如果进行未对账处理你必须检验处理的所有操作.因为他们不会被禁止."
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -1418,7 +1417,7 @@ msgstr "科目类型"
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr "日记账"
+msgstr "分类帐"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -1445,7 +1444,7 @@ msgstr "显示科目 "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr "结算单对账明细"
+msgstr "对账单对账明细"
 
 #. module: account
 #: view:account.tax:0
@@ -1459,7 +1458,7 @@ msgstr "留空为使用收入科目"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr "勾销"
+msgstr "补差额"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1483,17 +1482,17 @@ msgstr "关闭状态"
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr "wizard.company.setup"
+msgstr "向导.公司.设置"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr "科目.核算.明细.延伸"
+msgstr "项目.辅助核算.明细.延伸"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "退款日记账"
+msgstr "退款分类帐"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
@@ -1525,7 +1524,7 @@ msgstr "正数"
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr "打印普通日记账"
+msgstr "打印普通分类帐"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1548,7 +1547,7 @@ msgstr "从模板产生科目表"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr "正式报表"
+msgstr "法定报表"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -1559,7 +1558,7 @@ msgstr "上级代码"
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
 msgid "Open for reconciliation"
-msgstr "打开对账凭证"
+msgstr "打开对账"
 
 #. module: account
 #: model:account.journal,name:account.bilan_journal
@@ -1605,7 +1604,7 @@ msgstr "应收款与应付款科目"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr "预定明细"
+msgstr "周期明细"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1657,7 +1656,7 @@ msgstr "开始余额"
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr "日记账"
+msgstr "分类帐"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -1684,7 +1683,7 @@ msgstr "成本&收入"
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "错误!你不能创建递归科目。"
+msgstr "错误!你不能创建递归的科目"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1730,7 +1729,7 @@ msgstr "第三贷方"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr "未对账凭证"
+msgstr "凭证转为未对账"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1746,7 +1745,7 @@ msgstr "会计期间的成本分类账"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr "新银行结算单"
+msgstr "新银行对账单"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1765,7 +1764,7 @@ msgstr "发票和付款的对账凭证"
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr "打印总账"
+msgstr "打印分类帐(按科目)"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -1782,7 +1781,7 @@ msgstr "百分比"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "图表"
+msgstr "科目列表"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1813,12 +1812,12 @@ msgstr "日期或者代码"
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr "科目管理"
+msgstr "项目管理员"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr "至："
+msgstr "到:"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -1856,7 +1855,7 @@ msgstr "开始日期"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x 退款费用日记账"
+msgstr "x 费用贷方票据分类帐"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1888,7 +1887,7 @@ msgstr "发票税科目"
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr "核算明细"
+msgstr "辅助核算凭证明细"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
@@ -1910,7 +1909,7 @@ msgstr "客户发票草稿"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "科目预定明细"
+msgstr "科目周期明细"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1938,7 +1937,7 @@ msgstr "排序按:"
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr "待核实"
+msgstr "待审核"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -1989,7 +1988,7 @@ msgstr "          开始日期"
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr "核算日记账报表"
+msgstr "辅助核算分类帐报表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2010,13 +2009,13 @@ msgstr "成本分类账或凭证名称"
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "日记账-会计期间名称"
+msgstr "分类帐-会计期间名称"
 
 #. module: account
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "税事务名称"
+msgstr "税务名称"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2024,7 +2023,7 @@ msgid ""
 "Check this box if you don't want new account moves to pass through the "
 "'draft' state and instead goes directly to the 'posted state' without any "
 "manual validation."
-msgstr "如果你不想新的凭证从草稿状态来生成而是直接通过手动确认到登账状态勾选此项"
+msgstr "如果你不想新的凭证从草稿状态来生成而是直接通过手动确认到已审核状态"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -2043,7 +2042,7 @@ msgstr "业务伙伴"
 msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
-msgstr "唯一的发票编号计算是发票创建时自动计算"
+msgstr "发票创建时自动计算唯一的发票编号"
 
 #. module: account
 #: rml:account.invoice:0
@@ -2073,7 +2072,7 @@ msgstr "客户发票处理"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "应税设定备注"
+msgstr "财务结构备注:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2085,7 +2084,7 @@ msgstr "会计期间开账凭证"
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
 #: model:ir.ui.menu,name:account.menu_validate_account_moves
 msgid "Validate Account Moves"
-msgstr "确认凭证"
+msgstr "审核凭证"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -2114,7 +2113,7 @@ msgstr "货币"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid invoices"
-msgstr "未支付发票"
+msgstr "未支付的发票"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
@@ -2125,13 +2124,13 @@ msgstr "付款对账"
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr "结算单对账"
+msgstr "对账单对账"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr "新预定"
+msgstr "新周期性凭证"
 
 #. module: account
 #: view:account.payment.term:0
@@ -2141,7 +2140,7 @@ msgstr "计算"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "核算凭证"
+msgstr "辅助核算凭证"
 
 #. module: account
 #: view:res.company:0 field:res.company,overdue_msg:0
@@ -2157,12 +2156,12 @@ msgstr "税一览表"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr "价值金额"
+msgstr "计算金额"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "已对账凭证"
+msgstr "对账的凭证"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -2231,18 +2230,18 @@ msgstr "科目表"
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr "x 检查日记账"
+msgstr "x 支票分类帐"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr "创建预定凭证"
+msgstr "创建周期性凭证"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr "日记账开账凭证"
+msgstr "分类帐开账凭证"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -2257,7 +2256,7 @@ msgstr "客户税"
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr "发票日期"
+msgstr "开票日期"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2328,7 +2327,7 @@ msgstr "税类型"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "结算单凭证"
+msgstr "凭证"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
@@ -2371,7 +2370,7 @@ msgstr "进项发票"
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr "和日记账"
+msgstr "和分类帐"
 
 #. module: account
 #: view:account.tax:0
@@ -2381,24 +2380,24 @@ msgstr "税"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "凭证明细"
+msgstr "凭证行"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr "科目号"
+msgstr "科目No"
 
 #. module: account
 #: help:account.tax,child_depend:0
 msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
-msgstr "设置如果税计算是根据子税而不是金额合计"
+msgstr "设置如果税计算是基于子税而不是合计"
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr "日记账代码"
+msgstr "分类帐代码"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2435,7 +2434,7 @@ msgstr "适用代码(如果类型=代码)"
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
 msgid "Open Journal"
-msgstr "打开日记账"
+msgstr "打开分类帐"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2448,7 +2447,7 @@ msgstr "KI"
 #: model:ir.ui.menu,name:account.account_entries_analytic_entries
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 msgid "Entries Encoding by Line"
-msgstr "凭证明细"
+msgstr "凭证"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -2466,7 +2465,7 @@ msgstr "会计期间从"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "银行结算单"
+msgstr "银行对账单"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2483,7 +2482,7 @@ msgstr "凭证对账"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr "日记账使用货币的金额"
+msgstr "分类帐使用货币的金额"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2494,7 +2493,7 @@ msgstr "横向模式"
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr "从核算科目创建发票"
+msgstr "从辅助核目项目创建发票"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2548,7 +2547,7 @@ msgstr "取消"
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
-msgstr "科目类型名"
+msgstr "科目类型名称"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -2587,7 +2586,7 @@ msgstr "应付账款"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr "结算单里的进项发票"
+msgstr "对账单里的进项发票"
 
 #. module: account
 #: view:account.invoice:0
@@ -2608,7 +2607,7 @@ msgstr "付款单"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "勾选此项使用允许在科目对账凭证"
+msgstr "允许要对账凭证在这科目"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2616,7 +2615,7 @@ msgstr "勾选此项使用允许在科目对账凭证"
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic"
-msgstr "核算"
+msgstr "辅助核算"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
@@ -2631,7 +2630,7 @@ msgstr "资产净值"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr "逾期付款催单"
+msgstr "付款信息"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2652,13 +2651,13 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
-"这类型是用于特殊类型的不同类型.在系统中：视图能不显示所有条目.合并科目能合并多公司的子科目.业务伙伴的应收/应付账款科目(为借方贷方计算).关闭弃用科目"
+"这类型是用于特殊类型的不同类型.在系统中:视图能不显示所有条目.合并科目能合并多公司的子科目.业务伙伴的应收/应付账款科目(为借方贷方计算).关闭弃用科目"
 "."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Year Treatments"
-msgstr "年度期末处理"
+msgstr "期末结账"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
@@ -2673,7 +2672,7 @@ msgstr "强制"
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "Account Analytic Lines Analysis"
-msgstr "核算明细分析"
+msgstr "辅助核算明细分析"
 
 #. module: account
 #: rml:account.invoice:0
@@ -2699,17 +2698,17 @@ msgstr "asgfas"
 #: model:ir.ui.menu,name:account.account_analytic_def_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Analytic Chart of Accounts"
-msgstr "核算科目表"
+msgstr "辅助核算项目表"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "View Account Analytic Lines"
-msgstr "查看科目核算明细"
+msgstr "辅助科目核算明细视图"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Select Period and Journal for Validation"
-msgstr "选择会计期间和确认日记账"
+msgstr "选择会计期间和分类帐确认样"
 
 #. module: account
 #: field:account.invoice,number:0
@@ -2719,7 +2718,7 @@ msgstr "发票号"
 #. module: account
 #: field:account.period,date_stop:0
 msgid "End of Period"
-msgstr "期末"
+msgstr "期末日期"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,finish:0
@@ -2768,7 +2767,7 @@ msgstr "名称"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Reconciliation transactions"
-msgstr "对账交易"
+msgstr "对账处理"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
@@ -2804,7 +2803,7 @@ msgstr "序列字段用于税明细的排序从低到高.如果税中有子税
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "日记账视图"
+msgstr "分类帐视图"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2826,7 +2825,7 @@ msgstr "业务员伙伴ID"
 #: wizard_view:account.invoice.pay,addendum:0
 #: wizard_view:account.move.line.reconcile,addendum:0
 msgid "Write-Off Move"
-msgstr "勾销凭证"
+msgstr "补差额凭证"
 
 #. module: account
 #: view:account.move.line:0
@@ -2859,7 +2858,7 @@ msgstr "最好的祝愿"
 #. module: account
 #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
 msgid "Analytic account costs and revenues"
-msgstr "核算成本和收入"
+msgstr "辅助核算成本和收入"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -2890,7 +2889,7 @@ msgstr "从报表创建凭证"
 #. module: account
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr "所有科目名称"
+msgstr "所有项目名称"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -2920,7 +2919,7 @@ msgstr "会计报表"
 #. module: account
 #: rml:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "文档：客户科目的表"
+msgstr "文档:客户科目的表"
 
 #. module: account
 #: view:product.product:0
@@ -2938,13 +2937,13 @@ msgstr "税一览"
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
-msgstr "未对账交易"
+msgstr "未对账处理"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Reconcilation of entries from payment order."
-msgstr "付款单的对账凭证"
+msgstr "付款单凭证对账"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -2981,12 +2980,12 @@ msgstr "税代码"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Analytic Journal -"
-msgstr "核算日记账 -"
+msgstr "辅助核算分类帐 -"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Debit"
-msgstr "核算借方"
+msgstr "辅助核算借方"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -3044,13 +3043,13 @@ msgstr "应收款科目"
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
-msgstr "如果勾选此项系统将试图在产生发票时把明细分组"
+msgstr "如果勾选此项系统将试图在产生发票时把凭证明细分组"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
 #: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
 msgid "# of Transaction"
-msgstr "交易号#"
+msgstr "处理号#"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
@@ -3064,7 +3063,7 @@ msgstr "取消所选发票"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
-msgstr "核算日记账"
+msgstr "辅助核算分类帐"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -3074,7 +3073,7 @@ msgstr "凭证标签"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Reconcilate the entries from payment"
-msgstr "付款的对账凭证"
+msgstr "付款凭证对账"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -3092,7 +3091,7 @@ msgstr "设为草稿"
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr "发票上产品票据的参考"
+msgstr "发票上产品单据的参考"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3110,7 +3109,7 @@ msgstr "基础"
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr "名称"
+msgstr "模型名称"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3134,7 +3133,7 @@ msgstr "确认"
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr "图例"
+msgstr "说明"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -3193,7 +3192,7 @@ msgstr "备注"
 msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
-msgstr "发票已对账的科目变动跟着付款时的科目变动."
+msgstr "发票对账凭证跟着付款凭证."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3219,7 +3218,7 @@ msgstr "平均汇率"
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr "结算单产生的付款凭证"
+msgstr "对账单产生的付款凭证"
 
 #. module: account
 #: field:account.account,code:0
@@ -3256,17 +3255,17 @@ msgstr "无"
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "生成会计年度期初凭证"
+msgstr "年度结转"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
-msgstr "对账凭证"
+msgstr "凭证对账"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(发票也许未对账，如果你想打开它)"
+msgstr "(如果你要打开它"
 
 #. module: account
 #: view:account.invoice:0
@@ -3288,7 +3287,7 @@ msgstr " 会计年度和会计期间处于关闭状态"
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr "月只有30天"
+msgstr "每月30天"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -3304,12 +3303,12 @@ msgstr "错误：需要BVR参照"
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "没可打印发票"
+msgstr "没可打印的发票"
 
 #. module: account
 #: field:account.move.line,move_id:0
 msgid "Move"
-msgstr "凭证编号"
+msgstr "凭证"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_src_id:0
@@ -3379,12 +3378,12 @@ msgstr "Python代码"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "银行结算单"
+msgstr "银行对账单"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partner Accounts"
-msgstr "业务伙伴科目"
+msgstr "应收应付"
 
 #. module: account
 #: help:account.tax.template,tax_group:0
@@ -3431,7 +3430,7 @@ msgstr "快捷键"
 msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accouting fields."
-msgstr "确认日记账和会计期间的所有凭证草稿.这意味你将不能修改它的会计字段."
+msgstr "确认分类帐和会计期间的所有凭证草稿.这意味你将不能修改它的会计字段."
 
 #. module: account
 #: selection:account.model.line,date:0
@@ -3482,7 +3481,7 @@ msgstr "应收账款"
 #. module: account
 #: wizard_button:account.invoice.pay,addendum,reconcile:0
 msgid "Pay and reconcile"
-msgstr "付款和对账"
+msgstr "支付和对账"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -3513,7 +3512,7 @@ msgstr "会计年度"
 #. module: account
 #: rml:account.overdue:0
 msgid "Balance :"
-msgstr "余额："
+msgstr "余额:"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -3560,12 +3559,12 @@ msgstr "科目表"
 #. module: account
 #: field:account.subscription.line,subscription_id:0
 msgid "Subscription"
-msgstr "预定"
+msgstr "周期"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal code"
-msgstr "日记账代码"
+msgstr "分类帐代码"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close,init,close:0
@@ -3576,12 +3575,12 @@ msgstr "创建凭证"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr "明细"
+msgstr "项目明细"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "最大勾销金额"
+msgstr "最大补差额金额"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
@@ -3622,7 +3621,7 @@ msgstr "用在这发票的业务伙伴"
 msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
-msgstr "如果你不想发票显示有关的增值税勾选此项"
+msgstr "如果你不想发票显示有关的增值税"
 
 #. module: account
 #: field:account.account.type,sequence:0
@@ -3645,7 +3644,7 @@ msgstr "财务结构模板"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Entry encoding"
-msgstr "凭证"
+msgstr "凭证编号"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -3661,7 +3660,7 @@ msgstr "定义会计年度并选择科目表"
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
 msgid "Write-Off Period"
-msgstr "注销周期"
+msgstr "补差额会计期间"
 
 #. module: account
 #: selection:account.config.wizard,period:0
@@ -3694,7 +3693,7 @@ msgstr "月"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "科目预定"
+msgstr "科目周期"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -3706,7 +3705,7 @@ msgstr "到期日期"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "预定凭证"
+msgstr "凭证周期"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3776,14 +3775,14 @@ msgid ""
 "    Bank statements\n"
 "    "
 msgstr ""
-"财务和会计模块包括：\n"
+"财务和会计模块包括:\n"
 "    一般会计\n"
 "    成本/核算会计\n"
 "    第三方会计\n"
 "    税务管理\n"
 "    预算\n"
 "    客户和供应商发票\n"
-"    银行结算单\n"
+"    银行对账单\n"
 "    "
 
 #. module: account
@@ -3812,13 +3811,13 @@ msgstr "这科目可以选免税科目和不含税科目"
 msgid ""
 "If no account is specified, the reconciliation will be made using every "
 "accounts that can be reconcilied"
-msgstr "如果没有指定科目,对账将需要每个科目都能被已对账."
+msgstr "如果没有指定科目,对账将需要每个科目都能被对账."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr "逾期付款报告信息"
+msgstr "逾期付款信息"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -3865,7 +3864,7 @@ msgstr "手动报表"
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr "财务日记账"
+msgstr "帐簿"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3893,7 +3892,7 @@ msgstr "最大数量"
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr "会计期间名称"
+msgstr "会计期间"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -3901,7 +3900,7 @@ msgid ""
 "Gives the type of the analytic journal. When a document (eg: an invoice) "
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
-msgstr "给出这核算日记账类型如:(发票)需要创建核算凭证.系统将寻找匹配同一类型的日记账."
+msgstr "给出这辅助核算分类帐类型如:(发票)需要创建辅助核算凭证.系统将寻找匹配同一类型的分类帐."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3927,7 +3926,7 @@ msgstr "有效"
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Import from your bank statements"
-msgstr "从你的银行结算单导入"
+msgstr "从你的银行对账单导入"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3947,7 +3946,7 @@ msgstr "选择凭证"
 #. module: account
 #: selection:account.chart,init,target_move:0
 msgid "All Posted Entries"
-msgstr "所有已登账的凭证"
+msgstr "所有已审核的凭证"
 
 #. module: account
 #: wizard_field:account.vat.declaration,init,based_on:0
@@ -3968,7 +3967,7 @@ msgstr "应付款科目"
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr "第二货币"
+msgstr "外币"
 
 #. module: account
 #: field:account.account,credit:0
@@ -4018,7 +4017,7 @@ msgstr "凭证编号"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "结算单明细"
+msgstr "对帐单明细"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4057,7 +4056,7 @@ msgstr "       包括已对账凭证"
 msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
-msgstr "你能通过勾选此项标记与业务伙伴的争议的凭证明细"
+msgstr "你能通过勾选"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4094,18 +4093,18 @@ msgstr "贷方交易"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "分离的日记账序列"
+msgstr "分散的分类帐的序列"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr "日记账使用的货币"
+msgstr "分类帐使用的货币"
 
 #. module: account
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "日记账栏"
+msgstr "分类帐栏"
 
 #. module: account
 #: selection:account.fiscalyear,state:0
@@ -4151,13 +4150,13 @@ msgstr "待处理"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
 msgid "Search Entries"
-msgstr "选择凭证"
+msgstr "凭证查询"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr "核算采购再开发票成本、时间表安排"
+msgstr "辅助核算采购再开发票成本"
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -4204,12 +4203,12 @@ msgstr "上级左"
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid "The sequence gives the display order for a list of journals"
-msgstr "这序列给出日记账列表的显示顺序"
+msgstr "这序列给出分类帐列表的显示顺序"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr "控制类型"
+msgstr "类型控制"
 
 #. module: account
 #: field:account.analytic.account,name:0
@@ -4271,7 +4270,7 @@ msgstr "会计期间"
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr "日记账/付款方式"
+msgstr "分类帐/付款方式"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4303,7 +4302,7 @@ msgstr "年合计"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import file from your bank statement"
-msgstr "从你的银行结算单导入文件"
+msgstr "从你的银行对账单导入文件"
 
 #. module: account
 #: field:account.account,type:0
@@ -4320,7 +4319,7 @@ msgstr "9"
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr "运行预定"
+msgstr "运行中的周期性凭证"
 
 #. module: account
 #: selection:account.move,type:0
@@ -4330,7 +4329,7 @@ msgstr "银行付款"
 #. module: account
 #: selection:account.move,state:0
 msgid "Posted"
-msgstr "已登账"
+msgstr "已审核"
 
 #. module: account
 #: view:account.tax:0
@@ -4348,12 +4347,12 @@ msgstr "结束日期"
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
 msgid "Cancel Opening Entries"
-msgstr "取消打开的凭证"
+msgstr "取消开账凭证"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manually statement"
-msgstr "手动声明"
+msgstr "手动报表"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -4408,7 +4407,7 @@ msgstr "税模板"
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr "这是一个循环科目分录模板"
+msgstr "这是一个经常性凭证的模型"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
@@ -4428,7 +4427,7 @@ msgstr "你确定要开这发票?"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 msgid "Partner Other Ledger"
-msgstr "业务伙伴其它分类帐"
+msgstr "业务伙伴其它分类账"
 
 #. module: account
 #: view:res.partner:0
@@ -4545,32 +4544,32 @@ msgstr "供应商会计属性"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr "核算科目统计"
+msgstr "辅助核算项目统计"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
-msgstr "这将根据你选择的模板自动设置你的科目表、银行账号、税和日记账."
+msgstr "这将根据你选择的模板自动设置你的科目表、银行账号、税和分类帐"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr "结算单"
+msgstr "对帐单"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
 #: model:ir.ui.menu,name:account.menu_encode_entries_by_move
 msgid "Entries Encoding by Move"
-msgstr "凭证编号"
+msgstr "凭证列表"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr "核算科目表"
+msgstr "辅助核算项目表"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -4586,7 +4585,7 @@ msgstr "含税价"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Entries by Journal"
-msgstr "日记账核算凭证"
+msgstr "管理会计凭证列表"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -4639,12 +4638,12 @@ msgstr "报表草稿"
 #. module: account
 #: field:account.analytic.journal,name:0
 msgid "Journal name"
-msgstr "日记账名称"
+msgstr "分类帐名称"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr "来自报表的进项发票"
+msgstr "来自对账单的进项发票"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -4667,7 +4666,7 @@ msgstr "从发票或者付款导入"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr "对账凭证"
+msgstr "对账的凭证"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -4682,7 +4681,7 @@ msgstr "图标"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
-msgstr "日记账-会计期间"
+msgstr "分类帐-会计期间"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,credit:0
@@ -4698,7 +4697,7 @@ msgstr "创建月度会计期间"
 #. module: account
 #: wizard_button:account.aged.trial.balance,init,print:0
 msgid "Print Aged Trial Balance"
-msgstr "打印旧的试算表"
+msgstr "打印账龄分析表"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -4726,7 +4725,7 @@ msgid ""
 "Check this box to determine that each entry of this journal won't create a "
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
-msgstr "勾选此项日记账的每个凭证不会创建一个新的副本但将共享一个相同的副本.这用于关闭的会计年度里"
+msgstr "勾选此项"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4737,7 +4736,7 @@ msgstr "已取消"
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "银行结算单草稿"
+msgstr "银行对账单草稿"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
@@ -4753,7 +4752,7 @@ msgstr "帐号"
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
 msgid "Account cost and revenue by journal (This Month)"
-msgstr "成本与收入日记账(本月)"
+msgstr "辅助核算项目本月统计"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -4764,13 +4763,13 @@ msgstr "应收款科目"
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
 msgid "Open for unreconciliation"
-msgstr "打开未对账凭证"
+msgstr "打开未对账"
 
 #. module: account
 #: field:account.bank.statement.reconcile,statement_line:0
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "银行结算单明细"
+msgstr "银行对账单明细"
 
 #. module: account
 #: wizard_button:account.automatic.reconcile,reconcile,end:0
@@ -4801,7 +4800,7 @@ msgstr "科目余额"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
 #: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
 msgid "Analytic Check"
-msgstr "核算检查"
+msgstr "辅助核算检查"
 
 #. module: account
 #: rml:account.overdue:0
@@ -4820,7 +4819,7 @@ msgstr "合计:"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
-msgstr "核算日记账"
+msgstr "项目.辅助核算.分类帐"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4837,7 +4836,7 @@ msgstr "销售税"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "对账"
+msgstr "科目对账"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4872,7 +4871,7 @@ msgstr "付款金额"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "核算科目"
+msgstr "辅助核算项目"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4924,7 +4923,7 @@ msgstr "发票明细"
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "启动会计期间"
+msgstr "期初日期"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,report_name:0
@@ -4950,17 +4949,17 @@ msgstr "税说明"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated account moves."
-msgstr "连接到自动生成的凭证"
+msgstr "链接动生成的凭证"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "已对账交易"
+msgstr "已对账的处理"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -4977,7 +4976,7 @@ msgstr "生成凭证和一个数字"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Check -"
-msgstr "核算检查 -"
+msgstr "辅助核算检查 -"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -4987,7 +4986,7 @@ msgstr "科目余额 -"
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group invoice lines"
-msgstr "发票明细组"
+msgstr "分票组"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4998,17 +4997,17 @@ msgstr "设置"
 #: view:account.analytic.line:0
 #: view:account.invoice:0
 msgid "Total amount"
-msgstr "金额合计"
+msgstr "合计"
 
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr "科目日记账"
+msgstr "分类帐"
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr "预定明细"
+msgstr "周期明细"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5019,7 +5018,7 @@ msgstr "产品收入科目模板"
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
-msgstr "强制对所有凭证含此第二货币"
+msgstr "强制对所有凭证含此外币"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,end:0
@@ -5068,7 +5067,7 @@ msgstr "新的客户退款"
 msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
-msgstr "如果你想每个创建的日记账使用一个不同的序列勾选此项.否则将使用同一序列"
+msgstr "如果你想每个创建的分类帐使用一个不同的序列勾选此项.否则将使用同一序列"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
@@ -5097,12 +5096,12 @@ msgstr "一致"
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr "域"
+msgstr "分类"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr "科目数据"
+msgstr "项目信息"
 
 #. module: account
 #: view:account.tax.code.template:0
@@ -5112,7 +5111,7 @@ msgstr "税代码模板"
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr "预定会计期间"
+msgstr "周期的会计期间"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -5147,7 +5146,7 @@ msgstr "发票明细"
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr "勾销日记账"
+msgstr "补差额分类帐"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
@@ -5157,7 +5156,7 @@ msgstr "全部付款"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr "采购日记账"
+msgstr "采购分类帐"
 
 #. module: account
 #: selection:account.move,type:0
@@ -5168,7 +5167,7 @@ msgstr "现金收入"
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "更换税"
+msgstr "替代的税"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -5178,7 +5177,7 @@ msgstr "从手动生效为草稿"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr "这月"
+msgstr "本月"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -5233,7 +5232,7 @@ msgstr "日期过滤"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr "选择日记账和付款日期"
+msgstr "选择分类帐和付款日期"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5278,7 +5277,7 @@ msgstr "形式发票"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "部分的凭证明细"
+msgstr "部分凭证明细"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5351,7 +5350,7 @@ msgstr "已对账金额"
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr "日期"
+msgstr "当日汇率"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -5382,7 +5381,7 @@ msgstr "税应用"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr "预定凭证"
+msgstr "周期性凭证"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5404,7 +5403,7 @@ msgstr "会计期间数"
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
 #: wizard_field:account.automatic.reconcile,init,date2:0
 msgid "End of period"
-msgstr "期末"
+msgstr "期末日期"
 
 #. module: account
 #: view:account.move:0
@@ -5416,7 +5415,7 @@ msgstr "凭证"
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "普通日记账"
+msgstr "普通分类帐"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5452,7 +5451,7 @@ msgstr "发票税"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journal Definition"
-msgstr "定义核算日记账"
+msgstr "定义辅助核算分类帐"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -5469,12 +5468,12 @@ msgstr "银行账号"
 msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
-msgstr "无效周期！一些周期重复或者周期不在这会计年度中。 "
+msgstr "无效会计期间！一些会计期间重复或者会计期间不在这会计年度中 "
 
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr "这序列用于日记账发票号"
+msgstr "这序列用于这分类帐发票号"
 
 #. module: account
 #: view:account.account:0
@@ -5483,7 +5482,7 @@ msgstr "这序列用于日记账发票号"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr "普通信息"
+msgstr "一般信息"
 
 #. module: account
 #: help:populate_statement_from_inv,init,journal_id:0
@@ -5491,12 +5490,12 @@ msgid ""
 "This field allow you to choose the accounting journals you want for "
 "filtering the invoices. If you left this field empty, it will search on all "
 "sale, purchase and cash journals."
-msgstr "这字段允许你选择会计日记账要过滤的发票.如果你设为空将搜索所有销售采购和现金日记账"
+msgstr "这字段允许你选择会计分类帐要过滤的发票.如果你设为空将搜索所有销售采购和现金分类帐"
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "错误 ! 会计年度持久无效 "
+msgstr "错误!会计年度无效 "
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5539,7 +5538,7 @@ msgstr "成本分类账(只有数量)"
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr "确认凭证"
+msgstr "审核凭证"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -5560,7 +5559,7 @@ msgstr "到"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr "待处理核算日记账凭证"
+msgstr "待处理辅助核算分类帐"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5575,7 +5574,7 @@ msgstr "当前日期"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr "销售日记账"
+msgstr "销售分类帐"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5593,7 +5592,7 @@ msgstr "关闭会计年度"
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
 #: wizard_field:account.automatic.reconcile,init,date1:0
 msgid "Start of period"
-msgstr "启动会计期间"
+msgstr "期初日期"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5646,7 +5645,7 @@ msgstr "上级右"
 #. module: account
 #: model:ir.ui.menu,name:account.account_account_menu
 msgid "Financial Accounts"
-msgstr "财务科目"
+msgstr "会计科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -5685,7 +5684,7 @@ msgstr "收入科目"
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "开始/关闭会计期间"
+msgstr "开启会计期间"
 
 #. module: account
 #: rml:account.analytic.account.balance:0
@@ -5722,7 +5721,7 @@ msgstr "会计属性"
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr "序号.财务"
+msgstr "科目.序号.会计年度"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
@@ -5732,7 +5731,7 @@ msgstr "凭证排序按"
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr "打印日记账 -"
+msgstr "打印分类帐 -"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -5812,13 +5811,13 @@ msgstr "凭证"
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr "对账时已支付发票"
+msgstr "支付发票时对账"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr "Python代码(反转)"
+msgstr "Python代码(reverse)"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -5867,7 +5866,7 @@ msgstr "一般借方"
 #. module: account
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr "科目代码"
+msgstr "辅助核算代码"
 
 #. module: account
 #: help:account.config.wizard,name:0
@@ -5894,12 +5893,12 @@ msgstr "财务结构"
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr "结算单处理"
+msgstr "对账单处理"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr "结算单对账"
+msgstr "对账单对账"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
@@ -5913,7 +5912,7 @@ msgstr "勾选此项"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "勾选此项在产品和发票中使用含税价"
+msgstr "在产品和发票中使用含税价"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5937,7 +5936,7 @@ msgstr "是"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
-msgstr "勾选此项使用允许在科目对账凭证"
+msgstr "用户允许在这科目对账凭证"
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
@@ -5949,3 +5948,30 @@ msgstr "计算日期"
 
 #~ msgid "The bank account to pay to or to be paid from"
 #~ msgstr "这银行账号来支付或将要用来支付"
+
+#~ msgid "x Sales Journal"
+#~ msgstr "x 销售分类帐"
+
+#~ msgid "For Value percent enter % ratio between 0-1."
+#~ msgstr "值是一个百分比在0-1之间"
+
+#~ msgid "For Tax Type percent enter % ratio between 0-1."
+#~ msgstr "税类型是百分比在0-1之间"
+
+#~ msgid "Empty Accounts ? "
+#~ msgstr "空科目? "
+
+#~ msgid "x Sales Credit Note Journal"
+#~ msgstr "x 销售贷项票据分类帐"
+
+#~ msgid "Check if you want to display Accounts with 0 balance too."
+#~ msgstr "科目余额为0的科目也显示"
+
+#~ msgid "Select Period"
+#~ msgstr "选会计期间"
+
+#~ msgid "x Bank Journal"
+#~ msgstr "x银行分类帐"
+
+#~ msgid "x Expenses Journal"
+#~ msgstr "x费用分类帐"
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index 732130f026a..894d9ae402c 100644
--- a/addons/account_analytic_analysis/i18n/et.po
+++ b/addons/account_analytic_analysis/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 15:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-19 13:21+0000\n"
+"Last-Translator: bushido <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -21,7 +21,7 @@ msgstr ""
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr ""
+msgstr "Arveldatavate tundide arv pluss juba arveldatud tunnid."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 07a64fd7d85..94970da08e8 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:52+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-19 10:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -21,113 +21,113 @@ msgstr ""
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr "可开据加已开据的小时数"
+msgstr "小时数能加在已开的发票上"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours summary by user"
-msgstr "按用户汇总小时数"
+msgstr "用户的小时数合计"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr "最后开据时间"
+msgstr "最近开票日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr "计算公式: 最大开据价格 - 已开据总计"
+msgstr "计算公式为:最高发票价格 -  发票金额"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "使用以下公式计算: 最大数量 - 总时间"
+msgstr "计算公式为:最大数量 - 小时合计"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
 msgid "All Analytic Accounts"
-msgstr "所有分析科目列表"
+msgstr "所有辅助核算项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
 msgid "My Current Accounts"
-msgstr "我的当前科目列表"
+msgstr "我当前的项目"
 
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "这辅助核算项目的最近开票日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theorical Revenue"
-msgstr "理论收益"
+msgstr "理论收入"
 
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
+msgstr "计算公式为:收入 - 总成本"
 
 #. module: account_analytic_analysis
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
 msgid "New Analytic Account"
-msgstr ""
+msgstr "新的辅助核算项目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
-msgstr ""
+msgstr "理论利润"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "实际利润(%)"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
 msgid "Current Analytic Accounts"
-msgstr "当前分析科目列表"
+msgstr "当前辅助核算项目"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "这科目的最近的工作完成日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
-msgstr ""
+msgstr "如果是成本发票,最近工作或成本的时间已开出的发票"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "计价折扣"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr "最后工作日期"
+msgstr "最近的成本/工作 日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -139,12 +139,12 @@ msgstr "总成本"
 msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
-msgstr "在当前核算项目上的工时数。根据类型为总账的凭证计算而来。"
+msgstr "你的小时数在辅助核算项目(根据时间表).它计算所有普通分类帐."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "剩余小时数"
+msgstr "剩余的小时数"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -152,7 +152,7 @@ msgid ""
 "Based on the costs you had on the project, what would have been the revenue "
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
-msgstr "根据项目的当前成本测算出来的利润，这些成本对应的收入是按价格表中的一般销售单价计算出来的。"
+msgstr "如果所有这些成本开发票按普通销售价目表.你项目的成本,将按这计算收入."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -164,24 +164,24 @@ msgstr "用户"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
 msgid "My Pending Accounts"
-msgstr ""
+msgstr "我未决的项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr "未开发票条目"
+msgstr "我未开票项目"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "计算公式：发票数量 - 总成本"
+msgstr "计算公式为:发票金额 - 总成本"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr "我的科目列表"
+msgstr "我的项目"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -190,16 +190,18 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
+"修改核算到显示服务公司的项目管理主要时间\n"
+"添加菜单显示每个管理的有关信息"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr "未开发票工时"
+msgstr "未开票小时数"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Hours Tot"
-msgstr "工时总计"
+msgstr "总小时"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_account
@@ -214,17 +216,17 @@ msgstr "核算项目报表"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "已开票数量"
+msgstr "已开票金额"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
 msgid "Financial Project Management"
-msgstr ""
+msgstr "财务项目管理"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "最后开票日期"
+msgstr "最近的发票成本日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -235,12 +237,12 @@ msgstr "未开票金额"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
 msgid "Pending Analytic Accounts"
-msgstr "未决分析科目列表"
+msgstr "未决的辅助核算项目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
-msgstr "已开票小时数"
+msgstr "已开票小时"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -250,51 +252,51 @@ msgstr "实际利润"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "这科目的客户发票合计"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr "按月汇总工时数"
+msgstr "月的小时数合计"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr "计算公式： (实际利润 / 总成本) * 100."
+msgstr "计算公式为:(实际利润/总成本×100)"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
 msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
-msgstr ""
+msgstr "如果你的发票基于这辅助核算项目"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "剩余的收入"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
 msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
-msgstr ""
+msgstr "如果是辅助核算项目的发票,剩余金额你能给客户开基于总成本的发票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr ""
+msgstr "计算公式为:发票金额/小时合计"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "每小时收入(真实)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -306,29 +308,29 @@ msgstr "总时间"
 #: field:account.analytic.account,month_ids:0
 #: field:account_analytic_analysis.summary.month,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr ""
+msgstr "已废弃项目"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr ""
+msgstr "所有未开发票凭证"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
-msgstr ""
+msgstr "这科目的成本合计,它包括实际成本(发票)和间接成本,如花费的时间表"
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
new file mode 100644
index 00000000000..a7ca793aa59
--- /dev/null
+++ b/addons/account_analytic_default/i18n/oc.po
@@ -0,0 +1,115 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-19 09:41+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
+msgid "Analytic Defaults"
+msgstr "Analitic per defaut"
+
+#. module: account_analytic_default
+#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
+msgid "Account Analytic Default"
+msgstr "Compte Analitic per Defaut"
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_analytic_default
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Seq"
+msgstr "Seq"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Data de fin"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Entrepresa"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Produch"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distributions"
+msgstr "Distribucions Analiticas"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Utilizaire"
+
+#. module: account_analytic_default
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Escrituras"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "Data de començament"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Condicions"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr "Règlas Analiticas"
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index c2da43c8346..a20701c0aae 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 03:48+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,23 +21,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "默认辅助核算科目"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
-msgstr ""
+msgstr "默认科目辅助核算"
 
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "这对象名必须以x_开头并且不能包含特殊的字符!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -47,42 +47,42 @@ msgstr ""
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算科目"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distributions"
-msgstr ""
+msgstr "辅助核算分配"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "动作定义里模块名无效"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
@@ -92,21 +92,21 @@ msgstr "条目"
 #. module: account_analytic_default
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr ""
+msgstr "情况"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "辅助核算规则"
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index e256477d77a..441e96e8bfe 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -4,49 +4,49 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 06:54+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr ""
+msgstr "科目4ID"
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
 #: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
 msgid "Crossovered Analytic"
-msgstr ""
+msgstr "交叉辅助核算"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr ""
+msgstr "科目5ID"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "比率(%)"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -55,128 +55,128 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr ""
+msgstr "辅助核算方案"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr ""
+msgstr "辅助核算实例明细"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
-msgstr ""
+msgstr "辅助核算分配明细"
 
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "至今为止"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr ""
+msgstr "方案ID"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
-msgstr ""
+msgstr "辅助核算分配模型"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr ""
+msgstr "科目名称"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "辅助核算分配明细"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr ""
+msgstr "分配代码"
 
 #. module: account_analytic_plans
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr ""
+msgstr "方案名"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,empty_line:0
 msgid "Dont show empty lines"
-msgstr ""
+msgstr "不要显示空行"
 
 #. module: account_analytic_plans
 #: wizard_view:wizard.crossovered.analytic,init:0
 msgid "Select Information"
-msgstr ""
+msgstr "选择信息"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "科目3ID"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "辅助核算分类帐"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,ref:0
 msgid "Analytic Account Ref."
-msgstr ""
+msgstr "辅助核算项目参考"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "辅助核算项目:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Line"
-msgstr ""
+msgstr "辅助核算方案明细"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "辅助核算项目参考:"
 
 #. module: account_analytic_plans
 #: model:ir.actions.wizard,name:account_analytic_plans.create_model
 msgid "Create Model"
-msgstr ""
+msgstr "创建模型"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "默认凭证"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -184,42 +184,42 @@ msgstr ""
 #: field:account.journal,plan_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 msgid "Analytic Plans"
-msgstr ""
+msgstr "辅助核算方案"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "最小允许(%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "科目1ID"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
-msgstr ""
+msgstr "最大允许(%)"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
 msgid "Distribution Model Saved"
-msgstr ""
+msgstr "分配模型保存"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr ""
+msgstr "核算方案实例"
 
 #. module: account_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "分配模型"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -255,88 +255,115 @@ msgid ""
 "for one account entry.\n"
 "        "
 msgstr ""
+"这模块允许使用几个辅助核算方案并根据他们生成分类帐\n"
+"\t所以当开发票或确认凭证时\n"
+"建立多个辅助核算明细\n"
+"\t\n"
+"\t例子:你可以定义以下辅助核算结构:\n"
+"\t项目\n"
+"\t\t项目1\n"
+"\t\t\t子项目1.1  \n"
+"\t\t\t子项目1.2  \n"
+"\t\t项目2\n"
+"\t业务员\n"
+"\t\t小李\n"
+"\t\t小张\n"
+"\n"
+"这里我们有两个项目和业务员.发票必须能够写如：两项目和业务员辅助核算凭证,金额也可以分割.下面的例子是发票涉及两个项目和一个业务员.\n"
+"\n"
+"\n"
+"\t方案1:\n"
+"\t\t子项目1.1  :50%\n"
+"\t\t子项目1.2  :50%\n"
+"\n"
+"\t方案2:\n"
+"\t\t小李:100%\n"
+"\t\n"
+"\t因此当这发票的明细确认时\n"
+"将产生3个辅助核算明细\n"
+"        "
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "辅助核算会计的多方案管理"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Lines"
-msgstr ""
+msgstr "辅助核算方案明细"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Crossovered Analytic -"
-msgstr ""
+msgstr "交叉辅助核算-"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr ""
+msgstr "模型方案"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "科目2ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr ""
+msgstr "这方案的根辅助核算项目"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "科目6ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "科目ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr ""
+msgstr "代码"
 
 #. module: account_analytic_plans
 #: wizard_button:create.model,info,end:0
 msgid "OK"
-msgstr ""
+msgstr "确定"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "根辅助核算项目"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
 msgid ""
 "This distribution model has been saved. You will be able to reuse it later."
-msgstr ""
+msgstr "这分配模型已经保存.你将在以后能重复使用"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -345,29 +372,29 @@ msgstr ""
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "辅助核算分配"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
 msgid "Analytic Distribution's models"
-msgstr ""
+msgstr "辅助核算分配模型"
 
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date1:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr ""
+msgstr "在"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "根据日期"
diff --git a/addons/account_balance/i18n/zh_CN.po b/addons/account_balance/i18n/zh_CN.po
index a4fec5d3318..b3943aef95e 100644
--- a/addons/account_balance/i18n/zh_CN.po
+++ b/addons/account_balance/i18n/zh_CN.po
@@ -4,96 +4,96 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 06:56+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "显示借方/贷方信息"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "所有科目"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "凭证选择基于"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "通知"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "财务会计期间"
 
 #. module: account_balance
 #: model:ir.actions.report.xml,name:account_balance.account_account_balance
 #: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
 msgid "Account balance"
-msgstr "科目余额"
+msgstr "科目结余"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Name"
-msgstr ""
+msgstr "科目名称"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,checkyear:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "选择会计期间"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分率"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "选定比较年份"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "选择会计年度度(最大值为三年)"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "选择参考科目(为比较)"
 
 #. module: account_balance
 #: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "科目结余年度比较"
 
 #. module: account_balance
 #: model:ir.module.module,description:account_balance.module_meta_information
@@ -116,152 +116,161 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"科目结余模块是一附加的财务管理模块\n"
+"    \n"
+"\t该模块为你提供各种可选择打印的资产负债表\n"
+"\t1.你能比较资产负债表的不同年份.\n"
+"\t2.你能设置两年的现金或百分比比较\n"
+"\t3.你能设置特别年份的参考科目的百分比比较\n"
+"\t4.你能选择会计期间的实际日期或在会计期间创建日期\n"
+"\t5.你可以选择打印要求的报表\n"
+"    "
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "请勾选此项你能选择‘规定格式’选项"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "显示固定格式的报表"
 
 #. module: account_balance
 #: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "留空为所有会计期间"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "余额不为0"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "合计:"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "科目结余-"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "显示对比在 %"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr ""
+msgstr "选择会计期间"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "报表选项"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "进展"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,backtoinit,end:0
 #: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "确定"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "现金"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "不比较"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "显示科目"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Credit"
-msgstr ""
+msgstr "贷方"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "你必须要选择多于3年."
 
 #. module: account_balance
 #: model:ir.module.module,shortdesc:account_balance.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "会计和财务管理-科目比较"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "会计年度:"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "请勾选此项你最多能选择3年"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "余额"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
-msgstr ""
+msgstr "你已经选择‘百分率’选项这要2年以上.你没选择规定格式."
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
-msgstr ""
+msgstr "你可能犯以下错误.请纠正后再试."
 
 #. module: account_balance
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "留空为比较其母公司"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "会计年度"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
-msgstr ""
+msgstr "你尚未选择‘百分率’选项你要选择2年以上."
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "会计期间"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -269,19 +278,22 @@ msgid ""
 "You may have selected the compare options with more than 1 year with "
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
-msgstr ""
+msgstr "你必须要选择比较选项一年以上的借方/贷方栏和%选项这才能产生打印的内容请再试."
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "你至少要选择一个会计年度再试"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "自定义报表"
+
+#~ msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+#~ msgstr "如果你不选择会计年度将提取所有会计年度"
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 70c01c0dfaf..d5576579283 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -4,44 +4,44 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:31+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 06:58+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "负责用户"
+msgstr "责任用户"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "% performance"
-msgstr ""
+msgstr "% 执行%"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr "预算状况"
+msgstr "预算位于"
 
 #. module: account_budget
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr "打印于："
+msgstr "打印在:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -51,13 +51,13 @@ msgstr "确认"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "确认用户"
 
 #. module: account_budget
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -67,7 +67,7 @@ msgstr "已确认"
 #. module: account_budget
 #: field:account.budget.post.dotation,period_id:0
 msgid "Period"
-msgstr "期间"
+msgstr "会计期间"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
@@ -75,12 +75,12 @@ msgstr "期间"
 #: wizard_field:wizard.crossovered.budget,init,date_to:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
 msgid "End of period"
-msgstr "期末"
+msgstr "会计期间结束"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Printing date:"
-msgstr "打印时间："
+msgstr "打印日期:"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -92,44 +92,44 @@ msgstr "草稿"
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "at"
-msgstr ""
+msgstr "在"
 
 #. module: account_budget
 #: view:account.budget.post:0
 msgid "Dotations"
-msgstr ""
+msgstr "给予"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Performance"
-msgstr ""
+msgstr "执行"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Currency:"
-msgstr "货币："
+msgstr "货币:"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "From"
-msgstr ""
+msgstr "从"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Results"
-msgstr ""
+msgstr "结果"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
@@ -160,6 +160,24 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"这模块允许会计管理辅助核算和交叉预算\n"
+"\n"
+"一旦在财务上定义主预算和预算\n"
+"(在财务管理/预算),项目经理可以设置\n"
+"每个辅助核算项目的计划金额.\n"
+"\n"
+"会计有可能看到每个已计划总金额\n"
+"确保总的已计划金额\n"
+"不低于或高于每个列表计划的预算和主要预算.\n"
+"每个记录列表能转为图形显示\n"
+"\n"
+"三个报表都可以:\n"
+"1.首先是可得到预算列表.它提供延伸对这些预算每个主要的预算辅助核算项目.\n"
+"\n"
+"2.其次是前面的摘要它只提供每个预算的主预算选择辅助核算项目的延伸.\n"
+"\n"
+"3.最后一个可用的辅助核算项目表.它提供每个预算的主预算选择的辅助核算项目的延伸.\n"
+"\n"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -171,12 +189,12 @@ msgstr ""
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "辅助核算项目:"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,report:0
@@ -196,94 +214,94 @@ msgstr ""
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "to"
-msgstr ""
+msgstr "到"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 #: rml:crossovered.budget.report:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "已计划的金额"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "百分比(%)"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Period Budget"
-msgstr ""
+msgstr "会计期间预算"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Analysis"
-msgstr ""
+msgstr "预算核算"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Validate"
-msgstr ""
+msgstr "确认"
 
 #. module: account_budget
 #: wizard_view:wizard.crossovered.budget,init:0
 #: wizard_view:wizard.crossovered.budget.summary,init:0
 msgid "Select Options"
-msgstr ""
+msgstr "选择可选择项"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 #: rml:crossovered.budget.report:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "实际金额"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: account_budget
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "理论金额"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
 #: field:account.budget.post.dotation,name:0
 #: field:crossovered.budget,name:0
 msgid "Name"
-msgstr "科目名称"
+msgstr "名称"
 
 #. module: account_budget
 #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
 msgid "Print Summary of Budgets"
-msgstr ""
+msgstr "打印预算合计"
 
 #. module: account_budget
 #: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
 msgid "Spread amount"
-msgstr ""
+msgstr "延伸金额"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -316,7 +334,7 @@ msgstr "金额"
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "支付日期"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
@@ -328,30 +346,30 @@ msgstr "预算"
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 #: model:ir.model,name:account_budget.model_account_budget_post_dotation
 msgid "Budget Dotation"
-msgstr ""
+msgstr "预算给予"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 msgid "Budget Dotations"
-msgstr ""
+msgstr "预算给予"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
-msgstr ""
+msgstr "预算项详情"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr ""
+msgstr "预算位于"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date1:0
@@ -359,7 +377,7 @@ msgstr ""
 #: wizard_field:wizard.crossovered.budget,init,date_from:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
 msgid "Start of period"
-msgstr "开始日期"
+msgstr "期初日期"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
@@ -367,34 +385,34 @@ msgstr "开始日期"
 #: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
 #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
 msgid "Print Budgets"
-msgstr ""
+msgstr "打印预算"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
 #: field:crossovered.budget,code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,tot_planned:0
 msgid "Total Planned Amount"
-msgstr ""
+msgstr "计划金额合计"
 
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"
-msgstr ""
+msgstr "选择会计期间日期"
 
 #. module: account_budget
 #: field:account.budget.post,dotation_ids:0
 msgid "Spreading"
-msgstr ""
+msgstr "延伸"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "理论金额"
 
 #. module: account_budget
 #: wizard_field:account.budget.spread,init,fiscalyear:0
@@ -404,12 +422,12 @@ msgstr "会计年度"
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: account_budget
 #: rml:crossovered.budget.report:0
 msgid "Budget :"
-msgstr ""
+msgstr "预算:"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -417,7 +435,7 @@ msgstr ""
 #: wizard_view:account.budget.spread,init:0
 #: wizard_button:account.budget.spread,init,spread:0
 msgid "Spread"
-msgstr ""
+msgstr "延伸"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -428,7 +446,7 @@ msgstr "科目"
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 msgid "Print Budget"
-msgstr "打印预算表"
+msgstr "打印预算"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -443,7 +461,7 @@ msgstr "打印预算表"
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr ""
+msgstr "预算明细"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,end:0
@@ -458,26 +476,26 @@ msgstr "取消"
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
 msgid "Budget Management"
-msgstr ""
+msgstr "预算管理"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "辅助核算从"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "确认"
 
 #. module: account_budget
 #: wizard_view:account.budget.report,init:0
 msgid "Select period"
-msgstr "选择期间"
+msgstr "选择会计期间"
diff --git a/addons/account_chart/i18n/zh_CN.po b/addons/account_chart/i18n/zh_CN.po
index b1c22fd3747..0db91de6f32 100644
--- a/addons/account_chart/i18n/zh_CN.po
+++ b/addons/account_chart/i18n/zh_CN.po
@@ -4,19 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 15:49+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:00+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "去除最小化的会计科目表"
+msgstr "删除最小科目表"
+
+#~ msgid "Charts of Accounts"
+#~ msgstr "科目表"
diff --git a/addons/account_date_check/i18n/zh_CN.po b/addons/account_date_check/i18n/zh_CN.po
index 310e98da4e3..aa05247c31f 100644
--- a/addons/account_date_check/i18n/zh_CN.po
+++ b/addons/account_date_check/i18n/zh_CN.po
@@ -4,29 +4,50 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:45+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:01+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构XML文件!"
 
 #. module: account_date_check
 #: field:account.journal,allow_date:0
 msgid "Allows date not in the period"
-msgstr ""
+msgstr "允许日期不在这会计期间"
 
 #. module: account_date_check
 #: model:ir.module.module,shortdesc:account_date_check.module_meta_information
 msgid "Account Date check"
-msgstr ""
+msgstr "科目日期检查"
+
+#~ msgid ""
+#~ "\n"
+#~ "    * Adds a field on journals: \"Allows date not in the period\"\n"
+#~ "    * By default, this field is checked.\n"
+#~ "\n"
+#~ "If this field is not checked, the system control that the date is in the\n"
+#~ "period when you create an account entry. Otherwise, it generates an\n"
+#~ "error message: \"The date of your account move is not in the defined\n"
+#~ "period !\"\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    * 在分类帐增加一个字段:允许日期不在会计期间\n"
+#~ "    * 默认下这字段是已检查\n"
+#~ "\n"
+#~ "    如果这字段是不检查,系统日期是在这会计期间\n"
+#~ "你能创建凭证.\n"
+#~ "否则,它会产生一个错误信息:\n"
+#~ "你不能在这会计期间凭证\n"
+#~ "    "
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index df4c9c195e3..56ab376f02e 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -4,209 +4,209 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:49+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 07:04+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+msgstr "打印日期:"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "客户参考:"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
 msgid "All payable entries"
-msgstr ""
+msgstr "所有应付款凭证"
 
 #. module: account_followup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "已打印消息"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Amount In Currency"
-msgstr ""
+msgstr "金额"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Due"
-msgstr ""
+msgstr "应付款"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "借方合计"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s:用户名 %(user_signature)"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Select partners"
-msgstr ""
+msgstr "选择业务伙伴"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "跟进"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Email Settings"
-msgstr ""
+msgstr "电子邮件设置"
 
 #. module: account_followup
 #: field:account_followup.stat,account_type:0
 msgid "Account Type"
-msgstr ""
+msgstr "科目类型"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Ref"
-msgstr ""
+msgstr "参考"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "应付总金额:%(followup_amount)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "当前日期:%(date)s"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr ""
+msgstr "最近跟进"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr ""
+msgstr "跟进"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,init,date:0
 msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "跟进发送日期"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,description:0
 #: rml:account_followup.followup.print:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Balance:"
-msgstr ""
+msgstr "余额:"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "VAT:"
-msgstr ""
+msgstr "增值税:"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "发票日期"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,email_subject:0
 msgid "Email Subject"
-msgstr ""
+msgstr "电子邮件主题"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Paid"
-msgstr ""
+msgstr "已付"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(line)s: Account Move lines"
-msgstr ""
+msgstr "凭证明细:%(line)s"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 msgid "Latest followup"
-msgstr ""
+msgstr "最近跟进"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr ""
+msgstr "业务伙伴凭证"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Ups Criteria"
-msgstr ""
+msgstr "跟进条件"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "业务伙伴选择"
 
 #. module: account_followup
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构XML文件!"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr ""
+msgstr "条件类型"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,init:0
 msgid "Follow-up and Date Selection"
-msgstr ""
+msgstr "跟进和日期选择"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Select partners to remind"
-msgstr ""
+msgstr "给业务伙伴一个提醒电子邮件"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -230,123 +230,130 @@ msgid ""
 "Best Regards,\n"
 "\t\t\t"
 msgstr ""
+"\n"
+"您好 %(partner_name)s\n"
+"\n"
+"如果不是我们出错,这货款应该未付,请采取适当措施,以便在未来8天支付这货款\n"
+"\n"
+"如有疑问请联系我们\n"
+"\t\t\t"
 
 #. module: account_followup
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
 msgid "Ok"
-msgstr ""
+msgstr "确定"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
 msgid "First move"
-msgstr ""
+msgstr "首先"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr ""
+msgstr "月末"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "公司名称:%(company_currency)s"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
 msgid "All receivable entries"
-msgstr ""
+msgstr "所有应收款"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Lines"
-msgstr ""
+msgstr "明细"
 
 #. module: account_followup
 #: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
 #: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
 msgid "Send followups"
-msgstr ""
+msgstr "发送跟进"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr ""
+msgstr "跟进期限"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "贷方"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup statistics"
-msgstr ""
+msgstr "跟进统计"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,init,next:0
 msgid "Continue"
-msgstr ""
+msgstr "继续"
 
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "会计跟进管理"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,summary:0
 #: wizard_field:account_followup.followup.print.all,summary,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "概要"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr ""
+msgstr "跟进明细"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "客户科目报表"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr ""
+msgstr "跟进明细"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "当前公司:%(company_currency)s"
 
 #. module: account_followup
 #: field:account_followup.stat,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "余额"
 
 #. module: account_followup
 #: help:account_followup.followup.print.all,init,date:0
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
+msgstr "这字段允许你选择一个预定计划日期去跟进"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "贷方合计"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -376,12 +383,12 @@ msgstr ""
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Sub-Total:"
-msgstr ""
+msgstr "小计"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr ""
+msgstr "净天数"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -390,28 +397,28 @@ msgstr ""
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
 msgid "Follow-Ups"
-msgstr ""
+msgstr "跟进"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 #: wizard_field:account_followup.followup.print.all,next,email_body:0
 msgid "Email body"
-msgstr ""
+msgstr "电子邮件内容"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 msgid "Last move"
-msgstr ""
+msgstr "最后"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Maturity"
-msgstr ""
+msgstr "到期"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr ""
+msgstr "跟进报表"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -433,48 +440,57 @@ msgid ""
 "Best Regards,\n"
 "\t\t\t"
 msgstr ""
+"\n"
+"%(partner_name)\n"
+" \n"
+" 尽管我们多次催问,但你的账户仍然还没解决\n"
+" \n"
+" 在未来8天如果还不全额支付,我们将采取法律行动,请恕我不另行通知\n"
+"\n"
+" 如有疑问请联系我们\n"
+"\t\t\t"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "到期日期"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Legend"
-msgstr ""
+msgstr "说明"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "%(heading):凭证明细的头"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(partner_name)s: Partner name"
-msgstr ""
+msgstr "业务伙伴名称:%(partner_name)s"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,email_conf:0
 msgid "Send email confirmation"
-msgstr ""
+msgstr "确认发送电子邮件"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,init,followup_id:0
 msgid "Follow-up"
-msgstr ""
+msgstr "跟进"
 
 #. module: account_followup
 #: field:account_followup.stat,name:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,init,end:0
@@ -485,9 +501,61 @@ msgstr "取消"
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Days of delay"
-msgstr ""
+msgstr "拖延天数"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,next,print:0
 msgid "Print Follow Ups & Send Mails"
-msgstr ""
+msgstr "打印跟进&发送电子邮件"
+
+#~ msgid "Follow-up Message"
+#~ msgstr "跟进消息"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Modules to automate letters for unpaid invoices, with multi-level "
+#~ "recalls.\n"
+#~ "\n"
+#~ "    You can define your multiple levels of recall through the menu:\n"
+#~ "        Financial Management/Configuration/Payment Terms/Follow-Ups\n"
+#~ "\n"
+#~ "    Once it's defined, you can automatically prints recall every days\n"
+#~ "    through simply clicking on the menu:\n"
+#~ "        Financial_Management/Periodical_Processing/Print_Follow-Ups\n"
+#~ "\n"
+#~ "    It will generate a PDF with all the letters according the the\n"
+#~ "    different levels of recall defined. You can define different policies\n"
+#~ "    for different companies.\n"
+#~ "\n"
+#~ "\n"
+#~ "    Note that if you want to change the followup level for a given "
+#~ "partner/account entry, you can do it in the menu:\n"
+#~ "        Financial_Management/Reporting/Follow-Ups/All Receivable Entries\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "    模块能自动发送未支付的发票和多次跟进\n"
+#~ "\n"
+#~ "你能在菜单定义的多层重复提醒:\n"
+#~ "财务管理/设置/付款条件/跟进\n"
+#~ "\n"
+#~ "一旦确定,你就能自动地打印每日的重复提醒事件,\n"
+#~ "通过简单点击菜单:\n"
+#~ "          财务管理/期间处理/打印跟进\n"
+#~ "\n"
+#~ "它将产生一定义的不同级别自动提醒的财务信函的PDF.\n"
+#~ "你能定义不同公司的不同格式\n"
+#~ "针对不同公司\n"
+#~ "\n"
+#~ "\n"
+#~ "注意:如果你想要变更一业务伙伴/凭证的跟进级别,你可以在菜单:\n"
+#~ "          财务管理/报表/跟进/所有应收账款凭证\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Do not change message text, if you want to send email in partner language, "
+#~ "or configre from company"
+#~ msgstr "如果你想在发送的电子邮件中用业务伙伴的语言,请不要改变着消息的文本"
+
+#~ msgid "Send Email in Partner Language"
+#~ msgstr "发送到业务伙伴Email的语言"
diff --git a/addons/account_invoice_layout/i18n/zh_CN.po b/addons/account_invoice_layout/i18n/zh_CN.po
index 66b8f542666..17d42056726 100644
--- a/addons/account_invoice_layout/i18n/zh_CN.po
+++ b/addons/account_invoice_layout/i18n/zh_CN.po
@@ -4,115 +4,115 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Sub Total"
-msgstr ""
+msgstr "小计"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Invoice Date:"
-msgstr ""
+msgstr "发票日期:"
 
 #. module: account_invoice_layout
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "取消发票"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 #: field:notify.message,name:0
 msgid "Title"
-msgstr ""
+msgstr "标题"
 
 #. module: account_invoice_layout
 #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
 msgid "Invoices with Layout and Message"
-msgstr ""
+msgstr "带消息的发票式样"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "折扣(%)"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "(Incl. taxes):"
-msgstr ""
+msgstr "含税:"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: account_invoice_layout
 #: wizard_button:wizard.notify_message,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: account_invoice_layout
 #: help:notify.message,msg:0
 msgid ""
 "This notification will appear at the bottom of the Invoices when printed."
-msgstr ""
+msgstr "此通知将在打印在发票底部"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Unit Price"
-msgstr ""
+msgstr "单价"
 
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
 msgid "Notify By Messages"
-msgstr ""
+msgstr "通知信息"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
 
 #. module: account_invoice_layout
 #: field:account.invoice,abstract_line_ids:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "发票明细"
 
 #. module: account_invoice_layout
 #: view:account.invoice.line:0
 msgid "Seq."
-msgstr ""
+msgstr "序号"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
 msgid "Notification Message"
-msgstr ""
+msgstr "通知信息"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "客户参考"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -122,12 +122,12 @@ msgstr ""
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Price"
-msgstr ""
+msgstr "打印"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -137,137 +137,137 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Taxes:"
-msgstr ""
+msgstr "税:"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,functional_field:0
 msgid "Source Account"
-msgstr ""
+msgstr "源科目"
 
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "写信息"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Base"
-msgstr ""
+msgstr "基于"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Fax :"
-msgstr ""
+msgstr "传真:"
 
 #. module: account_invoice_layout
 #: field:notify.message,msg:0
 msgid "Special Message"
-msgstr ""
+msgstr "特别消息"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
 msgid "Write a notification or a wishful message."
-msgstr ""
+msgstr "写通知或一愿望的信息"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Tel. :"
-msgstr ""
+msgstr "电话:"
 
 #. module: account_invoice_layout
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Page Break"
-msgstr ""
+msgstr "分页符"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Document:"
-msgstr ""
+msgstr "票据:"
 
 #. module: account_invoice_layout
 #: wizard_view:wizard.notify_message,init:0
 msgid "Select Message"
-msgstr ""
+msgstr "选择消息"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
 msgid "Messages"
-msgstr ""
+msgstr "信息"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
 msgid "Invoices with Layout"
-msgstr ""
+msgstr "发票式样"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "说明 / 税"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description/Taxes"
-msgstr ""
+msgstr "说明 / 税"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "发票草稿"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,sequence:0
 msgid "Sequence Number"
-msgstr ""
+msgstr "序号"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Refund"
-msgstr ""
+msgstr "退货"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "VAT :"
-msgstr ""
+msgstr "增值税"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Separator Line"
-msgstr ""
+msgstr "分割线"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "供应商发票"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "备注:"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Tax"
-msgstr ""
+msgstr "税"
 
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
@@ -277,34 +277,63 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "(不含税):"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: account_invoice_layout
 #: wizard_button:wizard.notify_message,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "供应商退货"
 
 #. module: account_invoice_layout
 #: wizard_field:wizard.notify_message,init,message:0
 msgid "Message"
-msgstr ""
+msgstr "信息"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"
-msgstr ""
+msgstr "所有通知信息"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module provides some features to improve the layout of the "
+#~ "invoices.\n"
+#~ "\n"
+#~ "    It gives you the possibility to\n"
+#~ "        * order all the lines of an invoice\n"
+#~ "        * add titles, comment lines, sub total lines\n"
+#~ "        * draw horizontal lines and put page breaks\n"
+#~ "\n"
+#~ "    Moreover, there is one option which allow you to print all the selected "
+#~ "invoices with a given special message at the bottom of it. This feature can "
+#~ "be very useful for printing your invoices with end-of-year wishes, special "
+#~ "punctual conditions...\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块允许你改进发票的格式\n"
+#~ "\n"
+#~ "    它给出以下的可能:\n"
+#~ "\t    * 所有的发票明细\n"
+#~ "\t    * 增加标题,注释行,子行标题\n"
+#~ "\t    * 画水平线和加入分页符\n"
+#~ "\t\n"
+#~ "此外,还有一个选择项,让你打印所有选择发票时在底部有一个提别的信息,这功能对年终发票特别是要求准时支付提醒时有用\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 7eb79f01087..224a9ef3edb 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -4,27 +4,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 04:00+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
 #: field:payment.order,date_planned:0
 msgid "Scheduled date if fixed"
-msgstr ""
+msgstr "预定日期如果是固定"
 
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr ""
+msgstr "业务伙伴货币"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -34,107 +34,107 @@ msgstr "设为草稿"
 #. module: account_payment
 #: help:payment.order,mode:0
 msgid "Select the Payment Mode to be applied."
-msgstr ""
+msgstr "选择使用的付款方式"
 
 #. module: account_payment
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_payment
 #: view:payment.line:0
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr ""
+msgstr "自己的账号"
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
 msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
-msgstr ""
+msgstr "该金额应在当前日期支付扣减付款单"
 
 #. module: account_payment
 #: help:payment.line,date:0
 msgid ""
 "If no payment date is specified, the bank will treat this payment line "
 "directly"
-msgstr ""
+msgstr "如果没有指定付款日期将直接由银行付款"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr ""
+msgstr "首选日期"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr ""
+msgstr "自由"
 
 #. module: account_payment
 #: wizard_field:populate_payment,search,entries:0
 msgid "Entries"
-msgstr ""
+msgstr "凭证"
 
 #. module: account_payment
 #: wizard_field:populate_payment,init,duedate:0
 msgid "Due Date"
-msgstr ""
+msgstr "到期日期"
 
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "凭证明细"
 
 #. module: account_payment
 #: wizard_button:populate_payment,search,create:0
 msgid "_Add to payment order"
-msgstr ""
+msgstr "增加到付款单"
 
 #. module: account_payment
 #: rml:payment.order:0
 #: view:payment.order:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: account_payment
 #: rml:payment.order:0
 msgid "Execution date:"
-msgstr ""
+msgstr "执行日期:"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr ""
+msgstr "公司货币的合计"
 
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "取消"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new
 msgid "New Payment Order"
-msgstr ""
+msgstr "新付款单"
 
 #. module: account_payment
 #: rml:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "参考"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
 msgid "Payment Orders"
-msgstr ""
+msgstr "付款单"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Directly"
-msgstr ""
+msgstr "直接"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -142,70 +142,70 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment Line"
-msgstr ""
+msgstr "付款明细"
 
 #. module: account_payment
 #: field:payment.type,suitable_bank_types:0
 msgid "Suitable bank types"
-msgstr ""
+msgstr "合适的银行类型"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Amount Total"
-msgstr ""
+msgstr "金额合计"
 
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "确认"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
 msgid "Invoice Effective Date"
-msgstr ""
+msgstr "发票有效日期"
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
 msgid "Payment lines"
-msgstr ""
+msgstr "付款明细"
 
 #. module: account_payment
 #: help:payment.order,date_planned:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr ""
+msgstr "如果你选择的优先日期是固定的选择一个日期"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Structured"
-msgstr ""
+msgstr "规范"
 
 #. module: account_payment
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr ""
+msgstr "交易信息"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
 #: view:payment.mode:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "付款方式"
 
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr ""
+msgstr "有效日期"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
 msgid "Invoice Ref."
-msgstr ""
+msgstr "发票参考"
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
@@ -213,142 +213,142 @@ msgid ""
 "Choose an option for the Payment Order:'Fixed' stands for a date specified "
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
-msgstr ""
+msgstr "选择付款单选项‘固定’由你指定一个指定的日期.‘直接’直接执行.‘预定日期’指定一个时间表的日期执行."
 
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "借方合计"
 
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "执行日期"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr ""
+msgstr "固定日期"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
 msgid "Destination Account"
-msgstr ""
+msgstr "目标科目"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Desitination Account"
-msgstr ""
+msgstr "目标账号"
 
 #. module: account_payment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: account_payment
 #: wizard_button:populate_payment,init,end:0
 #: wizard_button:populate_payment,search,end:0
 #: wizard_button:populate_statement,init,end:0
 msgid "_Cancel"
-msgstr "取消(_C)"
+msgstr "取消"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "创建"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
-msgstr ""
+msgstr "当前金额合计"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr ""
+msgstr "付款"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr ""
+msgstr "沟通类型"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
 msgid "Payment Management"
-msgstr ""
+msgstr "付款管理"
 
 #. module: account_payment
 #: field:payment.line,communication:0
 msgid "Communication"
-msgstr ""
+msgstr "沟通"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr ""
+msgstr "到期日期"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
 msgid "Amount to be paid"
-msgstr ""
+msgstr "应支付金额"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
-msgstr ""
+msgstr "主要业务伙伴地址"
 
 #. module: account_payment
 #: help:payment.mode,name:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "付款方式"
 
 #. module: account_payment
 #: view:payment.type:0
 #: help:payment.type,name:0
 msgid "Payment Type"
-msgstr ""
+msgstr "付款类型"
 
 #. module: account_payment
 #: help:payment.line,amount_currency:0
 msgid "Payment amount in the partner currency"
-msgstr ""
+msgstr "在业务伙伴货币的货币金额"
 
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
 #: rml:payment.order:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr ""
+msgstr "沟通的消息"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr ""
+msgstr "客户订单地址"
 
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "贷方合计"
 
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
 msgid "Populate payment"
-msgstr ""
+msgstr "填写付款"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
@@ -359,170 +359,170 @@ msgstr "付款明细"
 #. module: account_payment
 #: rml:payment.order:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: account_payment
 #: rml:payment.order:0
 msgid "Reference:"
-msgstr ""
+msgstr "参考"
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
 msgid ""
 "This Entry Line will be referred for the information of the ordering "
 "customer."
-msgstr ""
+msgstr "这凭证明细将在这客户订单作为参考信息"
 
 #. module: account_payment
 #: field:payment.line,date:0
 msgid "Payment Date"
-msgstr ""
+msgstr "付款日期"
 
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "到期日期"
 
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import payment lines"
-msgstr ""
+msgstr "进项付款明细"
 
 #. module: account_payment
 #: help:payment.type,code:0
 msgid "Specify the Code for Payment Type"
-msgstr ""
+msgstr "指定付款类型代码"
 
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
-msgstr ""
+msgstr "支付金额"
 
 #. module: account_payment
 #: field:payment.line,amount:0
 msgid "Amount in Company Currency"
-msgstr ""
+msgstr "公司使用货币的金额"
 
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr ""
+msgstr "客户订单"
 
 #. module: account_payment
 #: field:payment.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "代码"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr ""
+msgstr "你的参考"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Payment order"
-msgstr ""
+msgstr "付款单"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "General Information"
-msgstr ""
+msgstr "一般信息"
 
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "选择发票支付"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Information"
-msgstr ""
+msgstr "信息"
 
 #. module: account_payment
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
 msgid "Pay"
-msgstr ""
+msgstr "支付"
 
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
 #: model:ir.model,name:account_payment.model_payment_order
 msgid "Payment Order"
-msgstr ""
+msgstr "付款单"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_draft
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft
 msgid "Draft Payment Order"
-msgstr ""
+msgstr "付款单草稿"
 
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
-msgstr ""
+msgstr "在公司货币的付款金额"
 
 #. module: account_payment
 #: wizard_view:populate_payment,init:0
 msgid "Search Payment lines"
-msgstr ""
+msgstr "付款明细"
 
 #. module: account_payment
 #: field:payment.line,amount_currency:0
 msgid "Amount in Partner Currency"
-msgstr ""
+msgstr "业务伙伴使用货币的金额"
 
 #. module: account_payment
 #: field:payment.line,communication2:0
 msgid "Communication 2"
-msgstr ""
+msgstr "沟通2"
 
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr ""
+msgstr "银行账号"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "付款方式的现金分类帐"
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
 #: rml:payment.order:0
 msgid "Bank account"
-msgstr ""
+msgstr "银行账号"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Confirm Payments"
-msgstr ""
+msgstr "确认付款"
 
 #. module: account_payment
 #: field:payment.line,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "公司货币"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main
@@ -530,7 +530,7 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -542,74 +542,87 @@ msgstr ""
 msgid ""
 "Used as the message between ordering customer and current company. Depicts "
 "'What do you want to say to the recipient about this order ?'"
-msgstr ""
+msgstr "用作订购客户和当前公司之间的消息.描述你在这订单想要说的?"
 
 #. module: account_payment
 #: field:payment.mode,name:0
 #: field:payment.type,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_payment
 #: wizard_button:populate_payment,init,search:0
 msgid "_Search"
-msgstr ""
+msgstr "查找"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr ""
+msgstr "凭证信息"
 
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
 msgid "Populate Statement with Payment lines"
-msgstr ""
+msgstr "填写付款明细"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
 msgid "Order"
-msgstr ""
+msgstr "付款单"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_open
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open
 msgid "Payment Orders to Validate"
-msgstr ""
+msgstr "确认付款单"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_type
 #: field:payment.mode,type:0
 msgid "Payment type"
-msgstr ""
+msgstr "付款类型"
 
 #. module: account_payment
 #: field:payment.order,total:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: account_payment
 #: wizard_button:populate_statement,init,add:0
 msgid "_Add"
-msgstr "添加(_A)"
+msgstr "增加"
 
 #. module: account_payment
 #: help:payment.mode,type:0
 msgid "Select the Payment Type for the Payment Mode."
-msgstr ""
+msgstr "选择这付款方式的付款类型"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_mode
 #: field:payment.order,mode:0
 msgid "Payment mode"
-msgstr ""
+msgstr "付款方式"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr ""
+msgstr "银行账号付款方式"
 
 #. module: account_payment
 #: field:payment.mode,journal:0
 msgid "Journal"
-msgstr ""
+msgstr "分类帐"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module provide :\n"
+#~ "    * a more efficient way to manage invoice payment.\n"
+#~ "    * a basic mechanism to easily plug various automated payment.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块提供:\n"
+#~ "    * 更有效的方式来管理发票的付款.\n"
+#~ "    * 一个基本机制来自动支付\n"
+#~ "    "
diff --git a/addons/account_report/i18n/zh_CN.po b/addons/account_report/i18n/zh_CN.po
index af808553d7a..3966d739e56 100644
--- a/addons/account_report/i18n/zh_CN.po
+++ b/addons/account_report/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-08 06:26+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -21,22 +21,22 @@ msgstr ""
 #: selection:account.report.report,type:0
 #: model:ir.model,name:account_report.model_account_report_history
 msgid "Indicator"
-msgstr "进度条"
+msgstr "指标"
 
 #. module: account_report
 #: wizard_field:print.indicators.pdf,init,file:0
 msgid "Select a PDF File"
-msgstr "选择一个 PDF 文件"
+msgstr "选择一个PDF文件"
 
 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Operators:"
-msgstr "运算符"
+msgstr "操作:"
 
 #. module: account_report
 #: field:account.report.report,parent_id:0
@@ -46,12 +46,12 @@ msgstr "上级"
 #. module: account_report
 #: field:account.report.report,disp_graph:0
 msgid "Display As Graph"
-msgstr "显示图形"
+msgstr "图形"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Debit:"
-msgstr "借方科目："
+msgstr "科目借方:"
 
 #. module: account_report
 #: selection:account.report.report,type:0
@@ -66,7 +66,7 @@ msgstr ""
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Tabular Summary"
-msgstr ""
+msgstr "一览表"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -76,12 +76,12 @@ msgstr "备注"
 #. module: account_report
 #: view:account.report.report:0
 msgid "= Goodness Indicator Limit:"
-msgstr ""
+msgstr "=良好指标范围:"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Very bad"
-msgstr ""
+msgstr "非常差"
 
 #. module: account_report
 #: field:account.report.history,val:0
@@ -92,7 +92,7 @@ msgstr "值"
 #. module: account_report
 #: view:account.report.report:0
 msgid "= Badness Indicator Limit:"
-msgstr ""
+msgstr "=不良指标范围:"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -103,27 +103,27 @@ msgstr "差"
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "选择一个指标打印为PDF"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "> Goodness Indicator Limit:"
-msgstr ""
+msgstr ">良好指标范围:"
 
 #. module: account_report
 #: field:account.report.report,badness_limit:0
 msgid "Badness Indicator Limit"
-msgstr ""
+msgstr "不良指标范围"
 
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Very Bad"
-msgstr "很差"
+msgstr "非常差"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
 msgid "Indicator history"
-msgstr ""
+msgstr "指标过去的记录"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -133,22 +133,22 @@ msgstr ""
 #. module: account_report
 #: view:account.report.report:0
 msgid "Report Amount:"
-msgstr ""
+msgstr "金额:"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.fiscal_statements
 msgid "Fiscal Statements"
-msgstr ""
+msgstr "财务报表"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,next:0
 msgid "Next"
-msgstr ""
+msgstr "下一个"
 
 #. module: account_report
 #: model:ir.module.module,shortdesc:account_report.module_meta_information
 msgid "Reporting for accounting"
-msgstr ""
+msgstr "会计报表"
 
 #. module: account_report
 #: wizard_button:print.indicators,next,print:0
@@ -164,33 +164,33 @@ msgstr "类型"
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
 msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "打印PDF指标"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Tax Code:"
-msgstr ""
+msgstr "税代码:"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Good"
-msgstr "良好"
+msgstr "好"
 
 #. module: account_report
 #: view:account.report.history:0
 msgid "Account Report History"
-msgstr "科目报表历史记录"
+msgstr "报表日志"
 
 #. module: account_report
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: account_report
 #: help:account.report.report,badness_limit:0
 msgid "This Value sets the limit of badness."
-msgstr "此值设置好坏评估标准的限制"
+msgstr "这个值设置为不良范围"
 
 #. module: account_report
 #: wizard_field:print.indicators,init,select_base:0
@@ -205,17 +205,17 @@ msgstr ""
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Credit:"
-msgstr ""
+msgstr "科目贷方:"
 
 #. module: account_report
 #: wizard_view:print.indicators,init:0
 msgid "Select the criteria based on which Indicators will be printed."
-msgstr ""
+msgstr "选择标准的指标基于将要被打印"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "< Badness Indicator Limit:"
-msgstr ""
+msgstr "<不良指标范围:"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -232,24 +232,24 @@ msgstr "备注"
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Currency:"
-msgstr "货币："
+msgstr "货币:"
 
 #. module: account_report
 #: field:account.report.report,status:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_report
 #: help:account.report.report,disp_tree:0
 msgid ""
 "When the indicators are printed, if one indicator is set with this field to "
 "True, then it will display one more graphs with all its children in tree"
-msgstr ""
+msgstr "打印指标时如果一个指标字段为真将显示一个所有子树的图形"
 
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Normal"
-msgstr ""
+msgstr "正常"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -259,32 +259,32 @@ msgstr ""
 #. module: account_report
 #: field:account.report.report,active:0
 msgid "Active"
-msgstr ""
+msgstr "有效"
 
 #. module: account_report
 #: field:account.report.report,disp_tree:0
 msgid "Display Tree"
-msgstr ""
+msgstr "显示树"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "基于会计年度"
 
 #. module: account_report
 #: model:ir.model,name:account_report.model_account_report_report
 msgid "Account reporting"
-msgstr ""
+msgstr "科目报表"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Balance:"
-msgstr ""
+msgstr "科目余额:"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Expression :"
-msgstr ""
+msgstr "表达式:"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -294,24 +294,24 @@ msgstr ""
 #. module: account_report
 #: field:account.report.report,expression:0
 msgid "Expression"
-msgstr ""
+msgstr "表达式"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Accounting reporting"
-msgstr ""
+msgstr "会计报表"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_form
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_form
 msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "新报表项公式"
 
 #. module: account_report
 #: field:account.report.report,code:0
 #: rml:accounting.report:0
 msgid "Code"
-msgstr ""
+msgstr "代码"
 
 #. module: account_report
 #: field:account.report.history,tmp:0
@@ -321,40 +321,40 @@ msgstr ""
 #. module: account_report
 #: field:account.report.history,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "会计期间"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "General"
-msgstr ""
+msgstr "普通"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Legend of operators"
-msgstr ""
+msgstr "操作说明"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,end:0
 #: wizard_button:print.indicators,next,end:0
 #: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_report
 #: field:account.report.report,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "子项"
 
 #. module: account_report
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_report
 #: help:account.report.report,goodness_limit:0
 msgid "This Value sets the limit of goodness."
-msgstr ""
+msgstr "这个值设为好范围"
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -362,7 +362,7 @@ msgstr ""
 #: wizard_view:print.indicators,init:0
 #: wizard_view:print.indicators,next:0
 msgid "Print Indicators"
-msgstr ""
+msgstr "打印指标"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -373,41 +373,41 @@ msgstr ""
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Printing date:"
-msgstr ""
+msgstr "打印日期:"
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
 msgid "Indicators in PDF"
-msgstr ""
+msgstr "指标PDF文件"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "at"
-msgstr ""
+msgstr "在"
 
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Accounting Report"
-msgstr ""
+msgstr "会计报表"
 
 #. module: account_report
 #: field:account.report.report,goodness_limit:0
 msgid "Goodness Indicator Limit"
-msgstr ""
+msgstr "良好指标范围"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
 msgid "Other reports"
-msgstr ""
+msgstr "其它报表"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid ""
 "Note: The second arguement 'fiscalyear' and 'period' are optional "
 "arguements.If the value is -1,previous fiscalyear or period is considered."
-msgstr ""
+msgstr "备注:第二参数‘会计年度’和‘会计期间’是可选参数.如果值为-1会计年度或会计期间是以前的."
 
 #. module: account_report
 #: rml:print.indicators:0
@@ -418,41 +418,41 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
 msgid "Fiscal Statements reporting"
-msgstr ""
+msgstr "财务报表"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "基于会计会计期间"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_print_indicators
 #: rml:print.indicators:0
 msgid "Indicators"
-msgstr ""
+msgstr "指标"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Print Indicators with PDF"
-msgstr ""
+msgstr "打印PDF指标"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
 msgid "Indicators reporting"
-msgstr ""
+msgstr "指标报表"
 
 #. module: account_report
 #: field:account.report.report,name:0
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_report
 #: wizard_field:print.indicators,next,base_selection:0
 msgid "Select Criteria"
-msgstr ""
+msgstr "选择标准"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -462,7 +462,7 @@ msgstr ""
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "会计年度"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -470,44 +470,44 @@ msgstr ""
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
 msgid "Custom reporting"
-msgstr ""
+msgstr "自定义报表"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "页"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "View"
-msgstr ""
+msgstr "视图"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
+msgstr "指标 -"
 
 #. module: account_report
 #: help:account.report.report,disp_graph:0
 msgid ""
 "If the field is set to True, information will be printed as a Graph, "
 "otherwise as an array."
-msgstr ""
+msgstr "如果这字段设为真信息将打印为图形否则为数组"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Return value for status"
-msgstr ""
+msgstr "状态返回值"
 
 #. module: account_report
 #: field:account.report.report,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: account_report
 #: rml:print.indicators:0
@@ -522,8 +522,10 @@ msgid ""
 "    Indicators\n"
 "    "
 msgstr ""
+"财务和会计,财务报表指标\n"
+"    "
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "Fiscal Statement"
-msgstr ""
+msgstr "财务报表"
diff --git a/addons/account_reporting/i18n/zh_CN.po b/addons/account_reporting/i18n/zh_CN.po
index 29d0966bad1..435bc6857d4 100644
--- a/addons/account_reporting/i18n/zh_CN.po
+++ b/addons/account_reporting/i18n/zh_CN.po
@@ -4,28 +4,28 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:37+0000\n"
-"Last-Translator: caih2000 <caih2000@163.com>\n"
+"PO-Revision-Date: 2010-03-20 07:15+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
 #: field:color.rml,code:0
 msgid "code"
-msgstr ""
+msgstr "代码"
 
 #. module: account_reporting
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -40,23 +40,23 @@ msgstr ""
 #. module: account_reporting
 #: field:account.report.bs,note:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: account_reporting
 #: field:account.report.bs,report_type:0
 msgid "Report Type"
-msgstr ""
+msgstr "报表类型"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
 #: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
 msgid "Balance Sheet Report"
-msgstr ""
+msgstr "科目余额表"
 
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -71,34 +71,34 @@ msgstr ""
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,report:0
 msgid "Print BalanceSheet"
-msgstr ""
+msgstr "打印科目余额表"
 
 #. module: account_reporting
 #: help:account.account.balancesheet.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "如果留空为所有会计期间"
 
 #. module: account_reporting
 #: field:account.report.bs,color_font:0
 msgid "Font Color"
-msgstr ""
+msgstr "字体颜色"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "科目和子科目报表对象"
 
 #. module: account_reporting
 #: model:ir.module.module,description:account_reporting.module_meta_information
 msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
-msgstr ""
+msgstr "财务和会计报表 资产负债表"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts"
-msgstr ""
+msgstr "科目报表对象"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -108,28 +108,28 @@ msgstr ""
 #. module: account_reporting
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: account_reporting
 #: field:account.report.bs,name:0
 #: field:color.rml,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Account reporting"
-msgstr ""
+msgstr "科目报表"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.bs_report_action_form
 msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "科目余额表格式"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -139,7 +139,7 @@ msgstr ""
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_account_report_bs
 msgid "Account reporting for Balance Sheet"
-msgstr ""
+msgstr "会计报表资产负债表"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -154,32 +154,32 @@ msgstr ""
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects Only"
-msgstr ""
+msgstr "只有报表对象"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_color_rml
 msgid "Rml Colors"
-msgstr ""
+msgstr "颜色"
 
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "资产负债表报表"
 
 #. module: account_reporting
 #: field:account.report.bs,code:0
 msgid "Code"
-msgstr ""
+msgstr "代码"
 
 #. module: account_reporting
 #: field:account.report.bs,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "上级"
 
 #. module: account_reporting
 #: field:account.report.bs,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -189,38 +189,38 @@ msgstr ""
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "会计年度"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 #: field:account.report.bs,account_id:0
 msgid "Accounts"
-msgstr ""
+msgstr "科目"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "会计期间"
 
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
 msgid "Back Color"
-msgstr ""
+msgstr "背景色"
 
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "子项"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -235,9 +235,12 @@ msgstr ""
 #. module: account_reporting
 #: field:account.report.bs,font_style:0
 msgid "Font"
-msgstr ""
+msgstr "字体"
 
 #. module: account_reporting
 #: wizard_view:account.account.balancesheet.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "自定义报表"
+
+#~ msgid "Account balance"
+#~ msgstr "科目余额表"
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
index ac4ade1519a..8709e934084 100644
--- a/addons/account_tax_include/i18n/zh_CN.po
+++ b/addons/account_tax_include/i18n/zh_CN.po
@@ -4,49 +4,60 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构XML文件!"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "价格规则"
 
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
 msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "发票和含税价"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax included"
-msgstr ""
+msgstr "含税"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "不含税"
 
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "含税价格计算代码"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "小计"
+
+#~ msgid ""
+#~ "Allow the user to work tax included prices.\n"
+#~ "Especially useful for b2c businesses.\n"
+#~ "    \n"
+#~ "This module implement the modification on the invoice form.\n"
+#~ msgstr ""
+#~ "允许用户使用含税价格\n"
+#~ "特别适用于B2C商务\n"
+#~ "\n"
+#~ "这模块使发票的格式生效\n"
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 6b66f8598c0..813ec3e420d 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -4,50 +4,50 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 17:16+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:30+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
 msgid "Opening Balance Entry"
-msgstr ""
+msgstr "期初余额凭证"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
 msgid "Bank Receipts"
-msgstr ""
+msgstr "银行收入"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Particulars"
-msgstr ""
+msgstr "细节"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "State :"
-msgstr ""
+msgstr "状态:"
 
 #. module: account_voucher
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
-msgstr ""
+msgstr "参考:"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -56,12 +56,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
 msgid "Contra Voucher"
-msgstr ""
+msgstr "反向原始凭证"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -69,7 +69,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
 msgid "Journal Voucher"
-msgstr ""
+msgstr "原始凭证分类帐"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt.drcr:0
@@ -79,28 +79,28 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: account_voucher
 #: wizard_button:account.voucher.open,init,open:0
 msgid "Open Voucher Entries"
-msgstr ""
+msgstr "打开原始凭证记录"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Line"
-msgstr ""
+msgstr "原始凭证明细"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "贷方合计"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
 #: field:account.voucher.line,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "科目"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -110,30 +110,30 @@ msgstr ""
 #. module: account_voucher
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "级"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "凭证明细"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "借方合计"
 
 #. module: account_voucher
 #: field:account.voucher,amount:0
 #: field:account.voucher.line,amount:0
 #: rml:voucher.cash_amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "收款人签字"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -145,12 +145,12 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "金额:"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -159,24 +159,24 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
 msgid "Journal Sale Voucher"
-msgstr ""
+msgstr "销售原始凭证分类帐"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
 msgid "Receipt Vouchers"
-msgstr ""
+msgstr "收入原始凭证"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 msgid "Account :"
-msgstr ""
+msgstr "科目:"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "On Account of :"
-msgstr ""
+msgstr "在科目:"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
@@ -184,30 +184,30 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
 msgid "Payment Vouchers"
-msgstr ""
+msgstr "付款原始凭证"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Create"
-msgstr ""
+msgstr "创建"
 
 #. module: account_voucher
 #: selection:account.account,type1:0
 #: selection:account.account.template,type1:0
 msgid "None"
-msgstr ""
+msgstr "无"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr ""
+msgstr "编号"
 
 #. module: account_voucher
 #: view:account.move:0
 #: field:account.voucher,state:0
 #: wizard_field:account.voucher.open,init,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: account_voucher
 #: selection:account.account,type1:0
@@ -215,81 +215,81 @@ msgstr ""
 #: selection:account.voucher.line,type:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 #: field:account.voucher.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
 msgid "Voucher Entries"
-msgstr ""
+msgstr "原始凭证记录"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "授权的签字人"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 msgid "Vouchers"
-msgstr ""
+msgstr "原始凭证"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,voucher_id:0
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
-msgstr ""
+msgstr "原始凭证"
 
 #. module: account_voucher
 #: wizard_view:account.voucher.open,init:0
 #: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open
 msgid "Open Vouchers"
-msgstr ""
+msgstr "打开原始凭证"
 
 #. module: account_voucher
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Dated :"
-msgstr ""
+msgstr "日期:"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
 msgid "Cash Receipts"
-msgstr ""
+msgstr "现金收入"
 
 #. module: account_voucher
 #: field:account.voucher,partner_id:0
 #: field:account.voucher.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
 msgid "New Bank Payment"
-msgstr ""
+msgstr "新的银行付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,payment_ids:0
 msgid "Voucher Lines"
-msgstr ""
+msgstr "原始凭证明细"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "货币"
 
 #. module: account_voucher
 #: view:account.move:0
@@ -297,27 +297,27 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "描述"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Voucher Reference"
-msgstr ""
+msgstr "原始凭证参考"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
 msgid "New Cash Receipt"
-msgstr ""
+msgstr "新的现金收入"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
 msgid "Voucher Report"
-msgstr ""
+msgstr "原始凭证报表"
 
 #. module: account_voucher
 #: field:account.account,open_bal:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "期初余额"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -325,38 +325,38 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
 msgid "Cash Receipt"
-msgstr ""
+msgstr "现金收入"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
 msgid "New Cash Payment"
-msgstr ""
+msgstr "新的现金付款"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "Optional Information"
-msgstr ""
+msgstr "其它信息"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "General Entries"
-msgstr ""
+msgstr "一般凭证"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -368,18 +368,18 @@ msgstr ""
 #: field:account.account,type1:0
 #: field:account.account.template,type1:0
 msgid "Dr/Cr"
-msgstr ""
+msgstr "借/贷"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
 msgid "Voucher Report (Cr/Dr)"
-msgstr ""
+msgstr "原始凭证报表(贷/借)"
 
 #. module: account_voucher
 #: field:account.move,voucher_type:0
 #: wizard_field:account.voucher.open,init,type:0
 msgid "Voucher Type"
-msgstr ""
+msgstr "原始凭证类型"
 
 #. module: account_voucher
 #: selection:account.account,type1:0
@@ -387,43 +387,43 @@ msgstr ""
 #: selection:account.voucher.line,type:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Credit"
-msgstr ""
+msgstr "贷方"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Through :"
-msgstr ""
+msgstr "通过:"
 
 #. module: account_voucher
 #: field:account.voucher,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "参考类型"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "原始凭证"
 
 #. module: account_voucher
 #: field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "会计期间"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
 msgid "Bank Payments"
-msgstr ""
+msgstr "银行付款"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "General Information"
-msgstr ""
+msgstr "一般信息"
 
 #. module: account_voucher
 #: wizard_field:account.voucher.open,init,period_ids:0
 msgid "Periods"
-msgstr ""
+msgstr "会计期间"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -431,52 +431,52 @@ msgstr ""
 #: wizard_button:account.voucher.open,init,end:0
 #: selection:account.voucher.open,init,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,state:0
 #: selection:account.voucher.open,init,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "形式发票"
 
 #. module: account_voucher
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Info"
-msgstr ""
+msgstr "其它信息"
 
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
 msgid "Accounting Voucher Entries"
-msgstr ""
+msgstr "原始凭证记录"
 
 #. module: account_voucher
 #: field:res.currency,sub_name:0
 msgid "Sub Currency"
-msgstr ""
+msgstr "货币细分"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
 msgid "Other Vouchers"
-msgstr ""
+msgstr "其它原始凭证"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Canceled"
-msgstr ""
+msgstr "取消"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -486,12 +486,12 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Cash Payment Voucher"
-msgstr ""
+msgstr "现金付款原始凭证"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
 msgid "Bank Receipt"
-msgstr ""
+msgstr "银行收入"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -506,17 +506,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
 msgid "Journal Purchase Voucher"
-msgstr ""
+msgstr "采购原始凭证分类帐"
 
 #. module: account_voucher
 #: view:account.account:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "期末结余"
 
 #. module: account_voucher
 #: field:account.voucher.line,ref:0
 msgid "Ref."
-msgstr ""
+msgstr "参考"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -524,42 +524,42 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Posted"
-msgstr ""
+msgstr "已审核"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_voucher
 #: field:account.voucher,move_ids:0
 msgid "Real Entry"
-msgstr ""
+msgstr "实际凭证"
 
 #. module: account_voucher
 #: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
 msgid "Open a Voucher Entry"
-msgstr ""
+msgstr "打开一原始凭证记录"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "凭证"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Entry Lines"
-msgstr ""
+msgstr "凭证明细"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
 msgid "New Bank Receipt"
-msgstr ""
+msgstr "新的银行收入"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
 msgid "Cash Payments"
-msgstr ""
+msgstr "现金付款"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -569,7 +569,7 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Cash Receipt Voucher"
-msgstr ""
+msgstr "现金收入原始凭证"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -579,7 +579,7 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Bank Payment Voucher"
-msgstr ""
+msgstr "银行付款原始凭证"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -589,10 +589,10 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Bank Receipt Voucher"
-msgstr ""
+msgstr "银行收入原始凭证"
 
 #. module: account_voucher
 #: field:account.account,journal_id:0
 #: field:account.voucher,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "分类帐"
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
index 76149e194b0..7ce70cede52 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
@@ -4,60 +4,82 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 16:15+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构XML文件!"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "辅助核算分类帐"
 
 #. module: analytic_journal_billing_rate
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
+msgstr "这辅助核算项分类帐的开单价"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
 msgid "Relation table between journals and billing rates"
-msgstr ""
+msgstr "分类帐和开单价的关系表"
 
 #. module: analytic_journal_billing_rate
 #: field:account.analytic.account,journal_rate_ids:0
 msgid "Invoicing Rate per Journal"
-msgstr ""
+msgstr "每个分类帐的计价折扣"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
 msgid "Analytic Journal Billing Rate"
-msgstr ""
+msgstr "辅助核算分类帐的开单价"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
 msgid "Invoicing Rate"
-msgstr ""
+msgstr "计价折扣"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default invoicing rate for "
+#~ "a specific journal on a given account. This is mostly used when a user "
+#~ "encode his timesheet: the values are retrieved and the fields are auto-"
+#~ "filled... but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the account data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    这模块允许你定义指定分类帐里规定科目的默认开发票价格.这主要用于在时间表的用户代码:这值是自动计算和自动填写的字段,但可以修改这值.  \n"
+#~ "    \n"
+#~ "    显然,如果当前的科目没有记录的数据,默认的值是作为正常科目数据,所以这模块是完全兼容旧的设置\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index bb9a703d859..f69bb0154f7 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -4,27 +4,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 16:16+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构XML文件!"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr "分析账户中用户和产品之间的关系表"
+msgstr "用在有关系的用户和产品的辅助核算项"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -34,13 +34,13 @@ msgstr "产品"
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "用户/相关产品"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
@@ -51,14 +51,36 @@ msgstr "用户"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr "分析用户的作用"
+msgstr "辅助核算用的函数"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr "这个分析账户使用者的产品"
+msgstr "用户的产品辅助核算项"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encode his "
+#~ "timesheet: the values are retrieved and the fields are auto-filled... but "
+#~ "the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    这模块允许你定义在特定科目的默认功能.这主要用于在时间表的用户代码:这值是自动计算和自动填写的字段,但可以修改这值.\n"
+#~ "    \n"
+#~ "    显然,如果当前的科目没有记录的数据,默认的值是作为正常科目数据,所以这模块是完全兼容旧的设置\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index 253022213e4..733c7d588b7 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -4,32 +4,32 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:42+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:33+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
 #: field:report.deposit.border,total_marge:0
 msgid "Total margin"
-msgstr ""
+msgstr "总利润"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "SMS网关"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Set to draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: auction
 #: field:auction.deposit,partner_id:0
@@ -39,12 +39,12 @@ msgstr ""
 #: field:report.seller.auction,seller:0
 #: field:report.seller.auction2,seller:0
 msgid "Seller"
-msgstr ""
+msgstr "卖方"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中无效的模块名"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -56,38 +56,38 @@ msgstr ""
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Definitive (ordre catalogue)"
-msgstr ""
+msgstr "确定的(订单目录)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
 msgid "My Encoded Objects Per Day"
-msgstr ""
+msgstr "每天我编码的物品"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot history"
-msgstr ""
+msgstr "批日志"
 
 #. module: auction
 #: field:report.seller.auction,avg_estimation:0
 msgid "Avg estimation"
-msgstr ""
+msgstr "平均估价"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
 #: field:report.auction.view2,obj_number:0
 msgid "# of Objects"
-msgstr ""
+msgstr "物品#"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_action_bids_form
 msgid "Bids line"
-msgstr ""
+msgstr "出价线"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Deposit Form"
-msgstr ""
+msgstr "押金方式"
 
 #. module: auction
 #: rml:auction.bids:0
@@ -102,60 +102,60 @@ msgstr ""
 #: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
-msgstr ""
+msgstr "买家"
 
 #. module: auction
 #: field:report.auction.view,nobjects:0
 #: field:report.buyer.auction,object:0
 msgid "No of objects"
-msgstr ""
+msgstr "没有物品"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree
 msgid "Adjudication by Auction"
-msgstr ""
+msgstr "拍卖最终结果"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of paid items (based on invoices):"
-msgstr ""
+msgstr "(根据发票)支付项目:"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
 msgid "Numerotation (per lot)"
-msgstr ""
+msgstr "编号(每批)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Books, manuscripts, eso."
-msgstr ""
+msgstr "古董/书籍/手稿"
 
 #. module: auction
 #: view:auction.deposit:0
 #: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
-msgstr ""
+msgstr "押金最少"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,amount:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "发票金额"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Tin / Copper wares"
-msgstr ""
+msgstr "古董/锡/铜制品"
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer invoice reconciled"
-msgstr ""
+msgstr "买家发票对账"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
 msgid "Mark as taken away"
-msgstr ""
+msgstr "标记为带走"
 
 #. module: auction
 #: xsl:report.auction.seller.list:0
@@ -165,90 +165,90 @@ msgstr ""
 #. module: auction
 #: field:auction.deposit.cost,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
 #: model:ir.ui.menu,name:auction.menu_auction_deposit_border
 msgid "Deposit border"
-msgstr ""
+msgstr "押金最少"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "VAT"
-msgstr ""
+msgstr "增值税"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Statements"
-msgstr ""
+msgstr "描述"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Adjudication"
-msgstr ""
+msgstr "最终结果"
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Unclassifieds"
-msgstr ""
+msgstr "不分类"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
 msgid "Objects by Auction"
-msgstr ""
+msgstr "拍卖物品"
 
 #. module: auction
 #: field:auction.lots,lot_num:0
 #: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
-msgstr ""
+msgstr "表编号"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
 msgid "Cost Name"
-msgstr ""
+msgstr "费用名"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antiques"
-msgstr ""
+msgstr "古董"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: auction
 #: field:report.auction.estimation.adj.category,lot_type:0
 msgid "Object Type"
-msgstr ""
+msgstr "物品类型"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "SMS消息"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Contemporary Art"
-msgstr ""
+msgstr "当代艺术"
 
 #. module: auction
 #: view:auction.lots:0
 #: view:report.unclassified.objects:0
 msgid "Ref"
-msgstr ""
+msgstr "参考"
 
 #. module: auction
 #: field:report.auction.view,nseller:0
 msgid "No of sellers"
-msgstr ""
+msgstr "没卖家"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
@@ -258,7 +258,7 @@ msgstr ""
 #. module: auction
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "错误:登入必须要先登出"
 
 #. module: auction
 #: view:auction.lots:0
@@ -269,7 +269,7 @@ msgstr ""
 #. module: auction
 #: field:report.auction.view2,obj_margin_procent:0
 msgid "Net margin (%)"
-msgstr ""
+msgstr "净利润(%)"
 
 #. module: auction
 #: selection:auction.lots,state:0
@@ -277,28 +277,28 @@ msgstr ""
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
-msgstr ""
+msgstr "未出售的"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: auction
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "错误:销售单位必须要和计量单位不同类型"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Items"
-msgstr ""
+msgstr "项目"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax5
 #: field:auction.dates,seller_costs:0
 msgid "Seller Costs"
-msgstr ""
+msgstr "卖家费用"
 
 #. module: auction
 #: view:auction.bid:0
@@ -308,75 +308,75 @@ msgstr ""
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
 msgid "Bids"
-msgstr ""
+msgstr "出价"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_all_objects_menu
 msgid "All objects"
-msgstr ""
+msgstr "所有物品"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2
 msgid "Buyer's auction for all months"
-msgstr ""
+msgstr "买家所有月份拍卖"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
 msgid "Contact"
-msgstr ""
+msgstr "联系"
 
 #. module: auction
 #: field:report.auction.view,obj_ret:0
 #: field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
-msgstr ""
+msgstr "物品#"
 
 #. module: auction
 #: wizard_button:auction.lots.sms_send,init,send:0
 msgid "Send SMS"
-msgstr ""
+msgstr "发送SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Painting"
-msgstr ""
+msgstr "艺术/绘画"
 
 #. module: auction
 #: field:auction.lots,sel_inv_id:0
 msgid "Seller Invoice"
-msgstr ""
+msgstr "卖方发票"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Commissions"
-msgstr ""
+msgstr "佣金"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,init:0
 msgid "Back"
-msgstr ""
+msgstr "后面"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_all_objects_unsold
 msgid "Unsold objects"
-msgstr ""
+msgstr "未出售的物品"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_sold1
 msgid "Sold Objects"
-msgstr ""
+msgstr "已卖出的物品"
 
 #. module: auction
 #: view:report.buyer.auction2:0
 #: view:report.seller.auction2:0
 msgid "Sum net margin"
-msgstr ""
+msgstr "合计净利润"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Border Form"
-msgstr ""
+msgstr "押金最少方式"
 
 #. module: auction
 #: field:auction.bid,bid_lines:0
@@ -384,7 +384,7 @@ msgstr ""
 #: rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
-msgstr ""
+msgstr "出价"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,lang:0
@@ -397,17 +397,17 @@ msgstr ""
 #: view:auction.lots:0
 #: model:ir.model,name:auction.model_auction_lots
 msgid "Object"
-msgstr ""
+msgstr "物品"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_map_user
 msgid "Map buyer username to Partners"
-msgstr ""
+msgstr "从买家用户到业务伙伴"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,lot_num:0
 msgid "Inventory Number"
-msgstr ""
+msgstr "库存数量"
 
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,check,end:0
@@ -415,17 +415,17 @@ msgstr ""
 #: wizard_button:auction.lots.numerotate,search,end:0
 #: wizard_button:auction.lots.numerotate_cont,init,end:0
 msgid "Exit"
-msgstr ""
+msgstr "出口"
 
 #. module: auction
 #: field:report.buyer.auction2,net_revenue:0
 msgid "Net Revenue"
-msgstr ""
+msgstr "营业净收入"
 
 #. module: auction
 #: view:report.buyer.auction:0
 msgid "Auction buyer reporting form view"
-msgstr ""
+msgstr "拍卖买方报表"
 
 #. module: auction
 #: field:auction.dates,state:0
@@ -435,17 +435,17 @@ msgstr ""
 #: field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_sms
 msgid "SMS Send"
-msgstr ""
+msgstr "发送SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Cartoons"
-msgstr ""
+msgstr "古董/卡通"
 
 #. module: auction
 #: view:auction.lots:0
@@ -453,42 +453,42 @@ msgstr ""
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
-msgstr ""
+msgstr "销售"
 
 #. module: auction
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "错误:你不能创建递归的员工"
 
 #. module: auction
 #: field:auction.bid_line,name:0
 msgid "Bid date"
-msgstr ""
+msgstr "出价日期"
 
 #. module: auction
 #: field:auction.dates,acc_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "费用科目"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_wizard_emporte
 msgid "Deliveries Management"
-msgstr ""
+msgstr "发货管理"
 
 #. module: auction
 #: field:auction.lots,obj_desc:0
 msgid "Object Description"
-msgstr ""
+msgstr "物品描述"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Contact the Seller"
-msgstr ""
+msgstr "联系卖家"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Auction Objects"
-msgstr ""
+msgstr "拍卖物品"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -496,7 +496,7 @@ msgstr ""
 #: field:report.object.encoded.manager,gross_revenue:0
 #: field:report.seller.auction2,gross_revenue:0
 msgid "Gross revenue"
-msgstr ""
+msgstr "营业总收益"
 
 #. module: auction
 #: view:report.seller.auction2:0
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 05b1e2e8306..8775807b550 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -4,78 +4,78 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 17:17+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:34+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "审计线索"
 
 #. module: audittrail
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "日志"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "订阅"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "旧值: "
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Create"
-msgstr ""
+msgstr "创建"
 
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
 msgid "Audit Logs"
-msgstr ""
+msgstr "审计日志"
 
 #. module: audittrail
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "旧值"
 
 #. module: audittrail
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
 msgid "View log"
-msgstr ""
+msgstr "日志视图"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
@@ -85,12 +85,12 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "方法"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
 msgid "Log From"
-msgstr ""
+msgstr "日志格式"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
@@ -100,53 +100,53 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "资源ID"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Write"
-msgstr ""
+msgstr "写"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
 msgid "Audittrails"
-msgstr ""
+msgstr "审计线索"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "日志明细"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribe"
-msgstr ""
+msgstr "订阅"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Read"
-msgstr ""
+msgstr "读"
 
 #. module: audittrail
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "对象"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "审计线索规则"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,to:0
 msgid "Log To"
-msgstr ""
+msgstr "日志到"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "新值正文: "
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -156,51 +156,53 @@ msgid ""
 "    Subscribe Rules for read, write, create and delete on objects and check "
 "logs"
 msgstr ""
+"允许管理员跟踪每个用户操作系统所有对象\n"
+"访问规则读、写、创建、删除对象和检查日志"
 
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: audittrail
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "旧值正文: "
 
 #. module: audittrail
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "日志明细"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
 msgid "Subscribed Rules"
-msgstr ""
+msgstr "订阅规则"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "字段"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "审计线索规则"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
@@ -210,99 +212,99 @@ msgstr ""
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "取消订阅"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log writes"
-msgstr ""
+msgstr "日志写"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "audittrail.log"
-msgstr ""
+msgstr "日志"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "字段说明"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,open:0
 msgid "Open Logs"
-msgstr ""
+msgstr "打开日志"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "新值正文"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "规则名称"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log reads"
-msgstr ""
+msgstr "日志读"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Logs"
-msgstr ""
+msgstr "日志"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "新值"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
 msgid "View Logs"
-msgstr ""
+msgstr "日志视图"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log creates"
-msgstr ""
+msgstr "日志建立者"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "审计线索日志"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Rules"
-msgstr ""
+msgstr "规则"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "新值: "
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "旧值正文"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log deletes"
-msgstr ""
+msgstr "日志删除"
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index dfe8c394db1..89d72404c5d 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 13:06+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:35+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML视图结构无效"
+msgstr "无效XML视图结构!"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -29,12 +29,12 @@ msgstr "邮政编码"
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr "国际银行账号（IBAN）"
+msgstr "银行账号"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr "国家_id"
+msgstr "国家 - ID"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
@@ -55,9 +55,20 @@ msgstr "国际银行账号（IBAN）"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "国际银行账号（IBAN）"
+msgstr "IBAN账户"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
 msgstr "账号"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module install the base for IBAN bank accounts. \n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块安装银行账号的IBAN . \n"
+#~ "\n"
+#~ "    "
diff --git a/addons/base_module_merge/i18n/zh_CN.po b/addons/base_module_merge/i18n/zh_CN.po
index f1b01c8ede0..015ca9e1984 100644
--- a/addons/base_module_merge/i18n/zh_CN.po
+++ b/addons/base_module_merge/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-07 11:24+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:35+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
@@ -29,7 +29,7 @@ msgstr "信息"
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,init:0
 msgid "Module Merging"
-msgstr "模块合并"
+msgstr "模块合并中"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,author:0
@@ -44,7 +44,7 @@ msgstr "目录名"
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Demo Data"
-msgstr "演示数据"
+msgstr "日期"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_filename:0
@@ -65,17 +65,17 @@ msgstr "模块记录"
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Thanks in advance for your contribution."
-msgstr "感谢您的贡献。"
+msgstr "谢谢你的贡献"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,description:0
 msgid "Full Description"
-msgstr "完整描述"
+msgstr "完整的说明"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,name:0
 msgid "Module Name"
-msgstr "模块名称"
+msgstr "模块名"
 
 #. module: base_module_merge
 #: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
@@ -86,7 +86,7 @@ msgstr "合并模块"
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_file:0
 msgid "Module .zip File"
-msgstr "模块 .zip 文件"
+msgstr "zip文件"
 
 #. module: base_module_merge
 #: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
@@ -96,12 +96,12 @@ msgstr "模块合并"
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
 msgid "Module successfully created !"
-msgstr "模块已成功创建！"
+msgstr "模块创建完成！"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,website:0
 msgid "Documentation URL"
-msgstr "文档地址-URL"
+msgstr "文档URL"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,init,modules_list:0
@@ -117,7 +117,7 @@ msgstr "继续"
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Normal Data"
-msgstr "普通数据"
+msgstr "一般数据"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
@@ -125,14 +125,12 @@ msgid ""
 "If you think your module could interrest others people, we'd like you to "
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
-msgstr ""
-"如果您认为您的模块其他人也会感兴趣，我们希望您能够把它发布到 OpenERP.com "
-"的“Modules”部分中。您可以直接通过网站进行发布或者使用“base_module_publish”模块。"
+msgstr "如果你认为你的模块可以发布给其他人.你可以上网站或使用'base_module_publish'模块"
 
 #. module: base_module_merge
 #: help:base_module_merge.module_merge,init,modules_list:0
 msgid "Select Modules which you want to merge in single module"
-msgstr "选择您希望合并成为单个模块的模块列表"
+msgstr "选择将要合并的模块"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,data_kind:0
@@ -153,4 +151,25 @@ msgstr "取消"
 #. module: base_module_merge
 #: wizard_button:base_module_merge.module_merge,save,end:0
 msgid "Close"
-msgstr "关闭"
+msgstr "结束"
+
+#~ msgid ""
+#~ "\n"
+#~ "    * The wizard asks a many2many of modules\n"
+#~ "    * And then generate a module which is the merge of all selected modules\n"
+#~ "    * The new module is provided as a .zip file\n"
+#~ "\n"
+#~ "    The merge will works in all situations:\n"
+#~ "    * Merging all .py files with the same name in the new module\n"
+#~ "    * merging all .xml files and take care of id's.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    * 这向导会询问many2many模块\n"
+#~ " * 然后生成一个合并选择的模块\n"
+#~ "* 新的模块是一个.zip文件\n"
+#~ "    \n"
+#~ "    合并工作将在所有的情况下:\n"
+#~ "       * 合并所有的py具有相同名称文件\n"
+#~ "       * 合并所有xml文件\n"
+#~ "    "
diff --git a/addons/base_module_publish/i18n/zh_CN.po b/addons/base_module_publish/i18n/zh_CN.po
index b0937c6943d..ea57428795e 100644
--- a/addons/base_module_publish/i18n/zh_CN.po
+++ b/addons/base_module_publish/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:18+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:36+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
@@ -29,7 +29,7 @@ msgstr "信息"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,shortdesc:0
 msgid "Small description"
-msgstr "简要说明"
+msgstr "简短说明"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,author:0
@@ -40,13 +40,13 @@ msgstr "作者"
 #: wizard_field:base_module_publish.module_publish,init,text:0
 #: wizard_field:base_module_publish.module_publish_all,init,text:0
 msgid "Introduction"
-msgstr "说明"
+msgstr "信息"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,url:0
 #: wizard_field:base_module_publish.module_publish,step1,url_download:0
 msgid "Download URL"
-msgstr "下载地址-URL"
+msgstr "下载URL"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_publish,step2,publish:0
@@ -62,12 +62,12 @@ msgstr "文件名"
 #. module: base_module_publish
 #: model:ir.module.module,shortdesc:base_module_publish.module_meta_information
 msgid "Module publisher"
-msgstr ""
+msgstr "模块发布"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,demourl:0
 msgid "Demo URL"
-msgstr "演示地址-URL"
+msgstr "示范URL"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,version:0
@@ -77,33 +77,33 @@ msgstr "版本"
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,license:0
 msgid "Other proprietary"
-msgstr ""
+msgstr "其它操作"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_export,init,include_src:0
 msgid "Include sources"
-msgstr ""
+msgstr "包含来源"
 
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
 msgid "Modification"
-msgstr ""
+msgstr "修改"
 
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,demourl:0
 msgid "empty to keep existing value"
-msgstr ""
+msgstr "留空为保持现有值"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,email:0
 #: wizard_field:base_module_publish.module_publish_all,login,email:0
 msgid "Email"
-msgstr "Email"
+msgstr "电子邮件"
 
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,url_download:0
 msgid "Keep empty for an auto upload of the module"
-msgstr ""
+msgstr "留空为自动上次模块"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,website:0
@@ -113,12 +113,12 @@ msgstr "网站"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_export,zip,module_file:0
 msgid "Module .zip file"
-msgstr "模块.zip文件"
+msgstr "模块zip文件"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_export,zip:0
 msgid "Finish"
-msgstr "结束"
+msgstr "完成"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step1:0
@@ -131,20 +131,20 @@ msgstr "说明"
 #: wizard_view:base_module_publish.module_publish_all,login:0
 msgid ""
 "If you don't have an access, you can create one http://www.openerp.com/"
-msgstr ""
+msgstr "如果你不能访问,你可以在网站建一个"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,init:0
 #: wizard_view:base_module_publish.module_publish_all,init:0
 msgid "Publication information"
-msgstr "信息发布"
+msgstr "发布信息"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_export,zip,end:0
 #: wizard_button:base_module_publish.module_publish,publish,end:0
 #: wizard_button:base_module_publish.module_publish_all,publish,end:0
 msgid "Close"
-msgstr "关闭"
+msgstr "结束"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,init:0
@@ -160,12 +160,12 @@ msgstr "模块发布"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,license:0
 msgid "Licence"
-msgstr "授权"
+msgstr ""
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step1:0
 msgid "Verify your module information"
-msgstr "检查模块信息"
+msgstr "验证你的模块信息"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,password:0
@@ -176,12 +176,12 @@ msgstr "密码"
 #. module: base_module_publish
 #: model:ir.actions.wizard,name:base_module_publish.wizard_base_module_publish_all
 msgid "Publish all modules"
-msgstr ""
+msgstr "发布模块"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,publish,result:0
 msgid "Result page"
-msgstr "结果"
+msgstr "结果页"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_export,init,zip:0
@@ -197,27 +197,27 @@ msgstr "名称"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish_all,publish,update:0
 msgid "Modules updated"
-msgstr "模块已更新"
+msgstr "模块更新"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish_all,publish,error:0
 msgid "Modules in error"
-msgstr "模块出错"
+msgstr "模块错误"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,docurl:0
 msgid "Documentation URL"
-msgstr "文档地址-URL"
+msgstr "文档URL"
 
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,image:0
 msgid "support only .png files"
-msgstr ""
+msgstr "只支持.png文件"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,publish,text_end:0
 msgid "Summary"
-msgstr "总结"
+msgstr "摘要"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_publish,init,step1:0
@@ -228,7 +228,7 @@ msgstr "继续"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish_all,publish,already:0
 msgid "Modules already updated"
-msgstr "模块已更新"
+msgstr "模块已经更新"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_export,init:0
@@ -240,7 +240,7 @@ msgstr "导出模块"
 #: wizard_view:base_module_publish.module_publish,step2:0
 #: wizard_view:base_module_publish.module_publish_all,login:0
 msgid "Please provide here your login on the Open ERP website."
-msgstr ""
+msgstr "请提供你的网站登录信息"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,login:0
@@ -261,17 +261,17 @@ msgstr "上传信息"
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_export,zip:0
 msgid "Module successfully exported !"
-msgstr "模块成功导出"
+msgstr "模块导出完成！"
 
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
 msgid "Creation"
-msgstr ""
+msgstr "创建"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,include_src:0
 msgid "Include source"
-msgstr "包括源代码"
+msgstr "包含来源"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step1:0
@@ -302,7 +302,7 @@ msgstr "取消"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,image:0
 msgid "Image file"
-msgstr "图片文件"
+msgstr "图像文件"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,operation:0
@@ -312,15 +312,15 @@ msgstr "操作"
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,docurl:0
 msgid "Empty to keep existing value"
-msgstr ""
+msgstr "空为保持现有值"
 
 #. module: base_module_publish
 #: model:ir.actions.wizard,name:base_module_publish.wizard_base_module_publish
 msgid "Publish module"
-msgstr ""
+msgstr "发布模块"
 
 #. module: base_module_publish
 #: wizard_button:base_module_publish.module_publish,step1,init:0
 #: wizard_button:base_module_publish.module_publish,step2,step1:0
 msgid "Previous"
-msgstr "上一步"
+msgstr "先前"
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
index c5301792672..ee7bea97125 100644
--- a/addons/base_module_record/i18n/zh_CN.po
+++ b/addons/base_module_record/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-07 11:38+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:36+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -38,12 +38,12 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr "选择要记录的对象列表"
+msgstr "选择要记录的对象"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
@@ -60,13 +60,13 @@ msgstr "目录名"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr ""
+msgstr "只记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr "演示数据"
+msgstr "示范数据"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
@@ -83,12 +83,12 @@ msgstr "版本"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Objects Recording"
-msgstr "对象记录"
+msgstr "记录对象"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "记录日期"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -111,47 +111,47 @@ msgstr "状态"
 #: wizard_view:base_module_record.module_save,init:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module Recording"
-msgstr "模块记录"
+msgstr "记录模块"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr "把自定义设置作为模块导出"
+msgstr "导出自定义模块"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Thanks in advance for your contribution."
-msgstr "感谢您的贡献。"
+msgstr "感谢你的贡献"
 
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr "将被记录的对象列表"
+msgstr "要记录的对象列表"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
 msgid "Start Recording"
-msgstr "开始录制"
+msgstr "开始记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr "没有记录"
+msgstr "不记录"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
 #: wizard_field:base_module_record.module_save,info,description:0
 msgid "Full Description"
-msgstr "完整描述"
+msgstr "完整的说明"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,name:0
 #: wizard_field:base_module_record.module_save,info,name:0
 msgid "Module Name"
-msgstr "模块名称"
+msgstr "模块名"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
@@ -162,55 +162,55 @@ msgstr "对象"
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
 #: wizard_field:base_module_record.module_save,save,module_file:0
 msgid "Module .zip File"
-msgstr "模块 .zip 文件"
+msgstr "模块zip文件"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording information"
-msgstr ""
+msgstr "记录信息"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr "模块已成功创建！"
+msgstr "模块创建完成！"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording Stopped"
-msgstr "记录已停止"
+msgstr "停止记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr "已创建"
+msgstr "创建"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
 #: wizard_view:base_module_record.module_save,end:0
 msgid "Thanks For using Module Recorder"
-msgstr "感谢使用模块记录器"
+msgstr "感谢你使用模块记录"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record,start,continue:0
 msgid "Continue Previous Session"
-msgstr "继续上次会话"
+msgstr "继续先前的会话"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,website:0
 #: wizard_field:base_module_record.module_save,info,website:0
 msgid "Documentation URL"
-msgstr "文档地址-URL"
+msgstr "文档URL"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr "已修改"
+msgstr "修改"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr "记录中"
+msgstr "记录"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
@@ -229,13 +229,13 @@ msgstr "继续"
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr "模块记录器"
+msgstr "模块记录"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr "普通数据"
+msgstr "一般数据"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
@@ -250,9 +250,7 @@ msgid ""
 "If you think your module could interrest others people, we'd like you to "
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
-msgstr ""
-"如果您认为您的模块其他人也会感兴趣，我们希望您能够把它发布到 OpenERP.com "
-"的“Modules”部分中。您可以直接通过网站进行发布或者使用“base_module_publish”模块。"
+msgstr "如果你认为你的模块可以发布给其他人.你可以上网站或使用'base_module_publish'模块"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -260,24 +258,24 @@ msgid ""
 "The module recorder allows you to record every operation made in the Open "
 "ERP client and save them as a module. You will be able to install this "
 "module on any database to reuse and/or publish it."
-msgstr ""
+msgstr "这记录者模块允许你记录客户端的每个操作并保存为一个模块.你能够安装这模块可以再利用或发布"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
 msgid "Record module"
-msgstr ""
+msgstr "记录模块"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "模块创建"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
-msgstr ""
+msgstr "你可以继续记录这会话.开始记录向导"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
@@ -295,13 +293,13 @@ msgstr "模块信息"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr ""
+msgstr "保存记录"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "Open ERP recording is stopped. Don't forget to save the recorded module."
-msgstr ""
+msgstr "停止系统记录不要忘记保存记录"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -316,14 +314,56 @@ msgstr "取消"
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr "关闭"
+msgstr "结束"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "创建&修改"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
 msgid "Stop Recording"
 msgstr "结束记录"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to create a new module without any development.\n"
+#~ "It records all operations on objects during the recording session and\n"
+#~ "produce a .ZIP module. So you can create your own module directly from\n"
+#~ "the Open ERP client.\n"
+#~ "\n"
+#~ "This version works for creating and updating existing records. It "
+#~ "recomputes\n"
+#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
+#~ "It also support workflows and demo/update data.\n"
+#~ "\n"
+#~ "This should help you to easily create reusable and publishable modules\n"
+#~ "for custom configurations and demo/testing data.\n"
+#~ "\n"
+#~ "How to use it:\n"
+#~ "1. Start the recording\n"
+#~ "2. Do stuff in your Open ERP client\n"
+#~ "3. Stop the recording session\n"
+#~ "4. Export to a reusable module\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块允许你创建你的模块和发展\n"
+#~ "    它记录在会话周期的所有对象操作\n"
+#~ "和产生一个zip模块\n"
+#~ "所以你可以在系统的客户端创建自己的模块.\n"
+#~ "    \n"
+#~ "版本的创建和更新时重新计算的\n"
+#~ "依赖关系和所有关系类型(many2one, many2many, ...).\n"
+#~ "它也支持工作流和demo和测试数据.\n"
+#~ "\n"
+#~ "    这有助你简化创建可再重用和发布自定义模块\n"
+#~ "自定义配置和示范或测试数据.\n"
+#~ "    \n"
+#~ "    如何使用?\n"
+#~ "    1.开始记录\n"
+#~ "    2.在你的客户端完成操作\n"
+#~ "    3.停止记录会话\n"
+#~ "    4.导出一个可重用的模块\n"
+#~ "    "
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 4d723774e2e..df381f6c628 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-01 23:39+0000\n"
-"Last-Translator: mrshelly <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -22,17 +22,17 @@ msgid ""
 "Provide an expression for the field based on which you want to filter the "
 "records.\n"
 " e.g. res_partner.id=3"
-msgstr "可以使用基于字段的Python条件表达式做为过滤条件.(如 res_partner.id=3)"
+msgstr "提供一个基于字段的表达式必须过滤记录 .例如res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
 msgid "Graph Type"
-msgstr "图表类型"
+msgstr "图形类型"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Used View"
-msgstr "已使用的视图"
+msgstr "用户视图"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
@@ -42,17 +42,17 @@ msgstr "过滤值"
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,graph_mode:0
 msgid "Graph Mode"
-msgstr "图表模式"
+msgstr "图形模式"
 
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Graph View"
-msgstr "图表视图"
+msgstr "图形视图"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,expression:0
@@ -67,18 +67,18 @@ msgstr "设置过滤字段"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Ending Date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
 msgid "Report Filters"
-msgstr "报表过滤器"
+msgstr "报表过滤"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,sql_query:0
 msgid "SQL Query"
-msgstr "SQL 查询"
+msgstr "SQL查询"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -89,12 +89,12 @@ msgstr "创建菜单"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Minimum"
-msgstr "最小值"
+msgstr "最小"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
 msgid "Operator"
-msgstr "运算符"
+msgstr "操作"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
@@ -116,12 +116,12 @@ msgstr "菜单信息"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Sum"
-msgstr "求和"
+msgstr "合计"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
-msgstr "以添加到报表的对象"
+msgstr "报表对象"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -141,17 +141,17 @@ msgstr "状态"
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
 msgid "Valid"
-msgstr "验证"
+msgstr "有效"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
-msgstr "添加过滤条件"
+msgstr "增加过滤"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create
 msgid "Create Menu for Report"
-msgstr "为报表创建菜单"
+msgstr "报表创建菜单"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
@@ -177,39 +177,39 @@ msgstr "报表"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Starting Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: base_report_creator
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Tree"
-msgstr "树形列表"
+msgstr "树"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
 msgid "Authorized Groups"
-msgstr "已授权的用户组"
+msgstr "授权组"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_orientation:0
 msgid "Graph Orientation"
-msgstr "图表方向"
+msgstr "图方向"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Authorized Groups (empty for all)"
-msgstr "已授权的用户组（如果为空则授权给所有用户组）"
+msgstr "授权组(留空为所有)"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr "安全设定"
+msgstr "安全"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
@@ -225,36 +225,36 @@ msgstr "与（AND）"
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
-msgstr "日历模式"
+msgstr "日程表模式"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
 msgid "Display Fields"
-msgstr "显示的字段"
+msgstr "显示字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "Y Axis"
-msgstr "Y 轴"
+msgstr "y轴"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr "日历"
+msgstr "日程表"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Graph"
-msgstr "图表"
+msgstr "图形"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
 msgid "Field Name"
-msgstr "字段名称"
+msgstr "字段名"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
@@ -274,7 +274,7 @@ msgstr "状态"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
-msgstr "垂直的"
+msgstr "垂直线"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,type:0
@@ -284,27 +284,27 @@ msgstr "行列报表"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "General Configuration"
-msgstr "通用设置"
+msgstr "一般设置"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
 msgid "Select Field to filter"
-msgstr "选择要过滤的字段"
+msgstr "选择过滤字段"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,active:0
 msgid "Active"
-msgstr "可用"
+msgstr "有效"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr "水平的"
+msgstr "水平线"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
 msgid "Grouping Method"
-msgstr "分组方法"
+msgstr "图形模板"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,condition:0
@@ -320,7 +320,7 @@ msgstr "计数"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "X Axis"
-msgstr "X 轴"
+msgstr "x轴"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0
@@ -330,12 +330,12 @@ msgstr "上级菜单"
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
 msgid "Confirm Filter"
-msgstr "确认过滤器"
+msgstr "确定过滤"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,name:0
 msgid "Filter Name"
-msgstr "过滤器名称"
+msgstr "过滤名称"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
@@ -345,13 +345,13 @@ msgstr "打开报表"
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Grouped"
-msgstr "已分组"
+msgstr "图形"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
 msgid "Report Creator"
-msgstr "报表创建器"
+msgstr "创建报表"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report.menu.create,init,end:0
@@ -364,17 +364,17 @@ msgstr "取消"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
 msgid "First View"
-msgstr "第一视图"
+msgstr "首视图"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Delay"
-msgstr "延迟"
+msgstr "拖延"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,field_id:0
@@ -384,7 +384,7 @@ msgstr "字段"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Filters on Fields"
-msgstr "字段上的过滤器"
+msgstr "过滤字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
@@ -406,13 +406,17 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
-"本模块可以让您使用SQL查询器新建很灵活的对象统计报表.\n"
-"安装此模块后, \"Dashboard(系统面板)\" 上会添加对应的菜单入口.\n"
+"这模块允许你创建任何统计\n"
+"报告几个对象,它是一SQL查询生成器和浏览器\n"
+"和用户\n"
+"\n"
+"安装模块后,它在控制台菜单增加一个自定义的报表菜单在\n"
+"控制台 的 菜单\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Uniq Colors"
-msgstr "唯一的颜色"
+msgstr "颜色"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
@@ -422,22 +426,22 @@ msgstr "报表名称"
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Fields"
-msgstr "字段列表"
+msgstr "字段"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Average"
-msgstr "平均值"
+msgstr "平均"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Reports"
-msgstr "报表列表"
+msgstr "报表"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Maximum"
-msgstr "最大值"
+msgstr "最大"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
@@ -452,7 +456,7 @@ msgstr "值"
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr "柱状图"
+msgstr "条线图"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0
@@ -462,7 +466,7 @@ msgstr "第二视图"
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report.menu.create,init:0
 msgid "Create Menu For This Report"
-msgstr "为此报表创建菜单"
+msgstr "报表创建菜单"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -472,7 +476,7 @@ msgstr "视图参数"
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,sequence:0
 msgid "Sequence"
-msgstr "顺序"
+msgstr "序列"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
@@ -483,10 +487,10 @@ msgstr "过滤字段"
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,field_ids:0
 msgid "Fields to Display"
-msgstr "要显示的字段"
+msgstr "显示字段"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
-msgstr "过滤器"
+msgstr "过滤"
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index ebbed29382b..ef69847b414 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -4,57 +4,57 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-07 07:55+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
 msgid "Introduction"
-msgstr "说明"
+msgstr "介绍"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Upload your modified report"
-msgstr "上传修改的报表"
+msgstr "上传你修改的报表"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0
 msgid "Upload the modified report"
-msgstr "上传修改的报表"
+msgstr "上传这修改的报表"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
 msgid "The .SXW report"
-msgstr ".SXW报表"
+msgstr "这.SXW报表"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Report modified"
-msgstr "报表已修改"
+msgstr "报表修改"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,init,get_form:0
 msgid "Modify a report"
-msgstr "修改报表"
+msgstr "修改一个报表"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Your report has been modified."
-msgstr "报表已修改"
+msgstr "你的报表已经修改"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
-msgstr "报表设计器接口模块"
+msgstr "报表设计接口模块"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form,report_id:0
@@ -66,14 +66,14 @@ msgstr "报表"
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
 msgid "Report Designer"
-msgstr "报表设计器"
+msgstr "报表设计者"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 #: wizard_view:base_report_designer.modify,get_form_result:0
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Get a report"
-msgstr "获取报表"
+msgstr "给一个报表"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,get_form_result:0
@@ -84,12 +84,12 @@ msgstr "继续"
 #: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0
 #: wizard_field:base_report_designer.modify,send_form,file_sxw:0
 msgid "Your .SXW file"
-msgstr ".SXW文件"
+msgstr "你的.SXW文件"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer"
-msgstr "报表设计器"
+msgstr "报表设计者"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
@@ -98,25 +98,23 @@ msgid ""
 "open it with OpenOffice. Don't forget to install the Tiny OpenOffice package "
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
-msgstr ""
-"这是您要求的报表模板。请把它保存为 .SXW 格式文件并用 OpenOffice 软件打开。别忘了安装 Tiny 公司的 OpenOffice "
-"扩展包。修改完毕以后再次使用本向导上传到系统。"
+msgstr "这是你要求报表的模板.保存为一个.SXW文件和用openoffice打开和修改.修改后使用这个向导重新上传"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
 msgid "Update the report"
-msgstr "上传报表"
+msgstr "更新报表"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 msgid "Create a new report"
-msgstr "创建新报表"
+msgstr "创建一个新报表"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 #: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
 msgid "Modify an existing report"
-msgstr "修改已存在的报表"
+msgstr "修改现有的报表"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,end:0
@@ -134,14 +132,23 @@ msgstr "关闭"
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,operation:0
 msgid "Operation"
-msgstr "方向"
+msgstr "操作"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer introduction"
-msgstr "报表设计器说明"
+msgstr "报表设计介绍"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 msgid "Select your report"
-msgstr "选择您的报表"
+msgstr "选择你的报表"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module adds wizards to import/export documents to be edited in\n"
+#~ "OpenOffice.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "这模块增加一个向导来导入和导出文档在\n"
+#~ "OpenOffice编辑\n"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index f2ce57fe884..5e50a16dc1d 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-16 01:54+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -28,7 +28,7 @@ msgstr "城市"
 msgid ""
 "You can start configuring the system or connect directly to the database "
 "using the default setup."
-msgstr "您可以开始配置系统或使用默认设置直接连接到数据库。"
+msgstr "你可以开始设置系统或使用默认的设置连接到数据库"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
@@ -50,13 +50,13 @@ msgstr "报表头"
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,config:0
 msgid "Start Configuration"
-msgstr "开始配置"
+msgstr "开始设置"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid ""
 "You'll be able to install more modules later through the Administration menu."
-msgstr "您可以之后通过管理菜单，安装更多的模块。"
+msgstr "你以后可以通过管理员菜单安装更多的模块."
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -64,7 +64,7 @@ msgid ""
 "A profile sets a pre-selection of modules for specific needs. These profiles "
 "have been setup to help you discover the different aspects of OpenERP. This "
 "is just an overview, we have 300+ available modules."
-msgstr "配置文件设定了一套预选模块为满足特有的需求.这些配置帮助您发现系统的不同特征.这是一个概要而已，一共有300多个模块."
+msgstr "配置文件规定了预选模块的具体需要.这些配置已经安装以帮助你发现系统的不同的配置.这是一个配置里面含300多个模块."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
@@ -77,26 +77,26 @@ msgstr "下一个"
 #: wizard_field:base_setup.base_setup,init,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
 msgid "E-mail"
-msgstr "Email"
+msgstr "电子邮件"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr "省/ 州"
+msgstr "省市"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr "新帐套已安装完毕。"
+msgstr "新账套已安装完毕."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
 msgid "Profile"
-msgstr "行业属性"
+msgstr "配置"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
@@ -115,7 +115,7 @@ msgstr "报表脚注2"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "General Information"
-msgstr "通用信息"
+msgstr "一般信息"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
@@ -139,7 +139,7 @@ msgstr "电话"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Define Main Company"
-msgstr "定义总公司"
+msgstr "定义主公司"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
@@ -156,10 +156,7 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-msgstr ""
-"该语句将显示在您的报表底部，\n"
-"我们建议您填写银行信息显示，如：\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr "这将显示在报表底部.建议你输入银行的信息"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
@@ -186,10 +183,7 @@ msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-msgstr ""
-"这语句将会显示在您报表的底部。\n"
-"我们建议您在此输入法律信息，如：\n"
-"网址： http://openerp.com - 传真： +32.81.73.35.01 - 银行帐号：126-2013269-07"
+msgstr "这将显示在报表底部,建议你放入正式的公司信息."
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
@@ -214,10 +208,7 @@ msgid ""
 "This sentence will appear at the top right corner of your reports.\n"
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
-msgstr ""
-"这句话将会出现在您报告页面的右上角.\n"
-"我们建议您在这留下一句标语:\n"
-"Open Source Business Solutions"
+msgstr "这将显示在报表的右上角,建议你放一个标语."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
@@ -229,7 +220,7 @@ msgstr "报表页眉"
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "您的徽标——使用大小约为 450x150 像素的图片"
+msgstr "你的标识使用尺寸为450×150像素"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
@@ -243,7 +234,7 @@ msgstr "货币"
 #: wizard_field:base_setup.base_setup,init,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
 msgid "Street"
-msgstr "街区地址"
+msgstr "街区"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,menu:0
@@ -260,15 +251,44 @@ msgstr "取消"
 #: wizard_field:base_setup.base_setup,init,logo:0
 #: wizard_field:base_setup.base_setup,update,logo:0
 msgid "Logo"
-msgstr "徽标"
+msgstr "标识"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr "基本设置"
+msgstr "基础安装"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
 msgid "Previous"
 msgstr "上一个"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module implements a configuration system that helps user\n"
+#~ "    to configure the system at the installation of a new database.\n"
+#~ "\n"
+#~ "    It allows you to select between a list of profiles to install:\n"
+#~ "    * Minimal profile\n"
+#~ "    * Accounting only\n"
+#~ "    * Services companies\n"
+#~ "    * Manufacturing companies\n"
+#~ "\n"
+#~ "    It also asks screens to help easily configure your company, the header "
+#~ "and\n"
+#~ "    footer, the account chart to install and the language.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块实现一个配置的系统帮助用户\n"
+#~ "在一个新数据库配置系统\n"
+#~ "\n"
+#~ "    它允许在配置列表中选择安装:\n"
+#~ "   *最小配置\n"
+#~ "    *只有会计\n"
+#~ "    *制造公司\n"
+#~ "\n"
+#~ "    它还询问以帮助简单设置你的公司:\n"
+#~ "                  报表头,注脚,所用的会计表和要安装的语言\n"
+#~ "    "
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index e17022cca2d..513af67d4cf 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -4,35 +4,40 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 13:08+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
 msgid ""
 "Enable the VAT Number for the partner. Check the validity of that VAT Number."
-msgstr "启用合作伙伴的增值税号码。检查的增值税号码的有效性。"
+msgstr "启用业务伙伴增值税号.检查有效性"
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "增值税法律申明"
+msgstr "增值税描述"
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
 msgstr "增值税"
+
+#~ msgid ""
+#~ "Check this box if the partner is subjected to the VAT. It will be used for "
+#~ "the VAT legal statement."
+#~ msgstr "如果你的业务伙伴接收增值税勾选此项.它将用于增值税的正式报表"
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
new file mode 100644
index 00000000000..5e38177d164
--- /dev/null
+++ b/addons/board/i18n/fi.po
@@ -0,0 +1,220 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-19 18:51+0000\n"
+"Last-Translator: smii <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "board.board"
+msgstr ""
+
+#. module: board
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Laatija"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr ""
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+msgid "Note"
+msgstr "Huomautus"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Leveys"
+
+#. module: board
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Otsikko"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr ""
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr ""
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Menu Information"
+msgstr "Valikon tiedot"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_note
+msgid "board.note"
+msgstr ""
+
+#. module: board
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: board
+#: model:ir.ui.menu,name:board.next_id_50
+msgid "Configuration"
+msgstr "Kokoonpano"
+
+#. module: board
+#: field:board.note.type,name:0
+msgid "Note Type"
+msgstr ""
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Create Menu For Dashboard"
+msgstr ""
+
+#. module: board
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Päävalikko"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Huomautukset"
+
+#. module: board
+#: model:ir.model,name:board.model_board_note_type
+msgid "board.note.type"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+msgid "Dashboard"
+msgstr ""
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr ""
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Sijainti"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr ""
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_name:0
+msgid "Menu Name"
+msgstr "Valikon nimi"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Vasen"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Oikea"
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: board
+#: view:board.board:0
+#: wizard_button:board.board.menu.create,init,create_menu:0
+msgid "Create Menu"
+msgstr "Luo valikko"
+
+#. module: board
+#: model:ir.ui.menu,name:board.dashboard_menu
+msgid "Dashboards"
+msgstr "Työtilat"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Korkeus"
+
+#. module: board
+#: model:ir.actions.wizard,name:board.wizard_board_create_menu
+msgid "Create Board Menu"
+msgstr ""
+
+#. module: board
+#: wizard_button:board.board.menu.create,init,end:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr ""
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "board.board.line"
+msgstr ""
+
+#. module: board
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Aihe"
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index a9f014d2289..abc46dc6b63 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -4,28 +4,28 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-28 07:53+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:37+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "board.board"
-msgstr "board.board"
+msgstr "控制台"
 
 #. module: board
 #: field:board.note,user_id:0
@@ -83,7 +83,7 @@ msgstr "动作视图"
 #. module: board
 #: model:ir.model,name:board.model_board_note
 msgid "board.note"
-msgstr "board.note"
+msgstr "备注"
 
 #. module: board
 #: field:board.note,date:0
@@ -108,7 +108,7 @@ msgstr "创建仪表盘菜单"
 #. module: board
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_parent_id:0
@@ -118,12 +118,12 @@ msgstr "上级菜单"
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: board
 #: model:ir.model,name:board.model_board_note_type
 msgid "board.note.type"
-msgstr "board.note.type"
+msgstr "备注类型"
 
 #. module: board
 #: view:board.board:0
@@ -160,22 +160,22 @@ msgstr "备注类型"
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr "靠左"
+msgstr "左对齐"
 
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr "看板视图"
+msgstr "控制台视图"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr "靠右"
+msgstr "右对齐"
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr "顺序"
+msgstr "序列"
 
 #. module: board
 #: view:board.board:0
@@ -196,7 +196,7 @@ msgstr "高度"
 #. module: board
 #: model:ir.actions.wizard,name:board.wizard_board_create_menu
 msgid "Create Board Menu"
-msgstr "创建版面菜单"
+msgstr "创建控制台菜单"
 
 #. module: board
 #: wizard_button:board.board.menu.create,init,end:0
@@ -206,14 +206,17 @@ msgstr "取消"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "看板视图"
+msgstr "控制台视图"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "board.board.line"
-msgstr "board.board.line"
+msgstr "控制台明细"
 
 #. module: board
 #: field:board.note,name:0
 msgid "Subject"
 msgstr "主题"
+
+#~ msgid "Action"
+#~ msgstr "动作"
diff --git a/addons/board_account/i18n/zh_CN.po b/addons/board_account/i18n/zh_CN.po
index 10a1f10845c..e180c7afc80 100644
--- a/addons/board_account/i18n/zh_CN.po
+++ b/addons/board_account/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 04:21+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr "要关闭的分析科目"
+msgstr "关闭辅助核算项目"
 
 #. module: board_account
 #: view:board.board:0
@@ -29,13 +29,13 @@ msgstr "发票草稿"
 #. module: board_account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.open_board_account
 #: model:ir.ui.menu,name:board_account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr "会计看板"
+msgstr "会计控制台"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_receivable
@@ -46,50 +46,70 @@ msgstr "应收款科目"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "发票科目"
 
 #. module: board_account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "成本发票"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "以前应收款"
 
 #. module: board_account
 #: model:ir.module.module,shortdesc:board_account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "会计面板"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_income
 msgid "Income Accounts"
-msgstr "收益帐户"
+msgstr "收入科目"
 
 #. module: board_account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "我的指标"
 
 #. module: board_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_account
 #: model:ir.ui.menu,name:board_account.next_id_68
 msgid "Accounting"
-msgstr "会计及账簿"
+msgstr "会计"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "会计看板"
+msgstr "科目面板"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "以前收入"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module creates a dashboards for accountants that includes:\n"
+#~ "    * List of analytic accounts to close\n"
+#~ "    * List of uninvoiced quotations\n"
+#~ "    * List of invoices to confirm\n"
+#~ "    * Graph of costs to invoice\n"
+#~ "    * Graph of aged receivables\n"
+#~ "    * Graph of aged incomes\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块将创建一个会计人员的控制台包括:\n"
+#~ "    *关闭的辅助核算项目列表\n"
+#~ "    *未开发票报价单\n"
+#~ "    *待确认发票\n"
+#~ "    *费用发票图表\n"
+#~ "    *旧的收入图表\n"
+#~ "    "
diff --git a/addons/board_association/i18n/zh_CN.po b/addons/board_association/i18n/zh_CN.po
index 60c19e6a23d..43ac1165dd0 100644
--- a/addons/board_association/i18n/zh_CN.po
+++ b/addons/board_association/i18n/zh_CN.po
@@ -7,35 +7,35 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 13:37+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
 #: model:ir.ui.menu,name:board_association.menu_board_associations_manager
 msgid "Associations"
-msgstr ""
+msgstr "协会"
 
 #. module: board_association
 #: model:ir.module.module,shortdesc:board_association.module_meta_information
 msgid "Dashboard for Associations"
-msgstr ""
+msgstr "协会控制台"
 
 #. module: board_association
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: board_association
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_association.open_board_associations_manager
 msgid "Association Dashboard"
-msgstr ""
+msgstr "协会控制台"
 
 #. module: board_association
 #: view:board.board:0
@@ -45,7 +45,7 @@ msgstr "我的任务"
 #. module: board_association
 #: view:board.board:0
 msgid "New members"
-msgstr ""
+msgstr "新成员"
 
 #. module: board_association
 #: view:board.board:0
@@ -55,12 +55,12 @@ msgstr "未支付的发票"
 #. module: board_association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中无效的模块名."
 
 #. module: board_association
 #: view:board.board:0
 msgid "Next Events"
-msgstr "下一条事件"
+msgstr "下一个事件"
 
 #. module: board_association
 #: view:board.board:0
diff --git a/addons/board_auction/i18n/zh_CN.po b/addons/board_auction/i18n/zh_CN.po
index 0b5b265bc56..506f924fad0 100644
--- a/addons/board_auction/i18n/zh_CN.po
+++ b/addons/board_auction/i18n/zh_CN.po
@@ -7,116 +7,116 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "在这动作定义中无效的模块名"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Objects by day"
-msgstr ""
+msgstr "天物品"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "物品统计"
 
 #. module: board_auction
 #: model:ir.ui.menu,name:board_auction.menu_board_auction_manager
 msgid "Auction Manager"
-msgstr ""
+msgstr "拍卖管理"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Summary pointing by user"
-msgstr ""
+msgstr "每用户摘要指示"
 
 #. module: board_auction
 #: model:ir.ui.menu,name:board_auction.menu_board_auction
 msgid "Auction Member"
-msgstr ""
+msgstr "拍卖会员"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "我最近的押金"
 
 #. module: board_auction
 #: model:ir.actions.act_window,name:board_auction.open_board_auction
 msgid "Auction member board"
-msgstr ""
+msgstr "拍卖会员控制台"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Auction manager "
-msgstr ""
+msgstr "拍卖管理 "
 
 #. module: board_auction
 #: model:ir.module.module,shortdesc:board_auction.module_meta_information
 msgid "Board for Auction"
-msgstr ""
+msgstr "拍卖控制台"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Estimations/Adjudication"
-msgstr ""
+msgstr "评价/最终结果"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Total Adjudications"
-msgstr ""
+msgstr "最终结果合计"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Latest objects"
-msgstr ""
+msgstr "最新的物品"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Latest deposits"
-msgstr ""
+msgstr "最近的押金"
 
 #. module: board_auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在动作定义中无效的模块名"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Menu"
-msgstr ""
+msgstr "菜单"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My objects By Day"
-msgstr ""
+msgstr "每天我的物品"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My board"
-msgstr ""
+msgstr "我的控制台"
 
 #. module: board_auction
 #: model:ir.actions.act_window,name:board_auction.open_board_auction_manager
 msgid "Auction manager board"
-msgstr ""
+msgstr "拍卖管理控制台"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Min/Adj/Max"
-msgstr ""
+msgstr "最少/邻近/最大"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My Latest Objects"
-msgstr ""
+msgstr "我最后的物品"
diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm_configuration/i18n/zh_CN.po
index b2df7e714c2..d8a60def1cf 100644
--- a/addons/board_crm_configuration/i18n/zh_CN.po
+++ b/addons/board_crm_configuration/i18n/zh_CN.po
@@ -4,28 +4,28 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-16 13:21+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
 #: model:ir.module.module,shortdesc:board_crm_configuration.module_meta_information
 msgid "Dashboard for CRM Configuration"
-msgstr ""
+msgstr "客户关系管理控制台配置"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "统计控制台"
 
 #. module: board_crm_configuration
 #: constraint:ir.ui.view:0
@@ -36,84 +36,105 @@ msgstr "无效XML视图结构!"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "销售机会分类"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_my_cases
 msgid "My Cases"
-msgstr ""
+msgstr "我的业务个案"
 
 #. module: board_crm_configuration
 #: model:ir.actions.act_window,name:board_crm_configuration.open_board_crm
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "客户关系管理控制台"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm
 msgid "Connecting Dashboard"
-msgstr ""
+msgstr "联系控制台"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_leads_month_user
 msgid "Leads Of The Month By User"
-msgstr ""
+msgstr "这月的用户商机"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: view:report.crm.case.section.stage:0
 msgid "Leads By Stage"
-msgstr ""
+msgstr "商机进展"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Meetings"
-msgstr ""
+msgstr "我的会议"
 
 #. module: board_crm_configuration
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm_config
 msgid "CRM Configuration"
-msgstr ""
+msgstr "客户关系管理配置"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_jobs_categ
 msgid "Jobs Requests Of The Month by Applied Job"
-msgstr ""
+msgstr "每月申请职位的职位请求"
 
 #. module: board_crm_configuration
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Sales Pipeline"
-msgstr "我的销售渠道"
+msgstr "我的销售管线"
 
 #. module: board_crm_configuration
 #: view:report.crm.case.user:0
 msgid "Cases by User and Section"
-msgstr "用户和部门项目"
+msgstr "用户业务个案和项"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Leads By Stage"
-msgstr ""
+msgstr "我的商机进展"
 
 #. module: board_crm_configuration
 #: view:report.crm.case.categ:0
 msgid "Cases by Sections and Categories"
-msgstr ""
+msgstr "业务个案项和分类"
 
 #. module: board_crm_configuration
 #: model:ir.actions.act_window,name:board_crm_configuration.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr "CRM - 统计信息控制台"
+msgstr "客户关系统计控制台"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Leads"
-msgstr ""
+msgstr "我的商机"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for CRM that includes:\n"
+#~ "    * My Leads (list)\n"
+#~ "    * Leads by Stage (graph)\n"
+#~ "    * My Meetings (list)\n"
+#~ "    * Sales Pipeline by Stage (graph)\n"
+#~ "    * My Cases (list)\n"
+#~ "    * Jobs Tracking (graph)\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现了客户关系管理的控制台包括:\n"
+#~ "    *我的商机(列表)\n"
+#~ "    *商机进展(图表)\n"
+#~ "    *我的会议(列表)\n"
+#~ "    *销售管线阶段(图表)\n"
+#~ "    *我的业务个案(列表)\n"
+#~ "    *工作跟踪(图表)\n"
+#~ "    "
diff --git a/addons/board_document/i18n/zh_CN.po b/addons/board_document/i18n/zh_CN.po
index 67262de3fe7..bc138216152 100644
--- a/addons/board_document/i18n/zh_CN.po
+++ b/addons/board_document/i18n/zh_CN.po
@@ -4,33 +4,33 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-28 08:03+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: board_document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "新文件"
 
 #. module: board_document
 #: model:ir.actions.act_window,name:board_document.open_board_document_manager
 #: model:ir.ui.menu,name:board_document.menu_board_document_manager
 msgid "Document Dashboard"
-msgstr "文件控制台"
+msgstr "文档控制台"
 
 #. module: board_document
 #: view:board.board:0
@@ -40,38 +40,38 @@ msgstr "羞愧者名单"
 #. module: board_document
 #: view:board.board:0
 msgid "File Size by Month"
-msgstr "按月排列文件大小"
+msgstr "这个月的文件体积"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Month"
-msgstr "按月排列文件"
+msgstr "本月文件"
 
 #. module: board_document
 #: model:ir.actions.act_window,name:board_document.open_board_document_manager1
 #: model:ir.ui.menu,name:board_document.menu_board_document_manager1
 msgid "Statistics by User"
-msgstr "按用户排列统计数据"
+msgstr "用户统计"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Resource Type"
-msgstr "按资源类型排列文件"
+msgstr "文件资源的类型"
 
 #. module: board_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_document
 #: model:ir.module.module,shortdesc:board_document.module_meta_information
 msgid "Dashboard for Document Management"
-msgstr "文件管理控制台"
+msgstr "文档管理控制台"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr "按业务伙伴排列文件"
+msgstr "业务伙伴文件"
 
 #. module: board_document
 #: model:ir.ui.menu,name:board_document.menu_board_document
@@ -81,9 +81,12 @@ msgstr "文档"
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "按用户排列文件"
+msgstr "用户文件"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Document board"
 msgstr "文档面板"
+
+#~ msgid " This module implements a dashboard for Document "
+#~ msgstr " 这模块实现文档控制台 "
diff --git a/addons/board_manufacturing/i18n/zh_CN.po b/addons/board_manufacturing/i18n/zh_CN.po
index 0b3e874f770..a964216e394 100644
--- a/addons/board_manufacturing/i18n/zh_CN.po
+++ b/addons/board_manufacturing/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-28 08:08+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Procurement in Exception"
-msgstr "需求单异常"
+msgstr "产品需求异常"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -29,12 +29,12 @@ msgstr "下一批生产订单"
 #. module: board_manufacturing
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Deliveries (Out packing)"
-msgstr "送货(出货分拣单)"
+msgstr "已交付(从包装)"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -49,7 +49,7 @@ msgstr "生产"
 #. module: board_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_manufacturing
 #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
@@ -60,7 +60,7 @@ msgstr "生产仪表盘"
 #. module: board_manufacturing
 #: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
 msgid "Board for manufacturing"
-msgstr "生产控制台"
+msgstr "生产面板"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -71,3 +71,20 @@ msgstr "库存价值变更"
 #: view:board.board:0
 msgid "Workcenter futur load"
 msgstr "工作中心未来负荷"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module creates a dashboards for Manufaturing that includes:\n"
+#~ "    * List of next production orders\n"
+#~ "    * List of deliveries (out packing)\n"
+#~ "    * Graph of workcenter load\n"
+#~ "    * List of procurement in exception\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块创建生产控制台包括:\n"
+#~ "    *下一生产单列表\n"
+#~ "    *已交付列表(包装好)\n"
+#~ "    *工作中心负荷图形\n"
+#~ "    *产品需求异常列表\n"
+#~ "    "
diff --git a/addons/board_project/i18n/zh_CN.po b/addons/board_project/i18n/zh_CN.po
index 3d0c7bdcc3f..f29a6851dcd 100644
--- a/addons/board_project/i18n/zh_CN.po
+++ b/addons/board_project/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-16 13:28+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 07:39+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
@@ -30,7 +30,7 @@ msgstr "时间表"
 #. module: board_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_project
 #: view:board.board:0
@@ -41,7 +41,7 @@ msgstr "我的项目"
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr "我的项目截至期限"
+msgstr "我的任务最后期限"
 
 #. module: board_project
 #: view:project.task:0
@@ -52,23 +52,23 @@ msgstr "我的任务"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
 msgid "Public Notes"
-msgstr "发布备注"
+msgstr "公开备注"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.open_board_project
 #: model:ir.ui.menu,name:board_project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "项目控制台"
 
 #. module: board_project
 #: model:ir.module.module,shortdesc:board_project.module_meta_information
 msgid "Board for project users"
-msgstr ""
+msgstr "用户项目面板"
 
 #. module: board_project
 #: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
 msgid "Pipeline of tasks"
-msgstr "任务流水线"
+msgstr "任务管线"
 
 #. module: board_project
 #: view:board.board:0
@@ -85,12 +85,12 @@ msgstr "我的发票科目"
 #: model:ir.actions.act_window,name:board_project.open_board_project_manager
 #: model:ir.ui.menu,name:board_project.menu_board_project_manager
 msgid "Project Manager Dashboard"
-msgstr ""
+msgstr "项目管理控制台"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Deadlines"
-msgstr "我的截止日期"
+msgstr "我的最后期限"
 
 #. module: board_project
 #: constraint:ir.ui.view:0
@@ -110,30 +110,49 @@ msgstr "项目"
 #. module: board_project
 #: view:board.board:0
 msgid "Project manager board"
-msgstr ""
+msgstr "项目管理控制台"
 
 #. module: board_project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_project.action_view_task_tree
 msgid "My Open Tasks"
-msgstr "我进行中的任务列表"
+msgstr "我打开的任务"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "我的面板"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My tasks board"
-msgstr ""
+msgstr "我的任务面板"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My user's pipeline"
-msgstr ""
+msgstr "我用户的管线"
 
 #. module: board_project
 #: view:board.board:0
 msgid "My Timesheet"
 msgstr "我的时间表"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for project member that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * List of my next deadlines\n"
+#~ "    * List of public notes\n"
+#~ "    * Graph of my timesheet\n"
+#~ "    * Graph of my work analysis\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现项目的控制台包括:\n"
+#~ "    *我打开的任务列表\n"
+#~ "    *我的下一最后期限列表\n"
+#~ "    *公开备注列表\n"
+#~ "    *我的时间表图表\n"
+#~ "    *我的工作分析图形\n"
+#~ "    "
diff --git a/addons/board_sale/i18n/zh_CN.po b/addons/board_sale/i18n/zh_CN.po
index 62489348f86..93d4044730b 100644
--- a/addons/board_sale/i18n/zh_CN.po
+++ b/addons/board_sale/i18n/zh_CN.po
@@ -4,43 +4,43 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-07 11:12+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:39+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
 #: model:ir.module.module,shortdesc:board_sale.module_meta_information
 msgid "Dashboard for sales"
-msgstr "销售情况看板"
+msgstr "销售控制台"
 
 #. module: board_sale
 #: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
 #: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
 msgid "Sale Dashboard"
-msgstr "销售看板"
+msgstr "销售控制台"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales of the month"
-msgstr "该月销售情况"
+msgstr "当月销售"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Sales manager board"
-msgstr "销售经理控制台"
+msgstr "销售管理面板"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases of the month"
-msgstr "该月项目情况"
+msgstr "这月业务个案"
 
 #. module: board_sale
 #: constraint:ir.ui.view:0
@@ -50,12 +50,12 @@ msgstr "无效的XML视图结构！"
 #. module: board_sale
 #: view:board.board:0
 msgid "My open quotations"
-msgstr "我的公开报价"
+msgstr "我打开报价"
 
 #. module: board_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board_sale
 #: model:ir.ui.menu,name:board_sale.next_id_88
@@ -65,9 +65,28 @@ msgstr "销售"
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases statistics"
-msgstr "项目统计"
+msgstr "业务个案统计"
 
 #. module: board_sale
 #: view:board.board:0
 msgid "Top ten sales of the month"
-msgstr "当月十大销售排行"
+msgstr "当月销售"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module implements a dashboard for salesman that includes:\n"
+#~ "    * You open quotations\n"
+#~ "    * Top 10 sales of the month\n"
+#~ "    * Cases statistics\n"
+#~ "    * Graph of sales by product\n"
+#~ "    * Graph of cases of the month\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块实现业务员控制台包括:\n"
+#~ "    *你待处理的报价\n"
+#~ "    *这月前10业务员\n"
+#~ "    *业务统计\n"
+#~ "    *销售产品图表\n"
+#~ "    *月份业务图表\n"
+#~ "    "
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 2afcf6857dd..e4cc8720bc9 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-01-10 02:19+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:46+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -522,7 +522,7 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #. module: crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中无效的模型名"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2769,7 +2769,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr "最大通讯记录"
+msgstr "最大通信日志"
 
 #. module: crm
 #: view:crm.lead:0
@@ -4090,3 +4090,18 @@ msgstr ""
 
 #~ msgid "Update The Proposed Menus To Be Created"
 #~ msgstr "更新创建的被提议的菜单"
+
+#~ msgid "Excluded Answers :"
+#~ msgstr "排除的答案:"
+
+#~ msgid "Profiling"
+#~ msgstr "轮廓"
+
+#~ msgid "Profiling Options"
+#~ msgstr "轮廓选项"
+
+#~ msgid "Included Answers :"
+#~ msgstr "包括回答:"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr "计算开始时间+持续时间"
diff --git a/addons/crm_vertical/i18n/zh_CN.po b/addons/crm_vertical/i18n/zh_CN.po
index 27ca3fcd6e4..b1ac8934768 100644
--- a/addons/crm_vertical/i18n/zh_CN.po
+++ b/addons/crm_vertical/i18n/zh_CN.po
@@ -4,19 +4,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-04 15:24+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:46+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
 #: model:ir.module.module,description:crm_vertical.module_meta_information
 msgid "Simplification of the interface for CRM."
-msgstr "针对 CRM界面 的 简 化"
+msgstr "CRM简单界面"
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 1da056817be..ac065f430e0 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -4,23 +4,23 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:52+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 07:47+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -30,7 +30,7 @@ msgstr ">="
 #. module: delivery
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -40,12 +40,12 @@ msgstr "目的地"
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
 msgid "Delivery by Poste"
-msgstr "由邮政运输"
+msgstr "邮递送货"
 
 #. module: delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -60,22 +60,22 @@ msgstr "状态"
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
-msgstr "当按分拣单发票时使用该送货方式。"
+msgstr "这送货方式将用在包装的发票上"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr "运费网格"
+msgstr "送货网"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr "从邮编"
+msgstr "开始邮编"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -85,19 +85,19 @@ msgstr "固定的"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr "表格明细"
+msgstr "网格明细"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr "货运价格表"
+msgstr "送货价格表"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
 msgid "Generate Draft Invoices On Receptions"
-msgstr "收货时产生发票草稿"
+msgstr "在接收产生发票草稿"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
@@ -107,17 +107,17 @@ msgstr "运费表格行"
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr "运输"
+msgstr "送货"
 
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr "表格明细"
+msgstr "网格明细"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr "表格"
+msgstr "网格"
 
 #. module: delivery
 #: view:res.partner:0
@@ -133,13 +133,13 @@ msgstr "现用"
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr "表格定义"
+msgstr "网格定义"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Weight * Volume"
-msgstr "重量＊体积"
+msgstr "重量* 体积"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -149,7 +149,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "产品递送"
+msgstr "产品送货"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -174,7 +174,7 @@ msgstr "名称"
 #. module: delivery
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: delivery
 #: field:delivery.grid,country_ids:0
@@ -185,7 +185,7 @@ msgstr "国家"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: delivery
 #: view:sale.order:0
@@ -214,7 +214,7 @@ msgstr "运费表格名称"
 #: field:delivery.grid,carrier_id:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "货运公司"
+msgstr "运输公司"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -231,7 +231,7 @@ msgstr "最大值"
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,delivery:0
 msgid "Add Delivery Costs"
-msgstr "添加运输费用"
+msgstr "增加送货成本"
 
 #. module: delivery
 #: wizard_field:delivery.sale.order,init,carrier_id:0
@@ -259,7 +259,7 @@ msgstr "运输公司和送货"
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr "运费表格"
+msgstr "送货网"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -271,12 +271,12 @@ msgstr "重量"
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Carrier Partner"
-msgstr "承运业务伙伴"
+msgstr "运输业务伙伴"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -284,24 +284,24 @@ msgid ""
 "Allows you to add delivery methods in sales orders and packing. You can "
 "define your own carrier and delivery grids for prices. When creating "
 "invoices from picking, Open ERP is able to add and compute the shipping line."
-msgstr "让你在销售单和分拣单中增加送货方式。你能定义自己的运输公司和运费表格的价格。当根据分拣单创建发票时，系统可以增加并计算运输明细"
+msgstr "允许你在销售单和包装中增加送货方式.你能定义自己的运输公司和送货网的价格.当创建领料/提货发票时,系统可以增加和计算运输明细"
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr "至邮编"
+msgstr "到达邮编"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
 msgid "Packing to be invoiced"
-msgstr "将开发票的分拣单"
+msgstr "包装要开发票"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on packing."
-msgstr "如果你计划基于分拣单开运输发票请填写这字段"
+msgstr "如果你计划基于包装开运输发票请完整填写这字段"
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
@@ -311,12 +311,12 @@ msgstr "送货成本"
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
 msgid "Sale Price"
-msgstr "售价"
+msgstr "销售价格"
 
 #. module: delivery
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的条码"
+msgstr "错误:无效EAN编码"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -343,9 +343,12 @@ msgstr "价格"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr "增值税似乎不正确。"
+msgstr "这增值税似乎不正确"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
 msgstr "价格类型"
+
+#~ msgid "<="
+#~ msgstr "<="
diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po
index 6b009d4e408..9725192806b 100644
--- a/addons/document/i18n/fi.po
+++ b/addons/document/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 10:06+0000\n"
-"Last-Translator: NightSpirit <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 20:37+0000\n"
+"Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -147,13 +147,13 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "File Information"
-msgstr ""
+msgstr "Tiedoston tiedot"
 
 #. module: document
 #: field:document.directory,file_ids:0
 #: view:ir.attachment:0
 msgid "Files"
-msgstr ""
+msgstr "Tiedostot"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -208,7 +208,7 @@ msgstr ""
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Link"
-msgstr ""
+msgstr "Linkki"
 
 #. module: document
 #: view:document.directory:0
@@ -224,7 +224,7 @@ msgstr "Ryhmät"
 #. module: document
 #: field:document.directory.content,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Raportti"
 
 #. module: document
 #: help:document.configuration.wizard,host:0
@@ -248,7 +248,7 @@ msgstr "Data"
 #. module: document
 #: view:ir.attachment:0
 msgid "Notes"
-msgstr ""
+msgstr "Huomautukset"
 
 #. module: document
 #: view:ir.attachment:0
@@ -259,7 +259,7 @@ msgstr ""
 #. module: document
 #: view:document.directory:0
 msgid "Definition"
-msgstr ""
+msgstr "Määritelmä"
 
 #. module: document
 #: constraint:ir.ui.view:0
@@ -308,7 +308,7 @@ msgstr "Hakemistot"
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Sarja"
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
@@ -462,7 +462,7 @@ msgstr "PDF raportti"
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumenttityyppi"
 
 #. module: document
 #: field:document.directory,child_ids:0
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 9d21cf6161a..8d6f0cf4e8a 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-01 23:45+0000\n"
-"Last-Translator: mrshelly <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:19+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,create_date:0
 msgid "Date Created"
-msgstr "创建时间"
+msgstr "建立日期"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -35,7 +35,7 @@ msgstr "含记录名称"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -45,7 +45,7 @@ msgstr "模块ID"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr "错误！您不能创建循环目录。"
+msgstr "错误:你无法建立递归的目录"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
@@ -60,7 +60,7 @@ msgstr "预览"
 #. module: document
 #: field:ir.attachment,store_method:0
 msgid "Storing Method"
-msgstr "存储方法"
+msgstr "保存方式"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -77,7 +77,7 @@ msgstr "文件大小"
 msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
-msgstr "如果你想文件名以记录名称开始请选择它."
+msgstr "如果你想文件名开始是记录名称请选择它."
 
 #. module: document
 #: selection:document.directory,type:0
@@ -87,7 +87,7 @@ msgstr "其它资源"
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr "上级模式"
+msgstr "上级式样"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -102,7 +102,7 @@ msgstr "附件"
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -112,20 +112,20 @@ msgstr "静态目录"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr "目录内容类型"
+msgstr "目录内容分类"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr "如果您想要自动筛选可见资源的话请使用定义域。"
+msgstr "如果你想使用可见资源的自动过滤这是使用的范围"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
-msgstr "如果您想要选定的对象使用与系统内部相同树结构的话请选定这个复选框。"
+msgstr "如果你想在系统中使用相同的对象树状结构请选择这"
 
 #. module: document
 #: field:document.directory,type:0
@@ -141,7 +141,7 @@ msgstr "目录结构"
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr "上级条目"
+msgstr "上级"
 
 #. module: document
 #: view:ir.attachment:0
@@ -157,7 +157,7 @@ msgstr "文件"
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr "已保存文件名"
+msgstr "保存文件名"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -168,7 +168,7 @@ msgstr "最近修改用户"
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Configure"
-msgstr "配置"
+msgstr "设置"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -178,14 +178,14 @@ msgstr "树结构"
 #. module: document
 #: field:ir.attachment,title:0
 msgid "Resource Title"
-msgstr "资源标题"
+msgstr "标题"
 
 #. module: document
 #: model:ir.actions.todo,note:document.config_auto_directory
 msgid ""
 "This wizard will configure the URL of the server of the document management "
 "system."
-msgstr "该向导将配置文档管理系统的统一资源定位码（URL）"
+msgstr "这向导将配置文档管理系统的URL"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -197,7 +197,7 @@ msgstr "目录内容"
 msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
-msgstr "如果您在这填上对象则目录模板将作为这些对象的下级出现。如果您选择了一个上级模型的话不要填写上级目录。"
+msgstr "如果你在这填上对象,这目录的模板将涵盖所有的对象.如果您选择母公司模式不要填入父目录"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
@@ -218,7 +218,7 @@ msgstr "目录类型"
 #: field:document.directory,group_ids:0
 #: field:ir.attachment,group_ids:0
 msgid "Groups"
-msgstr "用户组"
+msgstr "组"
 
 #. module: document
 #: field:document.directory.content,report_id:0
@@ -230,14 +230,14 @@ msgstr "报表"
 msgid ""
 "Put here the server address or IP. Keep localhost if you don't know what to "
 "write."
-msgstr "在此输入服务器地址或IP编号。如果你不知道怎样写请用localhost。"
+msgstr "输入服务器地址或IP.如果你不知道怎样写请保持本地"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid ""
 "This wizard will automatically configure the document management system "
 "according to modules installed on your system."
-msgstr "该向导将根据您系统安装的模块自动设置文档管理系统"
+msgstr "该向导将根据你系统安装的模块自动设置文档管理系统"
 
 #. module: document
 #: view:ir.attachment:0
@@ -253,7 +253,7 @@ msgstr "备注"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr "索引内容"
+msgstr "内容索引"
 
 #. module: document
 #: view:document.directory:0
@@ -263,7 +263,7 @@ msgstr "定义"
 #. module: document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
@@ -273,10 +273,10 @@ msgid ""
 "    * User Authentication\n"
 "    * Document Indexation\n"
 msgstr ""
-"这是完善的文档管理系统，其特性包括：\n"
-"    * FTP 界面\n"
-"    * 用户验证\n"
-"    * 文档索引\n"
+"一个完整的文档管理系统包括:\n"
+"            * FTP界面\n"
+"            * 用户认证\n"
+"            * 文档索引\n"
 
 #. module: document
 #: field:document.directory,name:0
@@ -286,7 +286,7 @@ msgstr "名称"
 #. module: document
 #: field:document.directory.content.type,code:0
 msgid "Extension"
-msgstr "扩展名"
+msgstr "延伸"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
@@ -302,7 +302,7 @@ msgstr "虚拟文件"
 #: view:document.directory:0
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
-msgstr "目录列表"
+msgstr "目录"
 
 #. module: document
 #: view:document.directory:0
@@ -312,29 +312,29 @@ msgstr "序号"
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr "综合的文档管理系统"
+msgstr "完整的文档管理系统"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
 #: field:ir.attachment,parent_id:0
 msgid "Directory"
-msgstr "目录"
+msgstr "说明"
 
 #. module: document
 #: field:document.directory,user_id:0
 #: field:ir.attachment,user_id:0
 msgid "Owner"
-msgstr "所有者"
+msgstr "拥有者"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
 msgid "document.configuration.wizard"
-msgstr "document.configuration.wizard"
+msgstr "文档结构向导"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr "附加到"
+msgstr "附属于"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
@@ -357,7 +357,7 @@ msgstr "安全"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_browse
 msgid "Browse Files Using FTP"
-msgstr "使用FTP浏览文件"
+msgstr "浏览文件使用FTP"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -367,30 +367,33 @@ msgstr "目录映射到对象"
 #. module: document
 #: view:ir.attachment:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
 msgid ""
 "Select an object here and Open ERP will create a mapping for each of these "
 "objects, using the given domain, when browsing through FTP."
-msgstr "在此选择一个对象使OpenERP系统使用已给定义域为每个对象创建一个链接，以便通过FTP浏览。"
+msgstr ""
+"选择一对象,系统将创建一个每个对象的列表,使用给定的域,通过FTP浏览\"\n"
+"document,view,document.directory,0,Seq.,序列\n"
+"document,field,document.directory.content"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Others Info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr "域"
+msgstr "隶属"
 
 #. module: document
 #: field:document.directory,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
-msgstr "修改时间"
+msgstr "修改日期"
 
 #. module: document
 #: field:document.directory.content,suffix:0
@@ -426,22 +429,22 @@ msgstr "创建者"
 #. module: document
 #: view:document.directory:0
 msgid "Auto-Generated Files"
-msgstr "自动生成的文件"
+msgstr "自动产生文件"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Search a File"
-msgstr "搜索文件"
+msgstr "搜索一个文件"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Auto Configure"
-msgstr "自动配置"
+msgstr "自动设置"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -456,7 +459,7 @@ msgstr "业务伙伴"
 #. module: document
 #: view:document.directory:0
 msgid "PDF Report"
-msgstr "PDF 报表"
+msgstr "PDF报表"
 
 #. module: document
 #: field:document.directory.content,extension:0
@@ -466,9 +469,12 @@ msgstr "文档类型"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr "下级目录"
+msgstr "子目录"
 
 #. module: document
 #: view:document.directory:0
 msgid "Contents"
 msgstr "内容"
+
+#~ msgid "Active"
+#~ msgstr "生效"
diff --git a/addons/document_ics/i18n/fi.po b/addons/document_ics/i18n/fi.po
index 5aa0cc8cf73..06a64b48b60 100644
--- a/addons/document_ics/i18n/fi.po
+++ b/addons/document_ics/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 18:35+0000\n"
-"Last-Translator: T Kortehisto <Unknown>\n"
+"PO-Revision-Date: 2010-03-19 18:37+0000\n"
+"Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -76,7 +76,7 @@ msgstr "Kalenterin jaetut tapaamiset"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "url"
-msgstr ""
+msgstr "URL"
 
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Jäljittää tunnistetut liiketoimintamahdollisuudet myyntikanavalle."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
@@ -210,6 +210,8 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Hallinnoi toimittajien ja asiakkaiden reklamaatioita, sisältäen sinun "
+"korjaavat tai estävät toiminnot."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -234,7 +236,7 @@ msgstr "Jaettu kalenteri"
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr ""
+msgstr "Vaateet"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
@@ -261,7 +263,7 @@ msgstr "Ohjelmointivirheiden jäljitys"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "categories"
-msgstr ""
+msgstr "luokat"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
@@ -311,7 +313,7 @@ msgstr ""
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 459f7dab1a7..26e7f0916d0 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -4,23 +4,23 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 02:35+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:19+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -30,27 +30,27 @@ msgstr "用户标识符"
 #. module: document_ics
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr "错误！您不能创建递归目录。"
+msgstr "错误:你无法建立递归的目录"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr "招聘流程"
+msgstr "招聘过程"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure Calendars for CRM Sections"
-msgstr "设置客户关系管理组的日程表"
+msgstr "客户关系管理部分设置日程表"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr "求助台"
+msgstr "求助"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "Open ERP Field"
-msgstr "Open ERP系统字段"
+msgstr "系统字段"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -80,62 +80,62 @@ msgstr "信息地址（url）"
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on softwares"
-msgstr "公司用于进行跟踪错误和软件支持请求"
+msgstr "公司用于跟踪缺陷和支持请求的软件"
 
 #. module: document_ics
 #: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
 msgid ""
 "This Configuration step use to create Calendars in document for all Case "
 "Sections"
-msgstr "该设置步骤用于在所有案例组创建日程表"
+msgstr "这设置步骤用于创建在所有业务个案项文档的日程表"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
-msgstr "dtend"
+msgstr "结束"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,jobs:0
 msgid ""
 "Help you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
-msgstr "帮助您组织职位招聘过程:评价、面试、电子邮件一体化"
+msgstr "帮助你组织招聘过程:评论,会议,电子邮件一体化"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "description"
-msgstr "描述"
+msgstr "说明"
 
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
-msgstr "为案例组设置日程表 "
+msgstr "部分设置日程表 "
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "从你的销售管线跟踪出销售机会"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr "这也许有助于协会筹款的进程和跟踪"
+msgstr "这可能有助于协会在资助和投资过程和跟踪"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr "管理求助台服务"
+msgstr "管理求助服务"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr "筹款运作"
+msgstr "资助和投资行动"
 
 #. module: document_ics
 #: field:document.directory.content,ics_object_id:0
@@ -145,32 +145,32 @@ msgstr "对象"
 #. module: document_ics
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr "错误！你不能创建递归的组。"
+msgstr "错误！你不能创建递归的项"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
 msgid "Support for iCal based on Document Management System"
-msgstr "根据文档管理系统支持iCal"
+msgstr "支持iCal的文档管理系统"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "location"
-msgstr "位置"
+msgstr "本地"
 
 #. module: document_ics
 #: view:document.directory:0
 msgid "ICS Calendar"
-msgstr "ICS 日历"
+msgstr "ICS日程表"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,name:0
 msgid "ICS Value"
-msgstr "ICS 值"
+msgstr "ICS值"
 
 #. module: document_ics
 #: model:ir.module.module,description:document_ics.module_meta_information
 msgid "Allows to synchronise calendars with others applications."
-msgstr "使得日程表可与其他应用软件同步"
+msgstr "允许的同步其它应用日程表"
 
 #. module: document_ics
 #: constraint:ir.ui.view:0
@@ -182,12 +182,12 @@ msgstr "无效XML视图结构!"
 msgid ""
 "Allows you to track and manage prospects which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
-msgstr "让您跟踪，管理潜在客户（售前请求和联系人），初次联系客户的请求"
+msgstr "允许你跟踪管理潜在客户的售前请求和联系,初次联系客户的请求"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
 msgid "Name"
-msgstr "姓名"
+msgstr "名称"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
@@ -197,29 +197,29 @@ msgstr "管理用户的会议日程表"
 #. module: document_ics
 #: field:document.directory.content,ics_domain:0
 msgid "Domain"
-msgstr "定义域"
+msgstr "隶属"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
 msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
-msgstr "管理客户和供应商的索求，包括你的纠正或预防措施"
+msgstr "管理这支援和客户服务要求包括你的纠正或预防"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "last-modified"
-msgstr "最后修正"
+msgstr "最近修改"
 
 #. module: document_ics
 #: view:document.directory:0
 msgid "ICS Mapping"
-msgstr "ICS 对应"
+msgstr "ICS一览"
 
 #. module: document_ics
 #: view:crm.case:0
 msgid "Duration(In Hour)"
-msgstr "持续时间（小时）"
+msgstr "持续时间(小时)"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
@@ -229,19 +229,19 @@ msgstr "共享的日程表"
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr "索赔"
+msgstr "服务要求"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
 msgid ""
 "Help you to encode the result of a phone call or to planify a list of phone "
 "calls to process."
-msgstr "帮助你将电话呼叫结果记录或规划电话呼叫列表用来处理"
+msgstr "帮助你编电话呼叫结果或编制电话呼叫处理的列表"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstart"
-msgstr "dtstart"
+msgstr "开始"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,phonecall:0
@@ -251,7 +251,7 @@ msgstr "电话呼叫"
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
 msgid "Bug Tracking"
-msgstr "错误跟踪"
+msgstr "缺陷跟踪"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -271,17 +271,17 @@ msgstr "创建预先设置的日程表"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "created"
-msgstr "已创建"
+msgstr "创建"
 
 #. module: document_ics
 #: field:crm.case,code:0
 msgid "Calendar Code"
-msgstr "日历编码"
+msgstr "日程表代码"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "summary"
-msgstr "概要"
+msgstr "参考"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
@@ -291,17 +291,17 @@ msgstr "document.ics.crm.wizard"
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "attendee"
-msgstr "出席者"
+msgstr "出勤者"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_ics_fields
 msgid "document.directory.ics.fields"
-msgstr "document.directory.ics.fields"
+msgstr "字段"
 
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
 msgid "Fields Mapping"
-msgstr "字段对应"
+msgstr "字段一览"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -311,9 +311,14 @@ msgstr "取消"
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
 msgid "Business Opportunities"
-msgstr "商机"
+msgstr "销售机会"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstamp"
-msgstr "dtstamp"
+msgstr "标记"
+
+#~ msgid ""
+#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
+#~ "outlook, Sunbird, ical, ..."
+#~ msgstr " 允许同步系统日程表,电话等等"
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index a7bf9604416..acd2fb18bd8 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -1,20 +1,19 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* document_ics
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-30 15:14+0000\n"
-"PO-Revision-Date: 2010-01-10 01:57+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"PO-Revision-Date: 2010-03-20 08:21+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
@@ -29,3 +28,185 @@ msgstr ""
 "\t* WebDav 接口\n"
 "\t* 用户认证\n"
 "\t* 文档索引\n"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "错误:你无法建立递归的目录"
+
+#~ msgid "Jobs Hiring Process"
+#~ msgstr "招聘过程"
+
+#~ msgid "Configure Calendars for CRM Sections"
+#~ msgstr "客户关系管理部分设置日程表"
+
+#~ msgid "Helpdesk"
+#~ msgstr "求助"
+
+#~ msgid "Open ERP Field"
+#~ msgstr "系统字段"
+
+#~ msgid "Next"
+#~ msgstr "下一个"
+
+#~ msgid "Content"
+#~ msgstr "内容"
+
+#~ msgid "Calendar of Meetings"
+#~ msgstr "会议日程表"
+
+#~ msgid "Shared Calendar Meetings"
+#~ msgstr "共享的会议日程表"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "在这动作定义中有无效的模块名"
+
+#~ msgid "Used by companies to track bugs and support requests on softwares"
+#~ msgstr "公司用于跟踪缺陷和支持请求的软件"
+
+#~ msgid ""
+#~ "This Configuration step use to create Calendars in document for all Case "
+#~ "Sections"
+#~ msgstr "这设置步骤用于创建在所有业务个案项文档的日程表"
+
+#~ msgid "dtend"
+#~ msgstr "结束"
+
+#~ msgid ""
+#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
+#~ "integration..."
+#~ msgstr "帮助你组织招聘过程:评论,会议,电子邮件一体化"
+
+#~ msgid "description"
+#~ msgstr "说明"
+
+#~ msgid "Configure Calendars for Sections "
+#~ msgstr "部分设置日程表 "
+
+#~ msgid "Tracks identified business opportunities for your sales pipeline."
+#~ msgstr "从你的销售管线跟踪出销售机会"
+
+#~ msgid ""
+#~ "This may help associations in their fund raising process and tracking."
+#~ msgstr "这可能有助于协会在资助和投资过程和跟踪"
+
+#~ msgid "Manages an Helpdesk service."
+#~ msgstr "管理求助服务"
+
+#~ msgid "Fund Raising Operations"
+#~ msgstr "资助和投资行动"
+
+#~ msgid "Object"
+#~ msgstr "对象"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "错误！你不能创建递归的项"
+
+#~ msgid "Support for iCal based on Document Management System"
+#~ msgstr "支持iCal的文档管理系统"
+
+#~ msgid ""
+#~ " Will allow you to synchronise your Open ERP calendars with your phone, "
+#~ "outlook, Sunbird, ical, ..."
+#~ msgstr " 允许同步系统日程表,电话等等"
+
+#~ msgid "location"
+#~ msgstr "本地"
+
+#~ msgid "ICS Calendar"
+#~ msgstr "ICS日程表"
+
+#~ msgid "ICS Value"
+#~ msgstr "ICS值"
+
+#~ msgid "Allows to synchronise calendars with others applications."
+#~ msgstr "允许的同步其它应用日程表"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
+#~ msgid ""
+#~ "Allows you to track and manage prospects which are pre-sales requests or "
+#~ "contacts, the very first contact with a customer request."
+#~ msgstr "允许你跟踪管理潜在客户的售前请求和联系,初次联系客户的请求"
+
+#~ msgid "Name"
+#~ msgstr "名称"
+
+#~ msgid "Manages the calendar of meetings of the users."
+#~ msgstr "管理用户的会议日程表"
+
+#~ msgid "Domain"
+#~ msgstr "隶属"
+
+#~ msgid ""
+#~ "Manages the supplier and customers claims, including your corrective or "
+#~ "preventive actions."
+#~ msgstr "管理这支援和客户服务要求包括你的纠正或预防"
+
+#~ msgid "last-modified"
+#~ msgstr "最近修改"
+
+#~ msgid "ICS Mapping"
+#~ msgstr "ICS一览"
+
+#~ msgid "Duration(In Hour)"
+#~ msgstr "持续时间(小时)"
+
+#~ msgid "Shared Calendar"
+#~ msgstr "共享的日程表"
+
+#~ msgid "Claims"
+#~ msgstr "服务要求"
+
+#~ msgid ""
+#~ "Help you to encode the result of a phone call or to planify a list of phone "
+#~ "calls to process."
+#~ msgstr "帮助你编电话呼叫结果或编制电话呼叫处理的列表"
+
+#~ msgid "dtstart"
+#~ msgstr "开始"
+
+#~ msgid "Phone Calls"
+#~ msgstr "电话呼叫"
+
+#~ msgid "Bug Tracking"
+#~ msgstr "缺陷跟踪"
+
+#~ msgid "categories"
+#~ msgstr "分类"
+
+#~ msgid "Prospect"
+#~ msgstr "潜在客户"
+
+#~ msgid "Create Pre-Configured Calendars"
+#~ msgstr "创建预先设置的日程表"
+
+#~ msgid "created"
+#~ msgstr "创建"
+
+#~ msgid "Calendar Code"
+#~ msgstr "日程表代码"
+
+#~ msgid "summary"
+#~ msgstr "参考"
+
+#~ msgid "attendee"
+#~ msgstr "出勤者"
+
+#~ msgid "document.directory.ics.fields"
+#~ msgstr "字段"
+
+#~ msgid "Fields Mapping"
+#~ msgstr "字段一览"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Business Opportunities"
+#~ msgstr "销售机会"
+
+#~ msgid "dtstamp"
+#~ msgstr "标记"
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index e071cf1048f..5db188a758c 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -4,73 +4,73 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-07 11:24+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:report.event.registration,date_end:0
 msgid "Ending date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "最小记录"
 
 #. module: event
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr "注册电子邮件"
+msgstr "记录邮件"
 
 #. module: event
 #: model:crm.case.section,name:event.event_0_crm_case_section
 msgid "Concert of Bon Jovi"
-msgstr "邦侨维演唱会"
+msgstr "Bon Jovi音乐会"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "确认电子邮件"
+msgstr "确认邮件"
 
 #. module: event
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr "错误！你不能创建递归的组。"
+msgstr "错误！你不能创建递归的项"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr "事件注册"
+msgstr "事件记录"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
 msgid "Make Invoice"
-msgstr "生成发票"
+msgstr "创建发票"
 
 #. module: event
 #: field:report.event.type.registration,draft_state:0
 msgid "Draft Registrations"
-msgstr "草案注册"
+msgstr "记录草稿"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "注册的事件"
+msgstr "记录的事件"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,end:0
@@ -80,7 +80,7 @@ msgstr "确定"
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr "自动配置邮件"
+msgstr "邮件自动确认"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
@@ -90,7 +90,7 @@ msgstr "歌剧门票"
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rejected:0
 msgid "Invoice Rejected"
-msgstr ""
+msgstr "发票被拒绝"
 
 #. module: event
 #: view:event.event:0
@@ -100,12 +100,12 @@ msgstr "确认事件"
 #. module: event
 #: model:crm.case.section,name:event.event_1_crm_case_section
 msgid "Opera of Verdi"
-msgstr "威尔第歌剧"
+msgstr "Verdi歌剧"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid "Draft Registration"
-msgstr ""
+msgstr "记录草稿"
 
 #. module: event
 #: wizard_view:event.reg_make_invoice,init:0
@@ -130,6 +130,11 @@ msgid ""
 "event or per event category in :\n"
 "                Events / Reporting\n"
 msgstr ""
+"组织和事件管理\n"
+"这模块允许你\n"
+"* 管理你的事务\n"
+"* 使用电子邮件自动确认和发送致谢到登记的每个事务\n"
+"....\n"
 
 #. module: event
 #: view:event.registration:0
@@ -139,7 +144,7 @@ msgstr "额外信息"
 #. module: event
 #: view:event.registration:0
 msgid "Registration"
-msgstr "登记"
+msgstr "记录"
 
 #. module: event
 #: field:event.type,name:0
@@ -158,12 +163,12 @@ msgstr "事件"
 #. module: event
 #: selection:event.event,state:0
 msgid "Confirmed"
-msgstr "已确认"
+msgstr "确认"
 
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
 msgid "Registration Confirmation"
-msgstr "登记确认"
+msgstr "记录确认"
 
 #. module: event
 #: view:event.registration:0
@@ -175,42 +180,42 @@ msgstr "日期"
 #: model:ir.actions.act_window,name:event.action_registration_confirm
 #: model:ir.ui.menu,name:event.menu_action_registration_confirm
 msgid "Confirmed Registrations"
-msgstr "已确认的登记列表"
+msgstr "确认记录"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr "邮件自动注册"
+msgstr "邮件自动记录"
 
 #. module: event
 #: view:event.registration:0
 msgid "Badge"
-msgstr "徽章"
+msgstr "标志"
 
 #. module: event
 #: field:event.event,section_id:0
 msgid "Case section"
-msgstr "案例栏目"
+msgstr "业务个案项"
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr "待开票"
+msgstr "开发票"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_event
 msgid "All Events"
-msgstr "全部事件"
+msgstr "所有事件"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_report_event
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: event
 #: view:event.registration:0
 msgid "Cancel Registration"
-msgstr "取消登记"
+msgstr "取消记录"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_action_event_categories
@@ -220,24 +225,24 @@ msgstr "事件分类"
 #. module: event
 #: wizard_view:event.confirm_registration,split:0
 msgid "The event limit is reached. What do you want to do?"
-msgstr ""
+msgstr "这事件到达限制.你想要怎么做?"
 
 #. module: event
 #: field:report.event.type.registration,confirm_state:0
 msgid "Confirm Registrations"
-msgstr ""
+msgstr "确认记录"
 
 #. module: event
 #: view:event.registration:0
 msgid "References"
-msgstr "引用"
+msgstr "参考"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type_registration
 #: model:ir.ui.menu,name:event.menu_report_event_type_registration
 #: view:report.event.type.registration:0
 msgid "Registration By Event Types"
-msgstr ""
+msgstr "记录的事件类型"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_config
@@ -247,27 +252,27 @@ msgstr "设置"
 #. module: event
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: event
 #: wizard_button:event.confirm_registration,split,confirm:0
 msgid "Confirm Anyway"
-msgstr "总是确认"
+msgstr "无论如何确认"
 
 #. module: event
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: event
 #: view:event.event:0
 msgid "Parent Category"
-msgstr "上级分类"
+msgstr "业务伙伴分类"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registration Invoiced"
-msgstr ""
+msgstr "记录发票"
 
 #. module: event
 #: field:report.event.type.registration,nbevent:0
@@ -282,39 +287,39 @@ msgstr "取消事件"
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
 msgid "Error Messages"
-msgstr "错误消息"
+msgstr "错误信息"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr "邮寄"
+msgstr "邮递"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr "演唱会票"
+msgstr "音乐会门票"
 
 #. module: event
 #: field:event.event,register_prospect:0
 #: model:ir.actions.act_window,name:event.action_registration_draft
 #: model:ir.ui.menu,name:event.menu_action_registration_draft
 msgid "Unconfirmed Registrations"
-msgstr ""
+msgstr "不确认记录"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr "业务伙伴已开票"
+msgstr "业务伙伴发票"
 
 #. module: event
 #: view:event.registration:0
 msgid "Communication history"
-msgstr "通讯记录"
+msgstr "沟通日志"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: event
 #: view:event.event:0
@@ -324,19 +329,19 @@ msgstr "事件完成"
 #. module: event
 #: field:event.registration,badge_name:0
 msgid "Badge Name"
-msgstr "徽章名称"
+msgstr "标志名称"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_registration
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 msgid "Events On Registrations"
-msgstr ""
+msgstr "记录的事件"
 
 #. module: event
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类下。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: event
 #: wizard_field:event.reg_make_invoice,init,inv_created:0
@@ -361,18 +366,18 @@ msgstr "事件说明"
 #. module: event
 #: model:ir.model,name:event.model_report_event_type_registration
 msgid "Event type on registration"
-msgstr ""
+msgstr "记录的事件类型"
 
 #. module: event
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: event
 #: field:event.registration,event_id:0
 msgid "Event Related"
-msgstr "关联的事件"
+msgstr "有关事件"
 
 #. module: event
 #: model:crm.case.section,name:event.case_section_event
@@ -384,174 +389,174 @@ msgstr "事件"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr "登记数"
+msgstr "记录数"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,state:0
 #: view:event.registration:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_categories
 msgid "Events by section"
-msgstr ""
+msgstr "事件项"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_action_registration
 msgid "All Registrations"
-msgstr ""
+msgstr "所有记录"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use the automatic mailing for new registration"
-msgstr ""
+msgstr "如果你使用自动邮递一个新记录"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: event
 #: view:event.registration:0
 #: model:ir.actions.wizard,name:event.event_confirm_registration
 #: field:report.event.registration,confirm_state:0
 msgid "Confirm Registration"
-msgstr ""
+msgstr "确认记录"
 
 #. module: event
 #: view:event.registration:0
 msgid "History"
-msgstr ""
+msgstr "日志"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr ""
+msgstr "事件类型"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "业务伙伴联系人"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "自动确认邮件"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send Reminder"
-msgstr ""
+msgstr "发送提醒"
 
 #. module: event
 #: selection:event.event,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: event
 #: field:event.event,date_begin:0
 #: field:report.event.registration,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: event
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: event
 #: model:ir.model,name:event.model_report_event_registration
 msgid "Events on registrations"
-msgstr ""
+msgstr "记录的事件"
 
 #. module: event
 #: wizard_button:event.confirm_registration,split,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: event
 #: wizard_button:event.reg_make_invoice,init,open:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: event
 #: field:event.registration,badge_title:0
 msgid "Badge Title"
-msgstr ""
+msgstr "标志称谓"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_new_event_form
 #: model:ir.ui.menu,name:event.menu_event_new_event
 msgid "New event"
-msgstr ""
+msgstr "新事件"
 
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "单价"
 
 #. module: event
 #: model:crm.case.section,name:event.event_2_crm_case_section
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "ERP Buisness会议"
 
 #. module: event
 #: field:event.registration,badge_partner:0
 msgid "Badge Partner"
-msgstr ""
+msgstr "业务伙伴标志"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view_confirm
 #: model:ir.ui.menu,name:event.menu_event_event_confirm
 msgid "Confirmed Events"
-msgstr ""
+msgstr "确认事件"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "最大记录"
 
 #. module: event
 #: field:event.event,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "有人赞同确认事件将发送这邮件"
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
 msgid "Ticket for Conference"
-msgstr ""
+msgstr "会议门票"
 
 #. module: event
 #: field:event.registration,case_id:0
 msgid "Case"
-msgstr ""
+msgstr "业务个案"
 
 #. module: event
 #: view:event.event:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
 msgid ""
 "Check this box if you want ot use the automatic confirmation emailing or the "
 "reminder"
-msgstr ""
+msgstr "如果你使用自动邮件确认或提醒"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -559,63 +564,66 @@ msgid ""
 "This email will be sent when the event gets confimed or when someone "
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
-msgstr ""
+msgstr "当有人确认这事件或赞同这确认时这邮件将被发送以提醒有关人等"
 
 #. module: event
 #: field:event.event,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: event
 #: field:event.registration,invoice_label:0
 msgid "Label Invoice"
-msgstr ""
+msgstr "发票标签"
 
 #. module: event
 #: view:event.registration:0
 msgid "Payments"
-msgstr ""
+msgstr "付款"
 
 #. module: event
 #: view:event.type:0
 #: field:report.event.type.registration,name:0
 msgid "Event Type"
-msgstr ""
+msgstr "事件类型"
 
 #. module: event
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event.action_registration
 #: model:ir.actions.wizard,name:event.wizard_event_registration
 msgid "Registrations"
-msgstr ""
+msgstr "记录"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_view_draft
 #: model:ir.ui.menu,name:event.menu_event_event_draft
 msgid "Draft Events"
-msgstr ""
+msgstr "事件草稿"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_main
 msgid "Events Organisation"
-msgstr ""
+msgstr "事件系统"
 
 #. module: event
 #: view:event.registration:0
 msgid "Actions"
-msgstr ""
+msgstr "动作"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.wizard_event_reg_partners
 msgid "List Register Partners"
-msgstr ""
+msgstr "业务伙伴记录列表"
 
 #. module: event
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误:无效EAN编码"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "自动记录邮件"
+
+#~ msgid "Action Information"
+#~ msgstr "动作信息"
diff --git a/addons/event_project/i18n/zh_CN.po b/addons/event_project/i18n/zh_CN.po
index d102a611b4b..b1436605abf 100644
--- a/addons/event_project/i18n/zh_CN.po
+++ b/addons/event_project/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 17:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "这动作定义中无效的模块名"
 
 #. module: event_project
 #: model:ir.actions.wizard,name:event_project.wizard_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: event_project
 #: wizard_button:event.project,init,done:0
@@ -39,45 +39,48 @@ msgid ""
 "    This module allow you to create retro planning for managing your "
 "events.\n"
 msgstr ""
+"事件的组织和管理.\n"
+"\n"
+"    这模块允许你在你的事件创建补充计划管理.\n"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Remaining Tasks"
-msgstr ""
+msgstr "剩下的任务"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
 msgid "Event - Project"
-msgstr ""
+msgstr "事件 - 项目"
 
 #. module: event_project
 #: field:event.event,project_id:0
 #: wizard_field:event.project,init,project_id:0
 #: model:ir.actions.wizard,name:event_project.event_wiz
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
-msgstr ""
+msgstr "项目任务"
 
 #. module: event_project
 #: wizard_button:event.project,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr ""
+msgstr "创建补充计划"
 
 #. module: event_project
 #: wizard_view:event.project,init:0
 msgid "Event"
-msgstr ""
+msgstr "事件"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks management"
-msgstr ""
+msgstr "任务管理"
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
index 238c20e6a6c..29bb470b26a 100644
--- a/addons/google_map/i18n/zh_CN.po
+++ b/addons/google_map/i18n/zh_CN.po
@@ -4,33 +4,33 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-09 02:20+0000\n"
-"Last-Translator: wyh <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:22+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "启动Google地图"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML视图结构无效"
+msgstr "无效XML视图结构!"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
-msgstr ""
+msgstr "街道2: "
 
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
@@ -38,13 +38,13 @@ msgid ""
 "The module adds google map field in partner address\n"
 "so that we can directly open google map from the\n"
 "url widget."
-msgstr ""
-"该模块增加了谷歌地图合伙人信息\n"
-"使我们可以直接打开谷歌地图从\n"
-"网址挂件。"
+msgstr "这模块增加google地图到业务伙伴地址你能在google地图直接打开网址"
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Map"
-msgstr ""
+msgstr "地图"
+
+#~ msgid "Google Map"
+#~ msgstr "Google地图"
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 8fd536c6702..794162b285e 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 02:57+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:23+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -31,12 +31,12 @@ msgstr "工作时间分类"
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "错误！您不能创建递归部门。"
+msgstr "错误:你不能建立递归部门"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "社保号"
+msgstr "身份证号"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -47,7 +47,7 @@ msgstr "人力资源"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Sunday"
-msgstr "周日"
+msgstr "日"
 
 #. module: hr
 #: view:res.users:0
@@ -57,7 +57,7 @@ msgstr "上级"
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr
 #: view:hr.department:0
@@ -67,7 +67,7 @@ msgstr "部门"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Contact  of employee"
-msgstr "员工联系方式"
+msgstr "员工分类"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -77,7 +77,7 @@ msgstr "工作电子邮件"
 #. module: hr
 #: field:hr.timesheet.group,name:0
 msgid "Group name"
-msgstr "小组名称"
+msgstr "组名"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -88,7 +88,7 @@ msgstr "公司"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Friday"
-msgstr "周五"
+msgstr "五"
 
 #. module: hr
 #: field:hr.department,parent_id:0
@@ -100,7 +100,7 @@ msgstr "上级部门"
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: hr
 #: field:hr.timesheet,hour_from:0
@@ -110,7 +110,7 @@ msgstr "工作从"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "员工等级"
+msgstr "员工层次"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -125,7 +125,7 @@ msgstr "未婚"
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr "女"
+msgstr "女性"
 
 #. module: hr
 #: view:hr.timesheet.group:0
@@ -141,7 +141,7 @@ msgstr "员工组织结构"
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "其它社会身份号码"
+msgstr "身份ID"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -151,7 +151,7 @@ msgstr "办公电话"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "下级分类"
+msgstr "子类别"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -169,7 +169,7 @@ msgstr "员工"
 #. module: hr
 #: field:hr.timesheet.group,manager:0
 msgid "Workgroup manager"
-msgstr "工作组经理"
+msgstr "工作组主管"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
@@ -179,7 +179,7 @@ msgstr "下属"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -189,27 +189,27 @@ msgstr "成员"
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "社会安全号"
+msgstr "社保号"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid "Fill up contact information"
-msgstr "填写联系方式"
+msgstr "填写联系信息"
 
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr "离异"
+msgstr "离婚"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "上级分类"
+msgstr "上级类别"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -222,7 +222,7 @@ msgstr "部门"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "员工联系方式"
+msgstr "员工联系"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -248,17 +248,17 @@ msgstr "创建系统用户"
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "员工类别"
+msgstr "员工类型"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Tuesday"
-msgstr "周二"
+msgstr "二"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "人事部门"
+msgstr "人力资源"
 
 #. module: hr
 #: field:hr.employee,user_id:0
@@ -279,7 +279,7 @@ msgstr "备注"
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "联系方式"
+msgstr "联系信息"
 
 #. module: hr
 #: view:hr.employee:0
@@ -289,7 +289,7 @@ msgstr "状态"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Monday"
-msgstr "周一"
+msgstr "一"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -305,7 +305,7 @@ msgstr "星期几"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Birthday"
-msgstr "生日"
+msgstr "出生日期"
 
 #. module: hr
 #: field:hr.employee,active:0
@@ -315,12 +315,12 @@ msgstr "在职"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "错误！您不能创建递归的员工等级。"
+msgstr "错误！你不能创建递归的员工"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract Process"
-msgstr "员工合同流程"
+msgstr "员工合同处理"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
@@ -330,7 +330,7 @@ msgstr "创建系统用户"
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee Complete Form"
-msgstr "填写员工表"
+msgstr "完整员工信息"
 
 #. module: hr
 #: view:hr.department:0
@@ -340,7 +340,7 @@ msgstr "公司"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Wednesday"
-msgstr "周三"
+msgstr "三"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -356,7 +356,7 @@ msgstr "开始日期"
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr "上级用户"
+msgstr "用用户"
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -382,7 +382,7 @@ msgstr "个人信息"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr
 #: view:hr.timesheet:0
@@ -394,17 +394,17 @@ msgstr "工作时间"
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Thursday"
-msgstr "周四"
+msgstr "四"
 
 #. module: hr
 #: field:hr.timesheet,hour_to:0
 msgid "Work to"
-msgstr "工作至"
+msgstr "工作到"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Other"
-msgstr "其它"
+msgstr "其他"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -414,7 +414,7 @@ msgstr "员工分类"
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "家庭住址"
+msgstr "家庭地址"
 
 #. module: hr
 #: view:hr.department:0
@@ -429,7 +429,7 @@ msgstr "国籍"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other ID"
-msgstr "其他证件号"
+msgstr "其它ID"
 
 #. module: hr
 #: field:hr.timesheet,name:0
@@ -456,17 +456,17 @@ msgstr "部门名称"
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "下级部门"
+msgstr "子部门"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr "工作信息"
+msgstr "职位信息"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Fill up employee's contact information"
-msgstr "填写员工联系方式信息"
+msgstr "填写员工联系信息"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -478,15 +478,34 @@ msgstr "上司"
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 msgid "All Employees"
-msgstr "全部员工"
+msgstr "所有员工"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Saturday"
-msgstr "周六"
+msgstr "六"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_new
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_new
 msgid "New Employee"
 msgstr "新员工"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Module for human resource management. You can manage:\n"
+#~ "    * Employees and hierarchies\n"
+#~ "    * Work hours sheets\n"
+#~ "    * Attendances and sign in/out system\n"
+#~ "\n"
+#~ "    Different reports are also provided, mainly for attendance statistics.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    人力资源模块你能管理:\n"
+#~ "                  * 员工和职位\n"
+#~ "                  * 工时表\n"
+#~ "                  * 出勤和登入/登出系统\n"
+#~ "\n"
+#~ "   提供的不同报表主要为考勤统计.\n"
+#~ "    "
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index c906a103217..378841dc0a8 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-07 11:17+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:23+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -26,7 +26,7 @@ msgstr "出勤"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,init:0
@@ -35,13 +35,13 @@ msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
 #: model:ir.actions.wizard,name:hr_attendance.si_so
 #: model:ir.ui.menu,name:hr_attendance.menu_si_so
 msgid "Sign in / Sign out"
-msgstr "签入/签出"
+msgstr "签出"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
-msgstr "(*) 负的延迟意味着员工的工作时间少于记录时间。"
+msgstr "(*)正数表示员工工作小于记录"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -51,12 +51,12 @@ msgstr "员工出勤"
 #. module: hr_attendance
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,init:0
 msgid "You are now ready to sign in or out of the attendance follow up"
-msgstr "你可以进行签入签出操作了"
+msgstr "你现在出勤跟踪准备签入/签出"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -75,7 +75,7 @@ msgstr "延迟"
 #: wizard_field:hr.si_so,si_ask_so,name:0
 #: wizard_field:hr.si_so,so_ask_si,name:0
 msgid "Employee's name"
-msgstr "员工姓名"
+msgstr "员工名"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,print:0
@@ -86,17 +86,17 @@ msgstr "打印时间表"
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error
 msgid "Print Attendance Error Report"
-msgstr "打印缺勤报表"
+msgstr "出勤错误报表"
 
 #. module: hr_attendance
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义使用了无效的模块名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_week
 msgid "Print Timesheet by week"
-msgstr "按周打印时间表"
+msgstr "打印这周时间表"
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
@@ -107,12 +107,12 @@ msgstr "员工"
 #: wizard_view:hr.attendance.print_week,init:0
 #: wizard_view:hr.attendance.report,init:0
 msgid "Select a time span"
-msgstr "选择时间段"
+msgstr "选择一时间长度"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr "已记录时间"
+msgstr "记录日期"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -123,13 +123,13 @@ msgstr "签入"
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Total period:"
-msgstr "合计时间："
+msgstr "总周期:"
 
 #. module: hr_attendance
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action reason"
-msgstr "动作原因"
+msgstr "行动理由"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -149,7 +149,7 @@ msgstr "五月"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,so_ask_si,last_time:0
 msgid "Your last sign in"
-msgstr "您最近的签入"
+msgstr "你最近的签入"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -159,7 +159,7 @@ msgstr "六月"
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_month
 msgid "Print Timesheet by month"
-msgstr "按月打印时间表"
+msgstr "打印这月时间表"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -170,22 +170,22 @@ msgstr "签出"
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr "员工考勤"
+msgstr "员工出勤"
 
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
 msgid "Reason"
-msgstr "理由"
+msgstr "原因"
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "错误签入前先签出同样签出前先签入"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Signed"
-msgstr ""
+msgstr "签到日期"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
@@ -202,7 +202,7 @@ msgstr "七月"
 msgid ""
 "You did not signed out the last time. Please enter the date and time you "
 "signed out."
-msgstr "你上次没有签出，请输入你签出的时间。"
+msgstr "最近没有签到请输入签到的日期和时间"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -213,12 +213,12 @@ msgstr "出勤原因"
 #: wizard_field:hr.attendance.print_week,init,init_date:0
 #: wizard_field:hr.attendance.report,init,init_date:0
 msgid "Starting Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr "出席"
+msgstr "现在"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -238,22 +238,22 @@ msgstr "十月"
 #. module: hr_attendance
 #: wizard_field:hr.si_so,si_ask_so,last_time:0
 msgid "Your last sign out"
-msgstr "您最近的签出"
+msgstr "你最近的签出"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Min Delay"
-msgstr "最小迟到时间"
+msgstr "主要延迟"
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr "操作类型"
+msgstr "行动；类型"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr "定义出勤理由"
+msgstr "出勤原因"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -287,23 +287,23 @@ msgstr "四月"
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
 msgid "Attendances"
-msgstr "考勤列表"
+msgstr "出勤"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr "缺勤"
+msgstr "出勤错误"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
 #: selection:hr.attendance,action:0
 msgid "Action"
-msgstr "操作"
+msgstr "行动"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.report,init,print:0
 msgid "Print Attendance Report"
-msgstr "打印考勤报表"
+msgstr "出勤报表"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -319,30 +319,30 @@ msgstr "十一月"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
+msgstr "延迟错误被认为是自动的"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.report,init,max_delay:0
 msgid "Max. Delay (Min)"
-msgstr "最大迟到时间（分）"
+msgstr "最大延迟(最小)"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_week,init:0
 msgid "Select a starting and a end date"
-msgstr "选择一个开始时间一个结束时间"
+msgstr "选择一开始日期和结束日期"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_week,init,end_date:0
 #: wizard_field:hr.attendance.report,init,end_date:0
 msgid "Ending Date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,so_ask_si:0
 msgid ""
 "You did not signed in the last time. Please enter the date and time you "
 "signed in."
-msgstr "你上次没有签入。请输入你签入的时间。"
+msgstr "你在最近没有签到请输入签到的日期和时间"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -372,12 +372,12 @@ msgstr "月"
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
 msgid "This module aims to manage employee's attendances."
-msgstr "本模块主要用户管理员工考勤。"
+msgstr "这模块的目的是管理员工的出勤"
 
 #. module: hr_attendance
 #: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
 msgid "Attendance Error Report"
-msgstr "缺勤报表"
+msgstr "出勤错误报表"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,year:0
@@ -398,3 +398,7 @@ msgstr "取消"
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Operation"
 msgstr "操作"
+
+#~ msgid ""
+#~ "(*) A negative delay means that the employee worked more than encoded."
+#~ msgstr "(*)负数延期表示员工的工作超过编码"
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 5479898490c..ea35d808928 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -4,44 +4,44 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 14:19+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:26+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Hourly cost computation"
-msgstr "小时成本计算"
+msgstr "小时数成本计算"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Gross"
-msgstr "应发"
+msgstr "总数"
 
 #. module: hr_contract
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Generalities"
-msgstr "概要"
+msgstr "概论"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of children"
-msgstr "子女数"
+msgstr "下级数"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
@@ -51,12 +51,12 @@ msgstr "小时成本系数"
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Wage Types"
-msgstr "薪酬类型"
+msgstr "工资类型"
 
 #. module: hr_contract
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_contract
 #: field:hr.contract,employee_id:0
@@ -66,22 +66,22 @@ msgstr "员工"
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
-msgstr "实发"
+msgstr "净"
 
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
 msgid "Human Resources Contracts"
-msgstr "劳动合同"
+msgstr "人力资源合同"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
 msgid "Hours in the period"
-msgstr "合同期小时数"
+msgstr "周期的小时数"
 
 #. module: hr_contract
 #: field:hr.contract,function:0
 msgid "Function"
-msgstr "职务"
+msgstr "功能"
 
 #. module: hr_contract
 #: field:hr.employee,marital_status:0
@@ -95,14 +95,14 @@ msgstr "婚姻状况"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscelleanous"
-msgstr "杂项"
+msgstr "其他"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 #: field:hr.employee,contract_ids:0
 msgid "Contracts"
-msgstr "劳动合同"
+msgstr "合同"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -114,12 +114,12 @@ msgstr "类型"
 #: view:hr.contract.wage.type:0
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr "薪酬类型"
+msgstr "工资类型"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
 msgid "Period Name"
-msgstr "合同期名称"
+msgstr "周期名"
 
 #. module: hr_contract
 #: model:ir.model,name:hr_contract.model_hr_employee_marital_status
@@ -129,32 +129,32 @@ msgstr "员工婚姻状况"
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical examination date"
-msgstr "体检时间"
+msgstr "体检日期"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,name:0
 msgid "Wage Type Name"
-msgstr "薪酬类型名称"
+msgstr "工资类型名称"
 
 #. module: hr_contract
 #: field:hr.contract,working_hours_per_day:0
 msgid "Working hours per day"
-msgstr "每天工作小时数"
+msgstr "每天的工作的小时数"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary"
-msgstr "薪水"
+msgstr "薪金"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
 msgid "End Date"
-msgstr "结束时间"
+msgstr "结束日期"
 
 #. module: hr_contract
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -171,23 +171,23 @@ msgstr "备注"
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract
 #: model:ir.ui.menu,name:hr_contract.next_id_56
 msgid "Contract"
-msgstr "劳动合同"
+msgstr "合同"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Contract Type"
-msgstr "劳动合同类型"
+msgstr "合同类型"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period
 msgid "Wage Period"
-msgstr "薪酬支付期"
+msgstr "工资周期"
 
 #. module: hr_contract
 #: field:hr.employee,audiens_num:0
 msgid "AUDIENS Number"
-msgstr ""
+msgstr "AUDIENS编号"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -197,30 +197,30 @@ msgstr "报酬"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Name"
-msgstr "劳动合同名称"
+msgstr "合同名"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
 msgid "Contract Wage Type"
-msgstr "合同薪酬类型"
+msgstr "合同工资类型"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
-msgstr "籍贯"
+msgstr "出生地"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Manager"
-msgstr "经理"
+msgstr "管理"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type.period:0
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
 msgid "Wage period"
-msgstr "薪酬支付期"
+msgstr "工资周期"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -228,25 +228,44 @@ msgstr "薪酬支付期"
 msgid ""
 "This field is used by the timesheet system to compute the price of an hour "
 "of work wased on the contract of the employee"
-msgstr "此字段被时间表系统用于计算该员工劳动合同的每小时成本。"
+msgstr "这字段使用时间表系统来计算合同员工的每小时工价"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
 msgid "Wage"
-msgstr "薪酬"
+msgstr "工资"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
 msgid "Start Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: hr_contract
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr "状况描述"
+msgstr "状态说明"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Contract Duration"
-msgstr "合同期"
+msgstr "合同有效期"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Add all information on the employee form to manage contracts:\n"
+#~ "    * Martial status,\n"
+#~ "    * Security number,\n"
+#~ "    * Place of birth, birth date, ...\n"
+#~ "\n"
+#~ "    You can assign several contracts per employee.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    增加员工管理合同的所有信息:\n"
+#~ "    * 婚姻状况\n"
+#~ "    * 社保号\n"
+#~ "    * 出生地点和出生日期\n"
+#~ "    \n"
+#~ "    你可以为每个员工签几个合同\n"
+#~ "    "
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
new file mode 100644
index 00000000000..03ddb2025ac
--- /dev/null
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -0,0 +1,277 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-03-20 22:05+0000\n"
+"Last-Translator: smii <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr "Tiedot"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr "Arvot"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr "Pisteet"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Vedos"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr "Työntekijä"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr "Arviointi"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr "Tila"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr "Lainaus"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr "Asetukset"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 484d570170d..60ead6438ee 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -4,48 +4,48 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 04:25+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:27+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
 msgid "Confirmed Expenses"
-msgstr "已确认费用申请"
+msgstr "已确认费用"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_line
 msgid "Expense Line"
-msgstr "费用申请明细"
+msgstr "费用明细"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reimbursement0
 msgid "The accoutant reimburse the expenses"
-msgstr "会计偿还费用"
+msgstr "会计人员报销这费用"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_all_confirm
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_confirm
 msgid "Expenses waiting validation"
-msgstr "费用等待批准生效"
+msgstr "费用等待批准"
 
 #. module: hr_expense
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
 msgid "Date Confirmed"
-msgstr "确认时间"
+msgstr "日期已确认"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -61,23 +61,23 @@ msgstr "设为草稿"
 #: model:ir.actions.act_window,name:hr_expense.expense_my_confirm
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my_confirm
 msgid "My expenses waiting validation"
-msgstr "我的待批准生效费用"
+msgstr "我等待批准的费用"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_all
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all
 msgid "All expenses"
-msgstr "所有费用申请"
+msgstr "所有费用"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_approved0
 msgid "Approved"
-msgstr "已批准"
+msgstr "批准"
 
 #. module: hr_expense
 #: field:hr.expense.line,uom_id:0
 msgid "UoM"
-msgstr "计量单位"
+msgstr "单位"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -98,41 +98,41 @@ msgstr "已取消"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Validation"
-msgstr "生效"
+msgstr "批准"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
 msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
-msgstr ""
+msgstr "确定该产品可以在人力资源费用表明细中显示的产品列表"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Accepted"
-msgstr "已支付"
+msgstr "已同意"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 #: field:hr.expense.expense,ref:0
 #: field:hr.expense.line,ref:0
 msgid "Reference"
-msgstr "引用"
+msgstr "参考"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Certified honest and conform,"
-msgstr ""
+msgstr "证明是诚实和遵守约定"
 
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "Print HR expenses"
-msgstr "打印人事费用"
+msgstr "打印人力资源费用"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
 msgid "Refuse expense"
-msgstr "拒绝费用申请"
+msgstr "拒绝费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -143,12 +143,12 @@ msgstr "确认"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_supplierinvoice0
 msgid "The accoutant validates the sheet"
-msgstr "会计验证该单据"
+msgstr "会计人员使这表生效"
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
 msgid "Analytic account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_supplierinvoice0
@@ -175,67 +175,67 @@ msgstr "数量"
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "价格合计"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reinvoicing0
 msgid "Some costs may be reinvoices to the customer"
-msgstr ""
+msgstr "有些成本可以要重开发票给客户"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_my
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my
 msgid "My Expenses"
-msgstr "我的费用申请"
+msgstr "我的费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
 msgid "Sheet ID"
-msgstr ""
+msgstr "表ID"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimburseexpense0
 msgid "Reimburse expense"
-msgstr "付还费用"
+msgstr "报销费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,journal_id:0
 msgid "Force Journal"
-msgstr ""
+msgstr "强制分类帐"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_my_new
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my_new
 msgid "New Expenses Sheet"
-msgstr "新建费用表"
+msgstr "新的费用表"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
 msgid "After creating invoice, reimburse expenses"
-msgstr ""
+msgstr "报销费用后创建发票"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reimbursement0
 msgid "Reimbursement"
-msgstr "付还"
+msgstr "报销"
 
 #. module: hr_expense
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: hr_expense
 #: field:hr.expense.line,expense_id:0
 #: model:ir.model,name:hr_expense.model_hr_expense_expense
 msgid "Expense"
-msgstr "费用申请"
+msgstr "费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: field:hr.expense.expense,line_ids:0
 #: view:hr.expense.line:0
 msgid "Expense Lines"
-msgstr "费用申请明细"
+msgstr "费用明细"
 
 #. module: hr_expense
 #: field:hr.expense.expense,currency_id:0
@@ -245,17 +245,17 @@ msgstr "货币"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
 msgid "Employee encode all his expenses"
-msgstr "员工自行记录他的全部费用指出"
+msgstr "员工编码所有的费用"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "已开发票"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Reimbursed"
-msgstr "已付还"
+msgstr "报销"
 
 #. module: hr_expense
 #: field:hr.expense.expense,note:0
@@ -276,27 +276,27 @@ msgstr "草稿"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Accounting data"
-msgstr "会计数据"
+msgstr "会计日期"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveexpense0
 msgid "Expense is approved."
-msgstr "费用申请已批准"
+msgstr "费用已批准"
 
 #. module: hr_expense
 #: field:hr.expense.expense,amount:0
 msgid "Total Amount"
-msgstr "总额"
+msgstr "金额合计"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
 msgid "Draft Expenses"
-msgstr "费用申请草稿"
+msgstr "费用草稿"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_id:0
@@ -308,37 +308,37 @@ msgstr "用户"
 #: field:hr.expense.expense,date:0
 #: field:hr.expense.line,date_value:0
 msgid "Date"
-msgstr "时间"
+msgstr "日期"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Total:"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "HR Expenses"
-msgstr "人事费用"
+msgstr "人力资源费用"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0
 msgid "Date Validated"
-msgstr ""
+msgstr "日期已生效"
 
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Account Move"
-msgstr "过帐"
+msgstr "凭证"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_confirmedexpenses0
 msgid "The employee validates his expense sheet"
-msgstr ""
+msgstr "员工使这费用表生效"
 
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_refused0
 msgid "The direct manager refuses the sheet.Reset as draft."
-msgstr ""
+msgstr "管理者直接拒绝这表重新设为草稿"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -349,18 +349,18 @@ msgstr "费用表"
 #: model:ir.actions.act_window,name:hr_expense.expense_all_invoiced
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_invoiced
 msgid "Expenses waiting payment"
-msgstr "等待支付的费用申请"
+msgstr "费用等待支付"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_my_draft
 #: model:ir.ui.menu,name:hr_expense.menu_expense_my_draft
 msgid "My Draft expenses"
-msgstr "我的费用申请草稿"
+msgstr "我的费用草稿"
 
 #. module: hr_expense
 #: model:ir.module.module,shortdesc:hr_expense.module_meta_information
 msgid "Human Resources Expenses Tracking"
-msgstr "人力资源支出追踪"
+msgstr "人力资源费用跟踪"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -377,49 +377,49 @@ msgstr "取消"
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
 msgid "Reinvoice"
-msgstr "重新开票"
+msgstr "重开发票"
 
 #. module: hr_expense
 #: model:process.process,name:hr_expense.process_process_expenseprocess0
 msgid "Expense Process"
-msgstr "费用申请流程"
+msgstr "费用处理"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Other Info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.expense_all_draft
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_draft
 msgid "Draft expenses"
-msgstr "费用申请草稿"
+msgstr "费用草稿"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_confirmexpense0
 msgid "Confirm expense"
-msgstr "确认费用申请"
+msgstr "确认费用"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_approveexpense0
 msgid "Approve expense"
-msgstr "批准费用申请"
+msgstr "批准费用"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:process.transition.action,name:hr_expense.process_transition_action_accept0
 msgid "Accept"
-msgstr "接受"
+msgstr "同意"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "This document must be dated and signed for reimbursement"
-msgstr ""
+msgstr "这报销单据必须有日期和签名"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_refuseexpense0
 msgid "Expense is refused."
-msgstr "费用申请被拒绝。"
+msgstr "费用已拒绝"
 
 #. module: hr_expense
 #: rml:hr.expense:0
@@ -431,7 +431,7 @@ msgstr "单价"
 #: model:ir.actions.act_window,name:hr_expense.expense_all_valid
 #: model:ir.ui.menu,name:hr_expense.menu_expense_all_valid
 msgid "Expenses waiting invoice"
-msgstr "等待发票的费用申请"
+msgstr "费用等待发票"
 
 #. module: hr_expense
 #: field:hr.expense.line,product_id:0
@@ -441,7 +441,7 @@ msgstr "产品"
 #. module: hr_expense
 #: field:hr.expense.line,description:0
 msgid "Description"
-msgstr "描述"
+msgstr "说明"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -462,12 +462,12 @@ msgstr "已拒绝"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can be Expensed"
-msgstr ""
+msgstr "可支出"
 
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "Ref."
-msgstr ""
+msgstr "参考"
 
 #. module: hr_expense
 #: field:hr.expense.expense,user_valid:0
@@ -477,7 +477,7 @@ msgstr "批准用户"
 #. module: hr_expense
 #: rml:hr.expense:0
 msgid "(Date and signature)"
-msgstr ""
+msgstr "(日期和签名)"
 
 #. module: hr_expense
 #: rml:hr.expense:0
@@ -487,7 +487,7 @@ msgstr "名称"
 #. module: hr_expense
 #: field:hr.expense.line,name:0
 msgid "Short Description"
-msgstr "简述"
+msgstr "简短说明"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -497,30 +497,63 @@ msgstr "创建供应商发票"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_approved0
 msgid "The direct manager approves the sheet"
-msgstr ""
+msgstr "管理者直接批准这表"
 
 #. module: hr_expense
 #: field:hr.expense.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序号"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_confirmexpense0
 msgid "Expense is confirmed."
-msgstr "费用申请已确认。"
+msgstr "费用已确认"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:ir.ui.menu,name:hr_expense.next_id_49
 msgid "Expenses"
-msgstr "费用申请"
+msgstr "费用"
 
 #. module: hr_expense
 #: field:hr.expense.line,total_amount:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
 msgid "Reinvoicing"
-msgstr ""
+msgstr "重开发票"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module aims to manage employee's expenses.\n"
+#~ "\n"
+#~ "    The whole workflow is implemented:\n"
+#~ "    * Draft expense\n"
+#~ "    * Confirmation of the sheet by the employee\n"
+#~ "    * Validation by his manager\n"
+#~ "    * Validation by the accountant and invoice creation\n"
+#~ "    * Payment of the invoice to the employee\n"
+#~ "\n"
+#~ "    This module also use the analytic accounting and is compatible with\n"
+#~ "    the invoice on timesheet module so that you will be able to "
+#~ "automatically\n"
+#~ "    re-invoice your customer's expenses if your work by project.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块的目的是管理员工的费用\n"
+#~ "\n"
+#~ "    整个工作流实现:\n"
+#~ "    *费用草稿\n"
+#~ "    *确认员工工作表\n"
+#~ "    *主管审批\n"
+#~ "    *会计人员审批生成的发票\n"
+#~ "    *员工的付款发票\n"
+#~ "\n"
+#~ "    这模块还用分析会计\n"
+#~ "和使时间表的发票相一致\n"
+#~ "因此如果你工作在项目模块\n"
+#~ "你将能够自动重开客户费用发票\n"
+#~ "    "
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 8ee345a2b57..ba862de4aef 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -1,73 +1,72 @@
-# Simplified Chinese translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_holidays
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-20 15:10+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
-"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"PO-Revision-Date: 2010-03-20 08:28+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "New Holidays Request"
-msgstr "新建假日申请"
+msgstr "新的假期申请"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
 msgid "All Holidays Requests"
-msgstr "所有假日申请"
+msgstr "所有假期请求"
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "剩余准假"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
 msgid "Requests Awaiting for Validation"
-msgstr "申请等待批准生效"
+msgstr "申请等待批准"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr "淡蓝色"
+msgstr "浅蓝"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr "棕色"
+msgstr "棕"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "of the"
-msgstr ""
+msgstr "这"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Off-Days' Summary"
-msgstr "请假概述"
+msgstr "休息日摘要"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
 msgid "Employee Holidays"
-msgstr "员工假日"
+msgstr "员工假期"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -80,27 +79,27 @@ msgstr "设为草稿"
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidays0
 msgid "Holidays"
-msgstr "假日"
+msgstr "假期"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "to"
-msgstr "至"
+msgstr "到"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr "淡青色"
+msgstr "浅青色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr "淡绿色"
+msgstr "浅绿色"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
 msgid "Employee Declaration"
-msgstr "员工声明"
+msgstr "员工申请"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -117,12 +116,12 @@ msgstr "拒绝申请"
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
-msgstr "已核准"
+msgstr "批准"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Both"
-msgstr "两者"
+msgstr "两个"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -138,7 +137,7 @@ msgstr "确定"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
 msgid "My Holidays Requests"
-msgstr "我的假日申请"
+msgstr "我的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
@@ -151,84 +150,84 @@ msgstr "备注"
 #: field:hr.holidays.log,holiday_status:0
 #: field:hr.holidays.per.user,holiday_status:0
 msgid "Holiday's Status"
-msgstr "假日状态"
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
 msgid "Request is refused."
-msgstr "申请被拒绝。"
+msgstr "申请拒绝"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays Management"
-msgstr "假日管理"
+msgstr "假期管理"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Analyze from"
-msgstr ""
+msgstr "来自分析"
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Holidays"
-msgstr "假日概要"
+msgstr "假期摘要"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_calendar0
 msgid "The holiday is set in the calendar"
-msgstr ""
+msgstr "这假期设到日程表"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Holiday status"
-msgstr "假日状态"
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr "假日状态"
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "Vacation end day"
-msgstr "假期结束日"
+msgstr "批准结束日期"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "Holidays Allowed"
-msgstr "允许的假日"
+msgstr "假期允许"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
 msgid "Legal Declaration Document to declare new employee"
-msgstr "申报一个新员工的法律文档"
+msgstr "法定的新员工"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr "品红色"
+msgstr "紫红色"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
 msgid "Holidays Per User"
-msgstr "各个用户的假日"
+msgstr "每个用户的假期"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Define holiday status"
-msgstr "定义假日状态"
+msgstr "设定假期状态"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Confirmed"
-msgstr "已确认"
+msgstr "确认"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,date_from:0
 #: wizard_field:hr.holidays.summary.employee,init,date_from:0
 msgid "From"
-msgstr "来自"
+msgstr "从"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -240,17 +239,17 @@ msgstr "确认"
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
 msgid "My Awaiting Confirmation Holidays Requests"
-msgstr "我的待确认假日申请"
+msgstr "我等待确认的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
 msgid "Employee_id"
-msgstr ""
+msgstr "员工_ID"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
 msgid "Encoding of annual available holidays."
-msgstr ""
+msgstr "可得到的年度假期编号"
 
 #. module: hr_holidays
 #: field:hr.holidays,employee_id:0
@@ -262,108 +261,108 @@ msgstr "员工"
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Validation"
-msgstr ""
+msgstr "等待批准"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
 msgid "Employee get holidays"
-msgstr ""
+msgstr "员工获得假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
-msgstr "浅橙色"
+msgstr "浅橙红色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr ""
+msgstr "淡黄色"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
 msgid "Number of Holidays Requested"
-msgstr ""
+msgstr "申请的假期编号"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 msgid "My Holiday Requests"
-msgstr ""
+msgstr "我的假期申请草稿"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr ""
+msgstr "天数"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr ""
+msgstr "假期状态"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "报表选项"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_approved0
 msgid "His manager approves the request"
-msgstr ""
+msgstr "管理者批准这申请"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
 msgid "If holidays available, employee can take it and fill it."
-msgstr ""
+msgstr "如果有假期可用"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "You have to select at least 1 Employee. Try again."
-msgstr ""
+msgstr "你必须至少选择1部门再试一次"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
 msgid "My Validated Holidays Requests"
-msgstr ""
+msgstr "我批准的假期申请"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary.employee,init,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days:0
 msgid "Number of Days in this Holiday Request"
-msgstr ""
+msgstr "申请的假期天数"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
 #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
 msgid "Holidays Per Employee"
-msgstr ""
+msgstr "每个员工的假期"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to override Limit"
-msgstr ""
+msgstr "允许覆盖的限制"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_user_id:0
 msgid "Holidays user"
-msgstr ""
+msgstr "用户假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr ""
+msgstr "淡紫色"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
@@ -373,17 +372,17 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
 msgid "Print Summary of Employee's Holidays"
-msgstr ""
+msgstr "打印员工假期摘要"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_calendar0
 msgid "Calendar"
-msgstr ""
+msgstr "日历"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Vacation start day"
-msgstr ""
+msgstr "批准结束日期"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -421,164 +420,182 @@ msgid ""
 "                Administration / Users / Users\n"
 "            for example, you maybe will do it for the user 'admin'.\n"
 msgstr ""
+"人力资源:假期跟踪和工作流\n"
+"\n"
+"这模块允许你管理假期和假期请求每个员工能为每个可用假期的状态定义一个数字\n"
+"\n"
+"备注:\n"
+"同步内部日程(使用业务关系管理模块)它可以:接受自动创建一个假期申请,你要在事务节连接到假期状态.你能设置信息和偏好的颜色\n"
+"                人力资源 / 设置 / 假期状态\n"
+"    - 员工能请求负数的假期 (如假期为-2日), 它被转换为询问系统要求更多的休息日. 它将增加有效总假期 (如果申请批准).\n"
+"    - 有两种方法打印员工的假期:\n"
+"        * 允许按部门分员工，通过在菜单点击\n"
+"                人力资源 / 假期申请 / 打印假期摘要\n"
+"        * 允许你为指定的员工选择假期\n"
+"                人力资源 / 员工 / 所有员工\n"
+"            然后选择你想打印的内容后点击打印图标\n"
+"                '打印员工假期摘要'\n"
+"    - 这向导允许你选择打印确认或有效的假期'. \n"
+"                Administration / Users / Users\n"
+"            例如, 你可能是 'admin'.\n"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "Notification"
-msgstr ""
+msgstr "通知"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr ""
+msgstr "员工填写假期申请"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
 msgid "Holiday is set in the calendar."
-msgstr ""
+msgstr "在日历设定假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
-msgstr ""
+msgstr "浅珊瑚色"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
 msgid "My Available Holidays"
-msgstr ""
+msgstr "我可用的假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "黑"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
 msgid "My Refused Holidays Requests"
-msgstr ""
+msgstr "我拒接的假期申请"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_setholiday0
 msgid "Set Holiday"
-msgstr ""
+msgstr "设定假期"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
 msgid "My Draft Holidays Requests"
-msgstr ""
+msgstr "我的假期申请草稿"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,max_leaves:0
 msgid "Maximum Leaves Allowed"
-msgstr ""
+msgstr "最大准假允许"
 
 #. module: hr_holidays
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Ivory"
-msgstr ""
+msgstr "象牙白"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
 msgid "My Holidays Request"
-msgstr ""
+msgstr "物品的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr ""
+msgstr "状态颜色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr ""
+msgstr "批准和确认"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr ""
+msgstr "准假已得到"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "holidays."
-msgstr ""
+msgstr "假期"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
 msgid "Document for employee"
-msgstr ""
+msgstr "员工文档"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
 msgid "Reufse"
-msgstr ""
+msgstr "拒绝"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "部分"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "Holiday manager"
-msgstr ""
+msgstr "假期管理"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,active:0
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "有效"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
 msgid "My Holidays Request Draft"
-msgstr ""
+msgstr "我的假期申请草稿"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
 msgid "Approved Request"
-msgstr ""
+msgstr "批准请求"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysrequest0
 msgid "Holidays Request"
-msgstr ""
+msgstr "假期申请"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
 msgid "Holidays Requests Awaiting for Validation"
-msgstr ""
+msgstr "假期申请等待批准"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "普通"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "General Information"
-msgstr ""
+msgstr "一般信息"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -586,140 +603,143 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,end:0
 #: wizard_button:hr.holidays.summary.employee,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
 msgid "Holidays def Request"
-msgstr ""
+msgstr "假期申请定义"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "批准"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr ""
+msgstr "我拒绝的假期申请"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,init,checkdept:0
 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.holidays_summary
 #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
 msgid "Print Summary of Holidays"
-msgstr ""
+msgstr "打印假期摘要"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "部门"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 #: model:process.node,name:hr_holidays.process_node_refused0
 msgid "Refused"
-msgstr ""
+msgstr "已拒绝"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
 msgid "Request is approved."
-msgstr ""
+msgstr "申请批准"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
 msgid "Holidays Definition"
-msgstr ""
+msgstr "假期定义"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,holiday_type:0
 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "选择假期类型"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
-msgstr ""
+msgstr "成本"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr ""
+msgstr "每个用户的假期"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
 msgid "Encode number of available holidays"
-msgstr ""
+msgstr "可得到的假期编号"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_legaldeclaration0
 msgid "Secretariat Social"
-msgstr ""
+msgstr "社保"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "紫色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "红色"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "人力资源:假期管理"
 
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
 msgid "Holidays Process"
-msgstr ""
+msgstr "假期处理"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 msgid "You have to select at least 1 Department. Try again."
-msgstr ""
+msgstr "你必须至少选择1部门再试一次"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
 msgid "My Holidays Request Validated"
-msgstr ""
+msgstr "我批准的假期申请"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_req_id:0
 msgid "Holiday Request ID"
-msgstr ""
+msgstr "假期申请ID"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "浅黄色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "浅粉红色"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_refused0
 msgid "His manager refuses the request"
-msgstr ""
+msgstr "管理者拒绝这申请"
+
+#~ msgid "Action"
+#~ msgstr "行动"
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 47d05e70f99..67f9d58d3b6 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:12+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-03-20 21:36+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -113,7 +112,7 @@ msgstr "Producto"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "août"
-msgstr ""
+msgstr "agosto"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -158,7 +157,7 @@ msgstr "Tiempo total"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juillet"
-msgstr ""
+msgstr "julio"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
@@ -172,14 +171,14 @@ msgstr "Hoja de asistencia"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "janvier"
-msgstr ""
+msgstr "enero"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juin"
-msgstr ""
+msgstr "junio"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_my
@@ -234,7 +233,7 @@ msgstr "¡XML inválido para la definición de la vista!"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "avril"
-msgstr ""
+msgstr "abril"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
@@ -256,7 +255,7 @@ msgstr "Seleccionar usuarios"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "novembre"
-msgstr ""
+msgstr "noviembre"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -284,7 +283,7 @@ msgstr "Estado actual"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "octobre"
-msgstr ""
+msgstr "octubre"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -296,7 +295,7 @@ msgstr "Estadísticas de análisis"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "décembre"
-msgstr ""
+msgstr "diciembre"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,info:0
@@ -346,7 +345,7 @@ msgstr "Recursos humanos (codificación de horarios)"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mars"
-msgstr ""
+msgstr "marzo"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
@@ -359,7 +358,7 @@ msgstr "Total"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mai"
-msgstr ""
+msgstr "mayo"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
@@ -376,7 +375,7 @@ msgstr "Cambiar trabajo"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "février"
-msgstr ""
+msgstr "febrero"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -470,7 +469,7 @@ msgstr "Horario de empleados"
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "septembre"
-msgstr ""
+msgstr "septiembre"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index 77578322a09..05cb21fec06 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-10 02:05+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -26,7 +26,7 @@ msgstr "选择月份"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -37,7 +37,7 @@ msgstr "员工时间表"
 #: model:ir.actions.wizard,name:hr_timesheet.si_so
 #: model:ir.ui.menu,name:hr_timesheet.menu_si_so
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "项目的签入/签出"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0
@@ -53,17 +53,17 @@ msgstr "（留空表示当前时间）"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同种类."
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Sign in status"
-msgstr "签如状态"
+msgstr "签入状态"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(留空表示当前时间)"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_out,server_date:0
@@ -73,7 +73,7 @@ msgstr "当前日期"
 #. module: hr_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名."
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,report:0
@@ -85,23 +85,23 @@ msgstr "打印"
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "最低辅助核算额"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
 msgid "Current Server Date"
-msgstr "当前状态"
+msgstr "当前服务器时间"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date_start:0
 #: wizard_field:hr_timesheet.si_so,sign_out,date:0
 msgid "Starting Date"
-msgstr "起始日"
+msgstr "开始日期"
 
 #. module: hr_timesheet
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr "货品"
+msgstr "产品"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -113,30 +113,30 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr "分析日记账"
+msgstr "辅助核算分类帐"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "小时"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet
 msgid "Employee Timesheet"
-msgstr "员工工作时间表"
+msgstr "员工时间表"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "统计完成的工作"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form
 msgid "Working Hours"
-msgstr "工时"
+msgstr "工作小时"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -146,7 +146,7 @@ msgstr "时间表明细"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr "总计时间"
+msgstr "总时间"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -197,7 +197,7 @@ msgstr "签入"
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form
 msgid "Working Hours of The Day"
-msgstr "该日工时"
+msgstr "这天的工作小时"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -212,17 +212,17 @@ msgstr "总成本"
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_day
 msgid "Day"
-msgstr ""
+msgstr "天"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date:0
 msgid "Closing Date"
-msgstr "终止日期"
+msgstr "结束日期"
 
 #. module: hr_timesheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -234,12 +234,12 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic line"
-msgstr ""
+msgstr "辅助核算明细"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet_users,init:0
@@ -261,12 +261,12 @@ msgstr "签入/签出"
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "在最近会计期间完成的工作"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr ""
+msgstr "关键日期"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,state:0
@@ -284,7 +284,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr ""
+msgstr "辅助核算统计"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -307,13 +307,13 @@ msgstr "员工姓名"
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Consultancy - Senior Developer"
-msgstr ""
+msgstr "顾问 - 高级开发"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form
 msgid "My Working Hours"
-msgstr "我的工时"
+msgstr "我的工作小时"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
@@ -323,18 +323,18 @@ msgstr "时间表明细"
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 msgid "Sum"
-msgstr ""
+msgstr "总数"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my
 msgid "My Working Hours of The Day"
-msgstr "该日我的工时"
+msgstr "这天我的工作小时"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
 msgid "Human Resources (Timesheet encoding)"
-msgstr ""
+msgstr "人力资源(时间表编码)"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -347,7 +347,7 @@ msgstr ""
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -364,7 +364,7 @@ msgstr "开始工作"
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
 msgid "Change Work"
-msgstr "改变工作"
+msgstr "修改工作"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -376,7 +376,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "按月份统计"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -389,7 +389,7 @@ msgstr "月"
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算科目"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
@@ -404,22 +404,22 @@ msgstr ""
 #. module: hr_timesheet
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效的EAN编码"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr ""
+msgstr "按用户统计"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Line"
-msgstr "工作时间表明细"
+msgstr "时间表明细"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis summary"
-msgstr "分析汇总"
+msgstr "辅助核算摘要"
 
 #. module: hr_timesheet
 #: wizard_field:hr.analytical.timesheet,init,year:0
@@ -446,19 +446,19 @@ msgstr "用户"
 #. module: hr_timesheet
 #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
 msgid "Working Time"
-msgstr "工作时间"
+msgstr "工作的时间"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "To be invoiced"
-msgstr ""
+msgstr "要开发票"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr "员工工作时间表"
+msgstr "员工时间表"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -470,4 +470,4 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "工作时间表列表"
+msgstr "时间表"
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 472ce565560..2b732d8985a 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -4,86 +4,86 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:24+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Type of invoicing"
-msgstr ""
+msgstr "发票类型"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Profit"
-msgstr ""
+msgstr "利润"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Force to use a specific product"
-msgstr ""
+msgstr "强制使用特定产品"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Income"
-msgstr ""
+msgstr "收入"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Visible name"
-msgstr ""
+msgstr "可见的名称"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0
 msgid "Start of period"
-msgstr "开始日期"
+msgstr "期初日期"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,price:0
 msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this."
-msgstr ""
+msgstr "每个工作的成本将显示在发票上.你可能不想检查它"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
 msgid "Invoice analytic lines"
-msgstr ""
+msgstr "辅助核算的发票"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,time:0
 msgid "Display time in the history of works"
-msgstr ""
+msgstr "显示时间在工作日志"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_draft_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts
 msgid "Draft Analytic Accounts"
-msgstr ""
+msgstr "辅助核算项目草稿"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,time:0
 #: wizard_field:hr.timesheet.invoice.create,init,time:0
 msgid "Time spent"
-msgstr "花费时间"
+msgstr "花费的时间"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "开发票金额"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
@@ -91,63 +91,63 @@ msgid ""
 "Check this field if you plan to automatically generate invoices based on the "
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
-msgstr ""
+msgstr "如果你计划自动生成发票基于成本在辅助核算项目:时间表、费用....选择这字段你能设定自动发票的辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,name:0
 msgid "The detail of each work done will be displayed on the invoice"
-msgstr ""
+msgstr "每个工作的详情将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0
 msgid "Select period"
-msgstr "选择期间"
+msgstr "销售周期"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period to enddate"
-msgstr ""
+msgstr "周期的结束日期"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:hr.timesheet.invoice.create,init,create:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "创建发票"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period from startdate"
-msgstr ""
+msgstr "周期的开始日期"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,time:0
 msgid "The time of each work done will be displayed on the invoice"
-msgstr ""
+msgstr "每个工作完成的时间将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,balance_product:0
 msgid "Balance product"
-msgstr ""
+msgstr "产品余额"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_final_invoice_create
 msgid "Final Invoice"
-msgstr ""
+msgstr "最终发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.final.invoice.create,init:0
 msgid "Do you want details for each line of the invoices ?"
-msgstr "您需要发票的明细项吗？"
+msgstr "你想看详情每一发票行?"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "日期代码"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Entries to invoice"
-msgstr ""
+msgstr "凭证开发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:account.analytic.profit,init:0
@@ -157,7 +157,7 @@ msgstr "选择"
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:account.analytic.profit,init,report:0
@@ -169,90 +169,90 @@ msgstr "打印"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_analytic_accounts
 msgid "Open Analytic Accounts"
-msgstr ""
+msgstr "待处理辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Filter on Accounts"
-msgstr ""
+msgstr "科目过滤"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.print_account_analytic_profit
 msgid "Timesheet Profit"
-msgstr ""
+msgstr "时间表利润"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "销售价格表"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,name:0
 msgid "Display detail of work in the invoice line."
-msgstr ""
+msgstr "显示发票行的工作详情"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr ""
+msgstr "成本分类账或凭证名称"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
 #: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
 msgid "Types of Invoicing"
-msgstr ""
+msgstr "发票类型"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Theorical"
-msgstr ""
+msgstr "理论"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr ""
+msgstr "我未开票项目"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,name:0
 #: wizard_field:hr.timesheet.invoice.create,init,name:0
 msgid "Name of entry"
-msgstr ""
+msgstr "凭证名称"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Employee or Journal Name"
-msgstr ""
+msgstr "员工或分类帐名称"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Currency"
-msgstr ""
+msgstr "货币"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,product:0
 msgid ""
 "Complete this field only if you want to force to use a specific product. "
 "Keep empty to use the real product that comes from the cost."
-msgstr ""
+msgstr "如果你想强制使用特定的产品只有完成这字段如果留空使用实际产品来自成本"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced
 msgid "Uninvoiced Entries"
-msgstr ""
+msgstr "未开票项"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:hr.timesheet.final.invoice.create,init,create:0
@@ -262,12 +262,12 @@ msgstr "创建发票"
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.final.invoice.create,init:0
 msgid "Invoice Balance amount"
-msgstr "发票余额"
+msgstr "发票余额金额"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Invoice rate by user"
-msgstr ""
+msgstr "发票使用的税率"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,date_from:0
@@ -277,110 +277,110 @@ msgstr "从"
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
 msgid "Total invoiced"
-msgstr ""
+msgstr "发票合计"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "周期到"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,balance_product:0
 msgid "The product that will be used to invoice the remaining amount."
-msgstr ""
+msgstr "这产品将使用这发票的剩余金额"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr "成本明细帐"
+msgstr "成本分类账"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,date:0
 msgid "Display date in the history of works"
-msgstr ""
+msgstr "显示这工作的日志日期"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,date:0
 #: wizard_field:hr.timesheet.invoice.create,init,date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,factor:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "折扣%"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Eff."
-msgstr ""
+msgstr "有效"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,accounts:0
 msgid "Analytic Accounts"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Total:"
-msgstr ""
+msgstr "合计:"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Credit"
-msgstr ""
+msgstr "贷方"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0
 msgid "End of period"
-msgstr "期末"
+msgstr "周期结束日期"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Balance"
-msgstr ""
+msgstr "结余"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Reinvoice Costs"
-msgstr ""
+msgstr "再开票成本"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Totals:"
-msgstr ""
+msgstr "合计:"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,date_to:0
 msgid "To"
-msgstr "至"
+msgstr "到"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Do you want to show details of work in invoice ?"
-msgstr ""
+msgstr "你想显示这工作发票的详细资料"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "周期从"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_max:0
 msgid "Max. Invoice Price"
-msgstr ""
+msgstr "最大开票价"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:account.analytic.profit,init,end:0
@@ -394,27 +394,27 @@ msgstr "取消"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,employee_ids:0
 msgid "Employee"
-msgstr ""
+msgstr "员工"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,date:0
 msgid "The real date of each work will be displayed on the invoice"
-msgstr ""
+msgstr "每个工作实际日期将显示在发票上"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,price:0
 msgid "Display cost of the item you reinvoice"
-msgstr ""
+msgstr "显示这项成本在你再开的发票"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Choose accounts you want to invoice"
-msgstr ""
+msgstr "选择你想要开发票的科目"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,product:0
@@ -429,59 +429,74 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
 msgid "Internal name"
-msgstr ""
+msgstr "内部名称"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,journal_ids:0
 msgid "Journal"
-msgstr "日记帐"
+msgstr "分类帐"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Units"
-msgstr ""
+msgstr "单位"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
 msgid "Invoice on analytic lines"
-msgstr ""
+msgstr "辅助核算的发票"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_pending_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_pending_analytic_accounts
 msgid "Pending Analytic Accounts"
-msgstr ""
+msgstr "未决的辅助核算项目"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "开票日期"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
 msgid "Invoice rate"
-msgstr ""
+msgstr "发票税率"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Types of invoicing"
-msgstr ""
+msgstr "发票类型"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "计价折扣"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_invoice_analytic_accounts
 msgid "Unclosed Invoiceable Accounts"
-msgstr ""
+msgstr "未关闭的可开票项目"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 #: wizard_field:hr.timesheet.final.invoice.create,init,price:0
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
+
+#~ msgid ""
+#~ "\n"
+#~ "Module to generate invoices based on costs (human resources, expenses, "
+#~ "...).\n"
+#~ "You can define price lists in analytic account, make some theoretical "
+#~ "revenue\n"
+#~ "reports, eso."
+#~ msgstr ""
+#~ "\n"
+#~ "模块生成发票基于成本(人力资源,费用....)\n"
+#~ "你能在辅助核算项目定义价格表,建立一些理论收入的报表"
+
+#~ msgid "Invoice on analytic entries"
+#~ msgstr "辅助核算凭证发票"
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index d048cd59774..c243e947d63 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -4,29 +4,29 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_review0
 msgid "Review end of day check day is complete"
-msgstr ""
+msgstr "审查结束每天检查完成"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
-msgstr ""
+msgstr "你不能有两个重叠的时间表请使用菜单\"我的当前时间表\"来避免这问题"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -34,40 +34,40 @@ msgstr ""
 #: field:hr_timesheet_sheet.sheet.account,sheet_id:0
 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0
 msgid "Sheet"
-msgstr ""
+msgstr "表"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
-msgstr ""
+msgstr "出勤合计"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
 msgid "My timesheets to confirm"
-msgstr ""
+msgstr "确认我的时间表"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timeshet range"
-msgstr ""
+msgstr "时间表范围"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Today"
-msgstr ""
+msgstr "今天"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
 msgid "Confirm timesheet sheet"
-msgstr ""
+msgstr "确认时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -75,194 +75,194 @@ msgstr ""
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Timesheet"
-msgstr ""
+msgstr "时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Defines employee's timesheet entry"
-msgstr ""
+msgstr "定义员工时间表条目"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet sheet"
-msgstr ""
+msgstr "时间表草稿"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "我当前的时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr ""
+msgstr "现在"
 
 #. 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 ""
+msgstr "拒绝"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated Timesheet"
-msgstr ""
+msgstr "批准时间表"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
+msgstr "你必须选择一个当前日期是在时间表的日期中"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr ""
+msgstr "差合计"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
 msgid "Phone call encoding"
-msgstr ""
+msgstr "电话呼叫编码"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Day"
-msgstr ""
+msgstr "时间表按天"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Defines the task work entry into timesheet line"
-msgstr ""
+msgstr "定义在时间表明细中工作任务条目"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
 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."
-msgstr ""
+msgstr "允许在签出签入的差和计算时间表.如果你不想控制设为0"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Timesheet by Days"
-msgstr ""
+msgstr "时间表按天"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "timesheet is confirmed at the end of the week / month"
-msgstr ""
+msgstr "时间表确认结束在这周/月"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Project Timesheet"
-msgstr ""
+msgstr "项目时间表"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "日期从"
 
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet Process"
-msgstr ""
+msgstr "人力资源时间表处理"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
 msgid "Analytic cost"
-msgstr ""
+msgstr "辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
-msgstr ""
+msgstr "出勤"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
 msgid "Confirm"
-msgstr ""
+msgstr "确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr ""
+msgstr "时间表明细"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
 msgid "Encode your timesheet line"
-msgstr ""
+msgstr "编码你的时间表明细"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirm Timesheet"
-msgstr ""
+msgstr "确认时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Control by the project manager"
-msgstr ""
+msgstr "项目经理控制"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "New"
-msgstr ""
+msgstr "新的"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
 msgid "Timesheet sheet confirm at the end of the period"
-msgstr ""
+msgstr "时间表表确认的结束周期"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr ""
+msgstr "总时间"
 
 #. module: hr_timesheet_sheet
 #: 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
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
 msgid "Confirm timesheet at the end of the period"
-msgstr ""
+msgstr "确认时间表周期的结束"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
-msgstr ""
+msgstr "没定义员工"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "Confirmed Timesheet"
-msgstr ""
+msgstr "确认时间表"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -272,82 +272,82 @@ msgstr "设置"
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Week"
-msgstr ""
+msgstr "周"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily View"
-msgstr ""
+msgstr "每天视图"
 
 #. 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 "时间表周期"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign In"
-msgstr ""
+msgstr "签入"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
 msgid "My Department's Timesheet"
-msgstr ""
+msgstr "我部门的时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Go to:"
-msgstr ""
+msgstr "到:"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
 msgid "Phone call"
-msgstr ""
+msgstr "电话呼叫"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
 #: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Timesheet"
-msgstr ""
+msgstr "总时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
 msgid "Review of work"
-msgstr ""
+msgstr "工作审查"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr ""
+msgstr "在这周的发票"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Encode Your hours and Sign in / out"
-msgstr ""
+msgstr "编码你的小时和签入/签出"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_review0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
 msgid "Review"
-msgstr ""
+msgstr "审查"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -357,161 +357,161 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
 #: view:res.company:0
 msgid "Timesheets"
-msgstr ""
+msgstr "时间表"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
 msgid "Timesheets To Confirm"
-msgstr ""
+msgstr "时间表确认"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "日期到"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Current Status"
-msgstr ""
+msgstr "当前状态"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Invoice on timesheet"
-msgstr ""
+msgstr "这时间表的发票"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice based on timesheet"
-msgstr ""
+msgstr "发票基于时间表"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
-msgstr ""
+msgstr "科目时间表"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Creates invoice based on timesheet"
-msgstr ""
+msgstr "基于时间表创建发票"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_valid
 msgid "Timesheets To Validate"
-msgstr ""
+msgstr "时间表批准"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference"
-msgstr ""
+msgstr "时间表允许差"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,period_ids:0
 msgid "Period"
-msgstr ""
+msgstr "周期"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance entry moves into the timesheet"
-msgstr ""
+msgstr "时间表出勤登入条目"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
 msgid "Creates your analytic cost accoording to quantity"
-msgstr ""
+msgstr "创建你的辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "时间表明细"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr ""
+msgstr "时间表科目"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Timesheet is validate by project manager."
-msgstr ""
+msgstr "项目管理批准的时间表"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
 msgid "Whatever time u spent for phone call"
-msgstr ""
+msgstr "无论什么时间你花费的电话呼叫"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validate Timesheet"
-msgstr ""
+msgstr "批准时间表"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
 msgid "My Department's Timesheet to Confirm"
-msgstr ""
+msgstr "确认我部门的时间表"
 
 #. 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 ""
+msgstr "出勤"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
 msgid "Create Analytic cost"
-msgstr ""
+msgstr "创建辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
-msgstr ""
+msgstr "签出"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
-msgstr ""
+msgstr "日间"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
 #: field:hr_timesheet_sheet.sheet.day,total_difference:0
 msgid "Difference"
-msgstr ""
+msgstr "差别"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
@@ -521,77 +521,117 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr ""
+msgstr "缺席"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "At the end of the period (week/month)"
-msgstr ""
+msgstr "在此周期结束:周/月"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "timesheet entry is into draft state."
-msgstr ""
+msgstr "时间表条目进入到草稿状态"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
 msgid "Analytic cost is created"
-msgstr ""
+msgstr "已创建的辅助核算成本"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr ""
+msgstr "发票率"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
 msgid "Encode how much time u spent on phone call"
-msgstr ""
+msgstr "编码花费多少时间来完成电话呼叫"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
 msgid "Review of your work at the end of the day"
-msgstr ""
+msgstr "你工作审查结束日期"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
 msgid "Analytic accounts"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
 msgid "My timesheets"
-msgstr ""
+msgstr "我的时间表"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Accept"
-msgstr ""
+msgstr "同意"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
 msgid "Current date"
-msgstr ""
+msgstr "当前日期"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
 msgid "Unvalidated Timesheets"
-msgstr ""
+msgstr "不可用的时间表"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
 msgid "My Department's Timesheet to Validate"
-msgstr ""
+msgstr "批准我部门的时间表"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module help you 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"
+#~ "Others 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 implement 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 te 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"
+#~ "    "
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index e7554d4263a..fdbd9bdd3fc 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -4,180 +4,180 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 16:10+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
 #: field:idea.category,name:0
 #: field:idea.idea,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "非常好"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,stat_vote_ids:0
 msgid "Statistics"
-msgstr ""
+msgstr "统计"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
 #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
 msgid "My Ideas"
-msgstr ""
+msgstr "我的创意"
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Not Voted"
-msgstr ""
+msgstr "没投票"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
 msgid "My Open Ideas"
-msgstr ""
+msgstr "我待处理的创意"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr ""
+msgstr "创意"
 
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "子分类"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr ""
+msgstr "新的创意"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr ""
+msgstr "创意分类"
 
 #. module: idea
 #: field:idea.vote,score:0
 #: field:idea.vote.stat,score:0
 msgid "Score"
-msgstr ""
+msgstr "得分"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr ""
+msgstr "创意投票"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 msgid "Statistics on Votes"
-msgstr ""
+msgstr "统计投票"
 
 #. module: idea
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Category for an idea"
-msgstr ""
+msgstr "创意分类"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "创意管理"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr ""
+msgstr "投票统计"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Opened"
-msgstr ""
+msgstr "待处理"
 
 #. module: idea
 #: field:idea.idea,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Good"
-msgstr ""
+msgstr "好"
 
 #. module: idea
 #: field:idea.idea,description:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Normal"
-msgstr ""
+msgstr "一般"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "创意投票统计"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "idea.vote"
-msgstr ""
+msgstr "创意投票"
 
 #. module: idea
 #: field:idea.comment,user_id:0
 #: field:idea.vote,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "你的评价"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_config
@@ -188,27 +188,27 @@ msgstr "设置"
 #: model:ir.actions.act_window,name:idea.action_idea_category
 #: model:ir.ui.menu,name:idea.menu_idea_category
 msgid "Categories"
-msgstr "事务分类"
+msgstr "分类"
 
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "开始"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "我的投票"
 
 #. module: idea
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Votes"
-msgstr ""
+msgstr "投票"
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -220,51 +220,53 @@ msgid ""
 "managers can obtain an easy view on best ideas from all the users. Once "
 "installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"这模块允许你在创新的企业里简单和有效地使用.它允许每个人去表达不同的主题,其他用户能评价这些创意和对特定的创意进行投票.每个创意所得投票决定得分.\n"
+"管理人员可以很容易得到所有用户创意.一旦安装,在工具主菜单查看创意菜单."
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "投票数"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr ""
+msgstr "投票数"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "创意"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
 msgid "My Draft Ideas"
-msgstr ""
+msgstr "我的创意草稿"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 msgid "Vote"
-msgstr ""
+msgstr "投票"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr ""
+msgstr "坏"
 
 #. module: idea
 #: view:idea.idea:0
 #: model:ir.ui.menu,name:idea.menu_idea_idea
 msgid "All Ideas"
-msgstr ""
+msgstr "所有创意"
 
 #. module: idea
 #: view:idea.comment:0
@@ -272,62 +274,62 @@ msgstr ""
 #: field:idea.idea,comment_ids:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comments"
-msgstr ""
+msgstr "评论"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "评论数"
 
 #. module: idea
 #: field:idea.idea,title:0
 msgid "Idea Summary"
-msgstr ""
+msgstr "创意摘要"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr ""
+msgstr "创意分类"
 
 #. module: idea
 #: field:idea.category,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "待处理的创意"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:idea.vote.stat:0
 msgid "vote_stat of ideas"
-msgstr ""
+msgstr "开始对创意投票"
 
 #. module: idea
 #: view:idea.comment:0
 #: field:idea.comment,content:0
 #: view:idea.idea:0
 msgid "Comment"
-msgstr ""
+msgstr "评论"
 
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "上级分类"
 
 #. module: idea
 #: field:idea.idea,user_id:0
 msgid "Creator"
-msgstr ""
+msgstr "建立者"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_tools
 msgid "Tools"
-msgstr ""
+msgstr "工具"
 
 #. module: idea
 #: field:idea.comment,idea_id:0
@@ -335,46 +337,49 @@ msgstr ""
 #: field:idea.vote,idea_id:0
 #: field:idea.vote.stat,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "创意"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "非常坏"
 
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "已取消"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
 msgid "All Votes"
-msgstr ""
+msgstr "所有投票"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Close"
-msgstr ""
+msgstr "结束"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "平均分"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr ""
+msgstr "这创意的内容"
+
+#~ msgid "Accepted"
+#~ msgstr "已同意"
diff --git a/addons/l10n_chart_uk_minimal/i18n/zh_CN.po b/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
index fcd2c75eedf..dfaa394814b 100644
--- a/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
+++ b/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 07:54+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -41,7 +41,7 @@ msgstr "收入"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
 msgid "Tax"
-msgstr "?"
+msgstr "税"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
@@ -63,7 +63,7 @@ msgstr ""
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
 msgid "Payable"
-msgstr ""
+msgstr "应付账款"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
@@ -73,7 +73,7 @@ msgstr ""
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "权益"
 
 #. module: l10n_chart_uk_minimal
 #: constraint:account.tax.code.template:0
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index f3720157d29..bacd1810ee4 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-10 02:12+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "发票关联"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
 msgid "Membership Process"
-msgstr "会员流程"
+msgstr "会员处理"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -35,7 +35,7 @@ msgstr "付费会员"
 #. module: membership
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在这动作定义中无效的模块名"
 
 #. module: membership
 #: field:report.partner_member.year,currency:0
@@ -46,52 +46,52 @@ msgstr "货币"
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
 msgid "Set an associate member of partner."
-msgstr ""
+msgstr "设为准成员的业务伙伴"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr "发票已经付款。"
+msgstr "支付发票"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "定义会员产品"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "日期到"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr "等待开票"
+msgstr "等待发票"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "产品给会员"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "准会员"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "是准会员"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "准业务伙伴"
 
 #. module: membership
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "错误!你不能创建递归科目。"
+msgstr "错误!你不能创建递归的账户"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -101,7 +101,7 @@ msgstr ""
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "日期格式"
 
 #. module: membership
 #: field:membership.membership_line,partner:0
@@ -112,12 +112,12 @@ msgstr "业务伙伴"
 #: model:ir.actions.act_window,name:membership.action_membership_members_free
 #: model:ir.ui.menu,name:membership.menu_members_free
 msgid "Free members"
-msgstr "免费会员列表"
+msgstr "免费会员"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "支付发票"
 
 #. module: membership
 #: view:res.partner:0
@@ -127,7 +127,7 @@ msgstr "业务伙伴"
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr ""
+msgstr "格式"
 
 #. module: membership
 #: constraint:membership.membership_line:0
@@ -137,7 +137,7 @@ msgstr ""
 #. module: membership
 #: wizard_button:wizard_invoice_membership,init,ok:0
 msgid "Confirm"
-msgstr "确认"
+msgstr "确定"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -147,12 +147,12 @@ msgstr "创建"
 #. module: membership
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
-msgstr ""
+msgstr "会员明细"
 
 #. module: membership
 #: field:membership.membership_line,state:0
@@ -162,7 +162,7 @@ msgstr "状态"
 #. module: membership
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
-msgstr ""
+msgstr "入会日期"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
@@ -174,7 +174,7 @@ msgstr "付费会员"
 #: model:ir.ui.menu,name:membership.menu_report_partner_member_year
 #: view:report.partner_member.year:0
 msgid "Membership by Years"
-msgstr ""
+msgstr "会籍年份"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_reporting
@@ -184,7 +184,7 @@ msgstr "报表"
 #. module: membership
 #: view:res.partner:0
 msgid "Members"
-msgstr "会员列表"
+msgstr "成员"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -195,7 +195,7 @@ msgstr "非会员"
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
 msgid "Open invoice."
-msgstr ""
+msgstr "待处理发票"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_conf
@@ -205,43 +205,43 @@ msgstr "设置"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "定义会员产品"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "已开发票的会员可能是准会员"
 
 #. module: membership
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位和计量单位必须是不同类型"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "会员产品"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_members_waiting
 msgid "Future members (invoice not confirmed)"
-msgstr ""
+msgstr "未来会员(发票没确认)"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "设立协会"
 
 #. module: membership
 #: model:product.template,name:membership.member_product_1_product_template
 msgid "Membership Product - 2"
-msgstr ""
+msgstr "会员产品 - 2"
 
 #. module: membership
 #: model:product.template,name:membership.member_product_0_product_template
 msgid "Membership Product - 1"
-msgstr ""
+msgstr "会员产品 - 1"
 
 #. module: membership
 #: field:report.partner_member.year,canceled_amount:0
@@ -249,12 +249,12 @@ msgstr ""
 #: field:report.partner_member.year_new,canceled_amount:0
 #: field:report.partner_member.year_new,canceled_number:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr "会员销售价格表"
+msgstr "会员售价表"
 
 #. module: membership
 #: field:report.partner_member.year,invoiced_amount:0
@@ -262,7 +262,7 @@ msgstr "会员销售价格表"
 #: field:report.partner_member.year_new,invoiced_amount:0
 #: field:report.partner_member.year_new,invoiced_number:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "开发票"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -273,13 +273,13 @@ msgstr "免费会员"
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr "会员销售价格表版本"
+msgstr "会员售价表版本"
 
 #. module: membership
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:采购单位和计量单位不能是同一类型"
 
 #. module: membership
 #: help:res.partner,membership_amount:0
@@ -289,7 +289,7 @@ msgstr ""
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "准会员"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -299,17 +299,17 @@ msgstr ""
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr "取消会员资格时间"
+msgstr "取消会员日期"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
 msgid "Membership Products"
-msgstr ""
+msgstr "会员产品"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "会员发票支付"
 
 #. module: membership
 #: field:report.partner_member.year,paid_amount:0
@@ -317,13 +317,13 @@ msgstr ""
 #: field:report.partner_member.year_new,paid_amount:0
 #: field:report.partner_member.year_new,paid_number:0
 msgid "Paid"
-msgstr "已付款"
+msgstr "已付"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Invoiced Member"
-msgstr ""
+msgstr "已开发票的会员"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -333,61 +333,61 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,member_lines:0
 msgid "Membership"
-msgstr "会员"
+msgstr "会籍"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Specify if this product is a membership product"
-msgstr ""
+msgstr "如果这产品是会籍产品指定"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
-msgstr ""
+msgstr "等待会员"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "协会业务伙伴"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_invoiced
 #: model:ir.ui.menu,name:membership.menu_members_invoiced
 msgid "Invoiced members"
-msgstr ""
+msgstr "已开发票的会员"
 
 #. module: membership
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "您不能同时具有两个重叠的价格表版本。"
+msgstr "你不能有2个价格表版本"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_old
 #: model:ir.ui.menu,name:membership.menu_members_old
 msgid "Old members"
-msgstr ""
+msgstr "旧会员"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
 msgid "Membership amount"
-msgstr ""
+msgstr "会员数"
 
 #. module: membership
 #: wizard_view:wizard_invoice_membership,init:0
 msgid "Choose invoice details"
-msgstr ""
+msgstr "选择发票细节"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Old Member"
-msgstr ""
+msgstr "旧会员"
 
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "到"
 
 #. module: membership
 #: field:report.partner_member.year,waiting_amount:0
@@ -400,12 +400,12 @@ msgstr "等待"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "发票现在是待处理"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_waiting
 msgid "Future members"
-msgstr ""
+msgstr "未来的会员"
 
 #. module: membership
 #: wizard_button:wizard_invoice_membership,init,end:0
@@ -416,13 +416,13 @@ msgstr "取消"
 #: model:ir.actions.act_window,name:membership.action_membership_members_associated
 #: model:ir.ui.menu,name:membership.menu_members_associated
 msgid "Associated members"
-msgstr ""
+msgstr "准会员"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_paid
 #: model:ir.ui.menu,name:membership.menu_members_paid
 msgid "Paid members"
-msgstr ""
+msgstr "付费会员"
 
 #. module: membership
 #: view:product.product:0
@@ -432,92 +432,92 @@ msgstr "信息"
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
-msgstr ""
+msgstr "账户发票明细"
 
 #. module: membership
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以x_开头并且不能含特殊的字符"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr ""
+msgstr "会员草稿发票"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Canceled Member"
-msgstr ""
+msgstr "取消会员"
 
 #. module: membership
 #: model:product.price.type,name:membership.product_price_type_memberprice
 #: field:product.template,member_price:0
 msgid "Member Price"
-msgstr ""
+msgstr "会员价格"
 
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
-msgstr ""
+msgstr "免费会员"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "停止会员日期"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
 #: model:ir.ui.menu,name:membership.menu_members
 msgid "Current members"
-msgstr "现有会员列表"
+msgstr "当前的会员"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_partner_member_year_new
 #: model:ir.ui.menu,name:membership.menu_report_partner_member_year_new
 #: view:report.partner_member.year_new:0
 msgid "New Membership by Years"
-msgstr ""
+msgstr "年新会员"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "已开发票会员"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "取消日期"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "等待会员"
 
 #. module: membership
 #: model:ir.actions.wizard,name:membership.wizard_invoice_membership
 msgid "Invoice Membership"
-msgstr ""
+msgstr "发票会员"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
 #: wizard_field:wizard_invoice_membership,init,product:0
 msgid "Membership product"
-msgstr ""
+msgstr "会员产品"
 
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效EAN代码"
 
 #. module: membership
 #: field:report.partner_member.year,year:0
 #: field:report.partner_member.year_new,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: membership
 #: field:res.partner,membership_state:0
 msgid "Current membership state"
-msgstr "当前会员资格状态"
+msgstr "当前会员状态"
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index b6f563d07c6..3da923faf93 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -4,27 +4,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 01:06+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:33+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Moves Created"
-msgstr "已创建的调拨"
+msgstr "创建调拨"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr "周期数"
+msgstr "周期"
 
 #. module: mrp
 #: help:mrp.procurement.compute.all,init,automatic:0
@@ -32,22 +32,22 @@ msgid ""
 "Triggers an automatic procurement for all products that have a virtual stock "
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
-msgstr "触发所有虚拟库存为小于0的产品请求。建议您不要使用这个选项，可使用货品订货型生产的设置。"
+msgstr "触发所有虚拟库存为小于0产品自动的产品需求.你或者不应该使用这个选项.建议你使用产品按单生产的设置"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr "物料需求计划"
+msgstr "MRP(产品需求计划)"
 
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
 msgid "Revision"
-msgstr "修订版"
+msgstr "版本"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
@@ -64,12 +64,12 @@ msgstr "异常需求单"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr "工作中心"
+msgstr "工艺路线的工作中心"
 
 #. module: mrp
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr "不是用来计算，仅仅是提供信息。"
+msgstr "不是用来计算.仅仅是信息"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -123,7 +123,7 @@ msgstr "套/包"
 #. module: mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: mrp
 #: help:res.company,security_lead:0
@@ -134,34 +134,34 @@ msgstr "提供答应给客户的确保天数"
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
 msgid "Cost per hour"
-msgstr "小时成本"
+msgstr "每小时成本"
 
 #. module: mrp
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Best price (not yet active!)"
-msgstr "最优价（尚未激活!)"
+msgstr "最优价(尚未激活!)"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Product & Location"
-msgstr "货品&货位"
+msgstr "产品&库位"
 
 #. module: mrp
 #: view:res.company:0
 msgid "MRP & Logistic Scheduler"
-msgstr "MRP 与 物流调度"
+msgstr "MRP&物流调度"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
 "Number of operation this workcenter can do in parallel. If this workcenter "
 "represent a team of 5 workers, the capacity per cycle is 5."
-msgstr "可同时运行的操作数量。 如果一个工作中心代表一个拥有5名工人的队伍， 则循环能力为5。"
+msgstr "一些运作可以并行.如果一个工作中心有5个工人"
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
 msgid "Ask New Products"
-msgstr "是否新货品"
+msgstr "新的产品需求"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_reordering
@@ -174,12 +174,12 @@ msgstr "自动生成需求单"
 #: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr "货品数量"
+msgstr "产品数量"
 
 #. module: mrp
 #: field:mrp.production,move_lines:0
 msgid "Products Consummed"
-msgstr "所消耗的产品"
+msgstr "产品消耗"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -199,47 +199,47 @@ msgstr "分拣单异常"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 msgid "A purchase order is created for a sub-contracting demand."
-msgstr "采购单是为满足子合同需求而创建的"
+msgstr "采购单是为满足子合同要求而创建的"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Destination Location"
-msgstr "目标货位"
+msgstr "目标库位"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Analytic Accounting"
-msgstr "分析科目"
+msgstr "分析会计"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Do nothing"
-msgstr "什么也不做"
+msgstr "不做任何动作"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "业务伙伴引用"
+msgstr "业务伙伴参考"
 
 #. module: mrp
 #: help:mrp.procurement.orderpoint.compute,init,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
-msgstr "如果产品的库存量小于0，这会作为一个订购点。"
+msgstr "如果仓库的产品小于0它像一个订购点"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in hours"
-msgstr "小时数"
+msgstr "每小时金额"
 
 #. module: mrp
 #: field:mrp.production,product_lines:0
 msgid "Scheduled goods"
-msgstr "计划中的货品"
+msgstr "安排的货物"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
 msgid "you can see the minimum stock rules from product"
-msgstr "你能看到货品最低库存规则"
+msgstr "你能看到产品最低库存规则"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
@@ -266,17 +266,17 @@ msgstr "状态"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "Stockable Production Order"
-msgstr "可库存生产订单"
+msgstr "可库存生产单"
 
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
-msgstr "外部计划位置的引用"
+msgstr "外部计划位置的参考"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "Stockable Request"
-msgstr "可库存需求"
+msgstr "可库存请求"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceonorder0
@@ -289,12 +289,12 @@ msgstr "订单的服务"
 msgid ""
 "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
-msgstr "当虚拟库存到最低量，系统产生一个产品请求使虚拟库存达到最大数量。"
+msgstr "当虚拟库存到最低量.系统产生一个产品需求使虚拟库存达到最大数量."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Stockable Make to Stock"
-msgstr "可库存备货型生产"
+msgstr "可库存按库存生产"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -325,7 +325,7 @@ msgstr "生成服务需求单"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr "确认生产单"
+msgstr "确认生产"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
@@ -336,7 +336,7 @@ msgstr "需求单"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production scheduled products"
-msgstr "计划生产"
+msgstr "产品生产安排"
 
 #. module: mrp
 #: field:mrp.workcenter,timesheet_id:0
@@ -356,7 +356,7 @@ msgstr "需求流程"
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
 msgid "Scheduled Date"
-msgstr "计划日期"
+msgstr "安排日期"
 
 #. module: mrp
 #: selection:mrp.procurement,priority:0
@@ -368,7 +368,7 @@ msgstr "紧急"
 #: help:mrp.bom,product_rounding:0
 msgid ""
 "Rounding applied on the product quantity. For integer only values, put 1.0"
-msgstr "货品数量会四舍五入。 如只有整数值请输入1.0。"
+msgstr "产品数量舍入.整个为1.0"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -381,12 +381,12 @@ msgid ""
 "Keep empty if you produce at the location where the finished products are "
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
-msgstr "如果您在所需成品地点生产，请留空。如在固定地点生产请设置地点。如果您外包这块生产业务，这也可以是业务伙伴的地点。"
+msgstr "如果你在本地生产这成品你需要留空"
 
 #. module: mrp
 #: field:mrp.procurement,move_id:0
 msgid "Reservation"
-msgstr "预定"
+msgstr "保留"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -406,12 +406,12 @@ msgstr "最大"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Product to stock rules"
-msgstr "货品库存规则"
+msgstr "产品库存规则"
 
 #. module: mrp
 #: wizard_button:product_price,init,price:0
 msgid "Print product price"
-msgstr "打印产品价格"
+msgstr "产品报价"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
@@ -421,7 +421,7 @@ msgstr "生成需求单"
 #. module: mrp
 #: field:mrp.bom.revision,date:0
 msgid "Modification Date"
-msgstr "修改时间"
+msgstr "修改日期"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
@@ -429,12 +429,12 @@ msgstr "修改时间"
 msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
-msgstr "只在当你想在生产单中自动核算时完成这个。"
+msgstr "如果你需要生产单的自动辅助核算项目凭证只有完成这个."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
 msgid "If Procure method is Make to order and supply method is produce"
-msgstr "如果获得方式是订货型生产并且供应方式是生产"
+msgstr "如果获得方式是来自订单并且供应方式是生产"
 
 #. module: mrp
 #: field:res.company,po_lead:0
@@ -444,12 +444,12 @@ msgstr "采购所需时间"
 #. module: mrp
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr "生产地点"
+msgstr "产品库位"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr "改变数量"
+msgstr "修改数量"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -464,13 +464,13 @@ msgstr "作者"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Stockable Product Stock"
-msgstr "可库存货品库存"
+msgstr "可库存产品库存"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr "产品销售计量单位"
+msgstr "产品销售单位"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -480,7 +480,7 @@ msgstr "生产需求单"
 #. module: mrp
 #: model:process.process,name:mrp.process_process_serviceproductprocess0
 msgid "Service Product Process"
-msgstr "服务货品进程"
+msgstr "服务产品进程"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -490,7 +490,7 @@ msgstr "需求单转为采购订单草稿。"
 #. module: mrp
 #: field:mrp.procurement,message:0
 msgid "Latest error"
-msgstr "最近的错误"
+msgstr "最新错误"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -500,49 +500,49 @@ msgstr "物料清单明细"
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr "生产前时间"
+msgstr "生产准备时间"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Routing workcenter usage"
-msgstr "工艺路线工作中心使用情况"
+msgstr "工艺路线使用的工作中心"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consumed Products"
-msgstr "消耗的产品"
+msgstr "消耗产品"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr "错误！您不能创建循环的物料清单。"
+msgstr "错误!你不能创建递归的物料清单"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid "If Product type is Stockable and procure method is make to stock"
-msgstr "如果货品类型是可库存并且获得方式是备货型生产"
+msgstr "如果产品类型是可库存并且获得方式是来自库存"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturity Lead Time"
-msgstr "生产所需时间"
+msgstr "生产准备时间"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
 msgid "Exceptions Procurements to Fix"
-msgstr "需修正的例外请料单"
+msgstr "异常产品需求修正"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Ready"
-msgstr "就绪"
+msgstr "准备好"
 
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Workcenter Operations"
-msgstr "工作中心操作"
+msgstr "工作中心运作"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
@@ -553,12 +553,12 @@ msgstr "生产单计划"
 #. module: mrp
 #: help:mrp.workcenter,time_efficiency:0
 msgid "Factor that multiplies all times expressed in the workcenter."
-msgstr "该系数是用来调节工作中心循环及生产前、后持续时间"
+msgstr "在工作中心任何时候都表示为乘法的系数"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr "一个循环的小时数"
+msgstr "一个周期的工作小时数"
 
 #. module: mrp
 #: field:mrp.production,date_finnished:0
@@ -585,7 +585,7 @@ msgstr "数量倍数"
 #. module: mrp
 #: selection:mrp.procurement,state:0
 msgid "Waiting"
-msgstr "等待中"
+msgstr "等待"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -610,7 +610,7 @@ msgstr "类型"
 #: model:process.node,note:mrp.process_node_stockproduct0
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable and consumable"
-msgstr "为可库存和消耗"
+msgstr "为了可库存和消耗"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
@@ -636,17 +636,17 @@ msgstr "打印日期"
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr "询价"
+msgstr "要求报价"
 
 #. module: mrp
 #: field:mrp.bom,revision_type:0
 msgid "indice type"
-msgstr "指数类型"
+msgstr "指标类型"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Production orders are created for the product manufacturing."
-msgstr "创建生产单用于产品生产"
+msgstr "生产单创建产品生产"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -656,7 +656,7 @@ msgstr "工作中心"
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
-msgstr "最小数量"
+msgstr "最少数量"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -667,7 +667,7 @@ msgstr "生产单"
 #: field:mrp.bom,child_complete_ids:0
 #: field:mrp.bom,child_ids:0
 msgid "BoM Hyerarchy"
-msgstr "物料清单体系"
+msgstr "物料清单层次"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -677,29 +677,29 @@ msgstr "需求单明细"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
 msgid "If Product type is service and procure method is Make to stock"
-msgstr "如果产品类型是服务并且获得方式是备货型生产"
+msgstr "如果产品类型是服务并且获得方式是来自订单"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "If Product type is service"
-msgstr "如果产品的类型是服务的话"
+msgstr "如果产品的类型是服务"
 
 #. module: mrp
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr "备用天数"
+msgstr "确保天数"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
-msgstr "循环总数"
+msgstr "总周期"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Ready to Produce"
-msgstr "生产准备就绪"
+msgstr "准备生产"
 
 #. module: mrp
 #: field:mrp.bom.revision,name:0
@@ -726,7 +726,7 @@ msgstr "该向导将计划本产品的需求单。这可能会产生任务，生
 #. module: mrp
 #: model:process.node,note:mrp.process_node_mts0
 msgid "The system waits for requested products in stock."
-msgstr "系统等待库存的货品需求"
+msgstr "系统等待库存被请求的产品"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemto0
@@ -755,12 +755,12 @@ msgstr "生产完成"
 #: field:mrp.routing,code:0
 #: field:mrp.workcenter,code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "小时数"
+msgstr "小时编号"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property_group
@@ -796,7 +796,7 @@ msgstr "取消"
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
-msgstr "移动产品"
+msgstr "产品调拨"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
@@ -806,7 +806,7 @@ msgstr "机器"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr "备货型生产"
+msgstr "按库存生产"
 
 #. module: mrp
 #: field:mrp.workcenter,name:0
@@ -828,12 +828,12 @@ msgstr "最小"
 msgid ""
 "Description of the workcenter. Explain here what's a cycle according to this "
 "workcenter."
-msgstr "工作中心描述，解释说明该工作中心的循环。"
+msgstr "根据中工作中心说明在什么循环"
 
 #. module: mrp
 #: rml:bom.structure:0
 msgid "-"
-msgstr "－"
+msgstr "-"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
@@ -861,12 +861,12 @@ msgstr "已定购而未交货"
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
 #: model:ir.ui.menu,name:mrp.mrp_Sched_all
 msgid "Compute All Schedulers"
-msgstr "计算所有日程"
+msgstr "所有调度"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
 msgid "Nbr of cycle"
-msgstr "循环数"
+msgstr "周期数"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -901,37 +901,37 @@ msgid ""
 "This is the time frame analysed by the scheduler when computing "
 "procurements. All procurement that are not between today and today+range are "
 "skipped for futur computation."
-msgstr "这是调度程序在计算请料单时得到的时间框架。所有不在该时间框架之内的请料单会被跳转，以后再计算。"
+msgstr "计算产品需求调度的时间分析.所有不在今天和今天 + 跳转范围的产品需求."
 
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
 msgid "Time Efficiency"
-msgstr "时间效率"
+msgstr "有效时间"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
 msgid "Security days for each manufacturing operation."
-msgstr "每个生产操作的备用天数。"
+msgstr "每个生产活动的确保天数"
 
 #. module: mrp
 #: wizard_view:mrp.procurement.compute.all,init:0
 msgid "Scheduler Parameters"
-msgstr "计划参数"
+msgstr "调度参数"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
 msgid "A cycle is defined in the workcenter definition."
-msgstr "工作中心定义的循环设定。"
+msgstr "工作中心定义的循环设定."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
 msgid "Amount in cycles"
-msgstr "循环数"
+msgstr "循环金额"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "成品货位"
+msgstr "成品库位"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,uom_id:0
@@ -941,7 +941,7 @@ msgstr "计量单位"
 #. module: mrp
 #: field:mrp.procurement,procure_method:0
 msgid "Procurement Method"
-msgstr "获得方式"
+msgstr "产品需求方式"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -963,7 +963,7 @@ msgstr "计算需求单"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Wait for available products for reservation"
-msgstr "等待可采用产品预留"
+msgstr "等待有效产品的预留"
 
 #. module: mrp
 #: wizard_button:change_production_qty,confirm,validate:0
@@ -1005,12 +1005,12 @@ msgstr "产品生产数量"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "系统将储存成品的货位"
+msgstr "系统的成品库存位置 - 库位"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material routing"
-msgstr "物料工艺路线"
+msgstr "产品个工艺路线"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,time_unit:0
@@ -1020,27 +1020,27 @@ msgstr "逐日"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum stock rule"
-msgstr "最低库存量规则"
+msgstr "最少库存规则"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
-msgstr "修订记录"
+msgstr "修改"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Product Efficiency"
-msgstr "材料效率"
+msgstr "生产效率"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
 msgid "Orderpoint minimum rule"
-msgstr "再订货点规则"
+msgstr "最少采购点规则"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicemts0
 msgid "Service Make to Stock"
-msgstr "定义为备货型生产的服务"
+msgstr "服务来自库存"
 
 #. module: mrp
 #: field:mrp.production,sale_ref:0
@@ -1058,7 +1058,7 @@ msgstr "优先级"
 #: field:mrp.procurement,location_id:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr "货位"
+msgstr "库位"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_new
@@ -1069,7 +1069,7 @@ msgstr "新建需求单"
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr "生产单编码："
+msgstr "生产单号:"
 
 #. module: mrp
 #: selection:mrp.workcenter,type:0
@@ -1080,7 +1080,7 @@ msgstr "工具"
 #: help:mrp.production,location_src_id:0
 msgid ""
 "Location where the system will look for products used in raw materials."
-msgstr "系统查找产品原料的存放货位。"
+msgstr "系统查找产品使用的原料的存放库位"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -1096,17 +1096,17 @@ msgstr "需求单"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
 msgid "Make to Stock"
-msgstr "备货型生产"
+msgstr "按库存生产"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
 msgid "If product type is service and procure method is Make to order"
-msgstr "如果产品类型是服务并且获得方式是订货型生产"
+msgstr "如果产品类型是服并且获得方式是来自订单"
 
 #. module: mrp
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range"
-msgstr "调度器范围"
+msgstr "调度范围"
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -1122,7 +1122,7 @@ msgstr "需求单"
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.product_procurement_wizard
 msgid "Procurement Request"
-msgstr "需求单"
+msgstr "产品需求"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_price
@@ -1132,12 +1132,12 @@ msgstr "产品成本构成"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "Minimum Stock Procure"
-msgstr "最低库存量需求单"
+msgstr "最低库存采购"
 
 #. module: mrp
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr "这是每个采购订单的导致／备用时间"
+msgstr "这是导致/每个采购订单的安全时间"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1157,12 +1157,12 @@ msgstr "时间科目"
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "alphabetical indices"
-msgstr "字模顺序"
+msgstr "按字母顺序顺序排列的指标"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Procurement for raw materials."
-msgstr "原材料需求单"
+msgstr "原材料需求"
 
 #. module: mrp
 #: view:mrp.procurement:0
@@ -1174,7 +1174,7 @@ msgstr "备注"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procure Stockable Product"
-msgstr "生成可库存货品需求单"
+msgstr "生产可库存产品"
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1197,12 +1197,12 @@ msgstr "定义一个工艺路线来描述生产的步骤"
 #: field:mrp.workcenter,active:0
 #: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "生成货品需求单"
+msgstr "生产产品"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1220,13 +1220,13 @@ msgstr "属性"
 #: field:mrp.procurement,date_planned:0
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr "计划日期"
+msgstr "安排日期"
 
 #. module: mrp
 #: view:mrp.procurement:0
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr ""
+msgstr "额外信息"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
@@ -1238,7 +1238,7 @@ msgstr "定义产品结构、子产品或组件"
 msgid ""
 "Procurement is created if the product quantity is lower than the minimum "
 "limit."
-msgstr "当产品数量低于最低库存量时将自动创建需求单。"
+msgstr "如果产品数量低于最低额建立产品需求."
 
 #. module: mrp
 #: field:mrp.procurement,date_close:0
@@ -1248,7 +1248,7 @@ msgstr "关闭日期"
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
 msgid "General Account"
-msgstr "总帐"
+msgstr "总账"
 
 #. module: mrp
 #: field:mrp.property,composition:0
@@ -1269,7 +1269,7 @@ msgstr "销售订单编号"
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
 msgid "Change Product Qty."
-msgstr ""
+msgstr "改变产品数量"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -1280,7 +1280,7 @@ msgstr "完成"
 #. module: mrp
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "需求单数量取整后至此倍数."
+msgstr "产品需求数量将在这个倍数范围内."
 
 #. module: mrp
 #: field:stock.warehouse.orderpoint,logic:0
@@ -1291,18 +1291,18 @@ msgstr "再订货模式"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "Central document to procure products"
-msgstr "需求货品的主单据"
+msgstr "获得产品的主单据"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
 msgid "Production Orders in Progress"
-msgstr "处理中的生产单"
+msgstr "生产单进展"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
@@ -1311,7 +1311,7 @@ msgstr "处理中的生产单"
 #: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr "最小存货规则"
+msgstr "最小库存规则"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1326,23 +1326,23 @@ msgstr "每循环生产能力"
 #: field:mrp.production.product.line,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr "货品"
+msgstr "产品"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr "小时总数"
+msgstr "总小时数"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 msgid "Raw Materials Location"
-msgstr "原材料货位"
+msgstr "原材料库位"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "产品物料清单结构"
+msgstr "物料清单结构"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1357,7 +1357,7 @@ msgstr "产品计量单位"
 msgid ""
 "Reference of the document that created this procurement.\n"
 "This is automatically completed by Open ERP."
-msgstr "创建该请料单文件的参考.这由ERP系统自动完成"
+msgstr "创建这产品需求的参考单据.系统自动完成"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1367,19 +1367,19 @@ msgstr "该生产批此产品"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
 msgid "Product type is Stockable and procure method is make to stock"
-msgstr "货品类型是可库存并且获得方式是备货型生产"
+msgstr "产品类型是可库存并且获得方式是来自订单"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr "货品类型是可库存并且获得方式是备货型生产"
+msgstr "物料清单或组件有效.留空为总是有效"
 
 #. module: mrp
 #: field:mrp.procurement,product_uos:0
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr "货品销售单位"
+msgstr "产品销售单位"
 
 #. module: mrp
 #: field:mrp.procurement,product_uom:0
@@ -1421,50 +1421,50 @@ msgstr "属性分类"
 msgid ""
 "If you encode manually a procurement, you probably want to use a make to "
 "order method."
-msgstr "如果你手动填需求单，你可能要使用订货型生产的获得方式."
+msgstr "如果你手动产品需求.你可能要建立订单的方式."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Source Location"
-msgstr "来源货位"
+msgstr "来源库位"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 msgid "Stockable Order Request"
-msgstr "可库存订单需求"
+msgstr "可库存订单请求"
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr "已安排货品"
+msgstr "安排的产品"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr "生产的货品消耗"
+msgstr "生产产品消耗"
 
 #. module: mrp
 #: selection:mrp.bom,revision_type:0
 msgid "numeric indices"
-msgstr "数字索引"
+msgstr "指标数值"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
 msgid "If Procure method is Make to order and supply method is buy"
-msgstr "如果获得方式是订货型生产并供应方式是采购"
+msgstr "如果获得方式是来自订单并供应方式是采购"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
 msgid "if Product type is Stockable in procurement order"
-msgstr "如果需求单的货品类型是可库存"
+msgstr "如果在产品需求单的产品类型是可库存的"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: view:mrp.production:0
 #: rml:mrp.production.order:0
 msgid "Work Orders"
-msgstr "任务单"
+msgstr "工作单"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1497,23 +1497,23 @@ msgid ""
 "sale order to the picking without going through the production order.The "
 "normal BoM will generate one production order per BoM level."
 msgstr ""
-"关于多级物料清单，如只需生成一个综合生产单，应在下级层采用虚拟物料清单，而不是普通物料清单。如采用普通物料清单，每一级的物料清单都将会生成一份生产单。创建"
-"虚拟物料清单时要在其根级选择“虚拟／设定”。"
+"在生产单并且不是每层上计算自动计算原料明细中使用的虚拟物料清单.如果你产品清单的顶层为“虚项/套件”它被认为是一套或者一包:这产品被组件所取代可以绕过生产"
+"单而通过销售单来领料/提货.普通物料清单将按每个产品清单层生成一个生产单."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr "一个循环的时间(小时)"
+msgstr "一个周期的时间(小时)"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,done:0
 msgid "Your procurement request has been sent !"
-msgstr "你的需求单已发送!"
+msgstr "你的产品需求请求已发送!"
 
 #. module: mrp
 #: wizard_view:product.product.procurement,init:0
 msgid "Internal Procurement Request"
-msgstr "内部需求单"
+msgstr "内部的产品需求请求"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -1533,18 +1533,18 @@ msgstr "计算数据"
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Categories"
-msgstr "属性类型"
+msgstr "属性分类"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
 msgid "Compute Procurements Only"
-msgstr "仅计算需求单"
+msgstr "仅计算产品需求"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr ""
+msgstr "产品销售单位数量"
 
 #. module: mrp
 #: rml:bom.structure:0
@@ -1561,7 +1561,7 @@ msgstr "有效期到"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
 msgid "Temporary Procurement Exceptions"
-msgstr "临时需求单异常"
+msgstr "临时产品需求异常"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1577,7 +1577,7 @@ msgstr "普通物料清单"
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr "货品销售单位数量"
+msgstr "产品销售单位数量"
 
 #. module: mrp
 #: selection:mrp.procurement,state:0
@@ -1593,29 +1593,29 @@ msgstr "参数"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Confirm"
-msgstr "审核"
+msgstr "确定"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Workcenters Utilisation"
-msgstr "工作中心利用率"
+msgstr "使用工作中心"
 
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid ""
 "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
 "production."
-msgstr "材料效率.如果为0.9表示生产损失为10%"
+msgstr "生产效率.如果为0.9表示生产损失10%"
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr "货品舍入"
+msgstr "产品舍入"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr "任务单"
+msgstr "工作单"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1625,23 +1625,23 @@ msgstr "重新创建分拣单"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceonorder0
 msgid "If procurement is make to order"
-msgstr "如果需求单获得方式是订货型生产"
+msgstr "如果产品需求是来自订单"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr "订货型"
+msgstr "按订单"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 msgid "Minimum Stock Rule"
-msgstr "最低库存量规则"
+msgstr "最少库存规则"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
 msgid "New Bill of Materials"
-msgstr "新物料清单"
+msgstr "新的物料清单"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -1651,12 +1651,12 @@ msgstr "生产后时间"
 #. module: mrp
 #: wizard_field:mrp.workcenter.load,init,time_unit:0
 msgid "Type of period"
-msgstr "期间类型"
+msgstr "周期类型"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr "总数"
+msgstr "总数量"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
@@ -1667,7 +1667,7 @@ msgstr "小时数"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
 msgid "Procurement Orders"
-msgstr "需求单"
+msgstr "产品需求单"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_property
@@ -1682,7 +1682,7 @@ msgstr "上级工艺路线"
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr ""
+msgstr "准备小时数"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1692,7 +1692,7 @@ msgstr "已取消"
 #. module: mrp
 #: selection:mrp.property,composition:0
 msgid "plus"
-msgstr "加"
+msgstr "正"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -1707,7 +1707,7 @@ msgid ""
 "product. The routing is mainly used to compute workcenter costs during "
 "operations and to plan futur loads on workcenters based on production "
 "plannification."
-msgstr "生产成品所需的工作中心操作表。 路线主要是操作时用于计算工作中心的成本 ，并根据生产计划算出工作中心的未来负荷"
+msgstr "这生产成品的运作列表(工作中心列表)工艺路线主要是用于计算这生产计划的工作中心的成本和计划未来的工作中心的未来负荷"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1717,13 +1717,13 @@ msgstr "等待原料"
 #. module: mrp
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product Process"
-msgstr "可库存产品流程"
+msgstr "可库存产品进程"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_new
 #: model:ir.ui.menu,name:mrp.menu_production_orders_new
 msgid "New Production Order"
-msgstr "新生产单"
+msgstr "新的生产单"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_rfq0
@@ -1733,7 +1733,7 @@ msgstr "建立询价和发送到供应商"
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr "最后指数"
+msgstr "最近指标"
 
 #. module: mrp
 #: field:mrp.bom,revision_ids:0
@@ -1761,23 +1761,23 @@ msgstr "一般"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
 msgid "When any procuere products, it comes into the prpcurement orders"
-msgstr "当生产单需要任原料时生成需求清单"
+msgstr "当生产任何产品时它生成产品需求单"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 #: model:ir.ui.menu,name:mrp.menu_production_orders_start
 msgid "Production Orders To Start"
-msgstr "即将启动的生产单"
+msgstr "启动生产单"
 
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Reason"
-msgstr "需求原因"
+msgstr "产品需求原因"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
 msgid "An entry is being made from billing material to routing."
-msgstr "通过物料清单定义工艺路线"
+msgstr "条目来自产品路线"
 
 #. module: mrp
 #: help:mrp.workcenter,timesheet_id:0
@@ -1800,12 +1800,12 @@ msgstr "物料清单"
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procureserviceproduct0
 msgid "In procurement order, if product type is service"
-msgstr "如果是服务型产品需求单"
+msgstr "如果产品是服务在产品需求单"
 
 #. module: mrp
 #: selection:mrp.procurement,procure_method:0
 msgid "from stock"
-msgstr "计划生产"
+msgstr "按库存生产"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1819,7 +1819,7 @@ msgstr "一般信息"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr "生产单"
+msgstr "生产"
 
 #. module: mrp
 #: wizard_button:product.product.procurement,done,end:0
@@ -1829,12 +1829,12 @@ msgstr "关闭"
 #. module: mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr "销售订单编号"
+msgstr "销售名称"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Create minimum stock rules"
-msgstr "创建最低库存规则"
+msgstr "建立最少库存规则"
 
 #. module: mrp
 #: wizard_field:product.product.procurement,init,warehouse_id:0
@@ -1852,12 +1852,12 @@ msgstr "生产单编码"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service Product"
-msgstr "服务型产品"
+msgstr "服务"
 
 #. module: mrp
 #: field:mrp.procurement,close_move:0
 msgid "Close Move at end"
-msgstr "最后关闭调拨"
+msgstr "关闭变动结束"
 
 #. module: mrp
 #: wizard_view:change_production_qty,confirm:0
@@ -1891,13 +1891,13 @@ msgstr "生产管理"
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
 msgid "Unscheduled procurements"
-msgstr "未安排的需求单"
+msgstr "未安排的产品需求"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
 #: model:ir.ui.menu,name:mrp.menu_bom_tree
 msgid "Bill of Material Structure"
-msgstr "物料清单组成"
+msgstr "物料清单结构"
 
 #. module: mrp
 #: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
@@ -1912,7 +1912,7 @@ msgstr "清理小时数"
 #. module: mrp
 #: view:mrp.procurement:0
 msgid "Procurement Details"
-msgstr "需求单细节"
+msgstr "产品需求详情"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1922,12 +1922,12 @@ msgstr "你可以看到生产产品使用的物料清单"
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End"
-msgstr "计划完成日期"
+msgstr "安排结束"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr "备货型"
+msgstr "按库存"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
@@ -1935,10 +1935,68 @@ msgstr "备货型"
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Materials Components"
 msgstr "物料清单组成"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module to manage the manufacturing process in Open "
+#~ "ERP.\n"
+#~ "\n"
+#~ "    Features:\n"
+#~ "    * Make to Stock / Make to Order (by line)\n"
+#~ "    * Multi-level BoMs, no limit\n"
+#~ "    * Multi-level routing, no limit\n"
+#~ "    * Routing and workcenter integrated with analytic accounting\n"
+#~ "    * Scheduler computation periodically / Just In Time module\n"
+#~ "    * Multi-pos, multi-warehouse\n"
+#~ "    * Different reordering policies\n"
+#~ "    * Cost method by product: standard price, average price\n"
+#~ "    * Easy analysis of troubles or needs\n"
+#~ "    * Very flexible\n"
+#~ "    * Allows to browse Bill of Materials in complete structure\n"
+#~ "        that include child and phantom BoMs\n"
+#~ "    It supports complete integration and planification of stockable goods,\n"
+#~ "    consumable of services. Services are completely integrated with the "
+#~ "rest\n"
+#~ "    of the software. For instance, you can set up a sub-contracting service\n"
+#~ "    in a BoM to automatically purchase on order the assembly of your "
+#~ "production.\n"
+#~ "\n"
+#~ "    Reports provided by this module:\n"
+#~ "    * Bill of Material structure and components\n"
+#~ "    * Load forecast on workcenters\n"
+#~ "    * Print a production order\n"
+#~ "    * Stock forecasts\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这基础模块用来管理系统的生产过程的管理:\n"
+#~ "\n"
+#~ " 特征:\n"
+#~ "    *按库存生产/按单生产(明细)\n"
+#~ "    *多层物料清单(没限制)\n"
+#~ "    *多层工艺路线(没限制)\n"
+#~ "    *工艺路线和生产中心整合与辅助核算项目\n"
+#~ "    *定期调度计算/准时生产模块\n"
+#~ "    *多POS和多仓库\n"
+#~ "    *不同的再下单策略\n"
+#~ "    *产品的成本计算方法:平均价、标准价\n"
+#~ "    *困难和需要的简单分析\n"
+#~ "    *非常灵活\n"
+#~ "    *允许浏览产品清单的完整的结构包括子物料清单和虚项\n"
+#~ "    \n"
+#~ "    它支持完整的整和的和规划的可库存货物,可订购服务.服务是完全集成在软件上.比如,你能设定一个子合同服务,\n"
+#~ "    在物料清单上自动采购你生产的订单组合\n"
+#~ "\t\n"
+#~ "    这模块提供的报表:\n"
+#~ "    *物料清单的结构和组成\n"
+#~ "    *工作中心的工作负荷\n"
+#~ "    *打印生产单\n"
+#~ "    *库存预测\n"
+#~ "    "
diff --git a/addons/mrp_jit/i18n/zh_CN.po b/addons/mrp_jit/i18n/zh_CN.po
index 6fdbedff996..525e5774764 100644
--- a/addons/mrp_jit/i18n/zh_CN.po
+++ b/addons/mrp_jit/i18n/zh_CN.po
@@ -4,19 +4,48 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-03 13:45+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:34+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
 msgstr "精益制造资源计划管理（MRP JIT）"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This module allows Just In Time computation of all procurement.\n"
+#~ "\n"
+#~ "    If you install this module, you will not have to run the schedulers "
+#~ "anymore.\n"
+#~ "    Each document is computed in real time. Note that this module can slow "
+#~ "down your\n"
+#~ "    system a little bit.\n"
+#~ "\n"
+#~ "    It may also increase your stock size because products are reserved as "
+#~ "soon\n"
+#~ "    as possible. In that case, you can not use priorities any more on the "
+#~ "different\n"
+#~ "    picking.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这模块允许JIT(准时生产)计算所有的产品需求.\n"
+#~ "\n"
+#~ "如果你安装这模块,你将不用再运行调度.\n"
+#~ "    每个单据是实际计算的.\n"
+#~ "注意:这将稍稍降低你系统的速度.\n"
+#~ "\n"
+#~ "    它可能也加大你库存的大小因为产品是立即储存的.\n"
+#~ "如果是那样的话你不能使用优先选项\n"
+#~ "不同的包装\n"
+#~ "    "
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index f72225eb9f1..123fe6e4ded 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -4,167 +4,167 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-20 08:34+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr ""
+msgstr "开始运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Pause"
-msgstr ""
+msgstr "暂停"
 
 #. module: mrp_operations
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Operation is started"
-msgstr ""
+msgstr "运作已开始"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr ""
+msgstr "信息"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Start Cancel Operation"
-msgstr ""
+msgstr "开始取消运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "In Production"
-msgstr ""
+msgstr "在生产"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operations Code"
-msgstr ""
+msgstr "运作代码"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operation Process"
-msgstr ""
+msgstr "MRP运作流程"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.production.workcenter.line,state:0
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Start Done Operation"
-msgstr ""
+msgstr "开始完成运作"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Start"
-msgstr ""
+msgstr "开始"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "生产"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Calendar View"
-msgstr ""
+msgstr "日程表视图"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp_operations
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action
 msgid "Work Order Events Using Bar Codes"
-msgstr ""
+msgstr "工单事件使用的条码"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Set Draft"
-msgstr ""
+msgstr "设为草稿"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
 #: view:mrp.production.workcenter.line:0
 msgid "Work Orders"
-msgstr ""
+msgstr "工单"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
 msgid "Start - Stop Codes"
-msgstr ""
+msgstr "开始-结束代码"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "UOM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr ""
+msgstr "运作代码"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "预定日期"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "From production order, create the workorder"
-msgstr ""
+msgstr "从生产单创建工单"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Workcenter"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
 msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
-msgstr ""
+msgstr "检查这能独立所有生产单的调拨"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action
 msgid "All Work Orders"
-msgstr ""
+msgstr "所有工单"
 
 #. module: mrp_operations
 #: rml:mrp.code.barcode:0
@@ -174,51 +174,51 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "产品到产品"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Workcenters Barcode"
-msgstr ""
+msgstr "工作中心条码"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation is done"
-msgstr ""
+msgstr "运作已经完成"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "计划日期"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "准备生产"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp.production.workcenter.line,state:0
 msgid "Finished"
-msgstr ""
+msgstr "已完成"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "自由排序生产"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action_planning
 msgid "Work Orders Planning"
-msgstr ""
+msgstr "工单计划"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -228,165 +228,165 @@ msgstr "生产单"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Production order for any products"
-msgstr ""
+msgstr "生产单的产品"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "子调拨"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr ""
+msgstr "运作名称"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "运作"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finnished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "结束日期"
 
 #. module: mrp_operations
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "真"
 
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Workcenter Production start end workflow"
-msgstr ""
+msgstr "工作中心的生产流程流程"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is delay between operation start and stop in this workcenter"
-msgstr ""
+msgstr "工作中心从运作开始到结束之间的延迟"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
 msgid "From work order, define the cycles and hour for creating product"
-msgstr ""
+msgstr "从工单定义周期和每小时创造产品"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr ""
+msgstr "工作时间"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr ""
+msgstr "未来工单"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Prod.State"
-msgstr ""
+msgstr "状态"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
-msgstr ""
+msgstr "订单日期"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Production Work Center"
-msgstr ""
+msgstr "生产工作中心"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Production start Operation"
-msgstr ""
+msgstr "生产开始运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Packing Exception"
-msgstr ""
+msgstr "包装异常"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "工作中心"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp.production.workcenter.line,date_start_date:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "运作代码"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr ""
+msgstr "运作"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
 #: field:mrp_operations.operation.code,code:0
 msgid "Code"
-msgstr ""
+msgstr "代码"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr ""
+msgstr "确认工作单"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action
 msgid "Work Orders to Do"
-msgstr ""
+msgstr "工单列表"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Cancel Operation"
-msgstr ""
+msgstr "取消操作"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Work start Operation"
-msgstr ""
+msgstr "工作开始操作"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr ""
+msgstr "开始/停止条码"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "重新开始"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Done Operation"
-msgstr ""
+msgstr "完成操作"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: mrp_operations
 #: rml:mrp.code.barcode:0
@@ -396,43 +396,98 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr ""
+msgstr "生产运作"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "等待"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: selection:mrp.production.workcenter.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation is cancelled"
-msgstr ""
+msgstr "运作的日程表"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: selection:mrp.production.workcenter.line,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "已取消"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Start working"
-msgstr ""
+msgstr "开始工作"
+
+#~ msgid ""
+#~ "\n"
+#~ "     This module adds state, date_start,date_stop in production order "
+#~ "operation lines\n"
+#~ "     (in the \"Workcenters\" tab)\n"
+#~ "     State: draft, confirm, done, cancel\n"
+#~ "     When finishing/confirming,cancelling production orders set all state "
+#~ "lines to the according state\n"
+#~ "     Create menus:\n"
+#~ "         Production Management > All Operations\n"
+#~ "         Production Management > All Operations > Operations To Do "
+#~ "(state=\"confirm\")\n"
+#~ "     Which is a view on \"Workcenters\" lines in production order,\n"
+#~ "     editable tree\n"
+#~ "\n"
+#~ "    Add buttons in the form view of production order under workcenter tab:\n"
+#~ "    * start (set state to confirm), set date_start\n"
+#~ "    * done (set state to done), set date_stop\n"
+#~ "    * set to draft (set state to draft)\n"
+#~ "    * cancel set state to cancel\n"
+#~ "\n"
+#~ "    When the production order becomes \"ready to produce\", operations must\n"
+#~ "    become 'confirmed'. When the production order is done, all operations\n"
+#~ "    must become done.\n"
+#~ "\n"
+#~ "    The field delay is the delay(stop date - start date).\n"
+#~ "    So that we can compare the theoretic delay and real delay.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "     这模块在生产单操作明细的中增加了状态,开始日期,结束日期\n"
+#~ "在工作中心标签中    状态:草稿,确认,完成,取消\n"
+#~ "    当完成/确认,取消了生产单设定的所有状态明细根据状态\n"
+#~ "创建菜单:\n"
+#~ "\t\t生产管理>所有操作\n"
+#~ "\t\t生产管理>所有操作>操作要做 (状态=确认)\n"
+#~ "     在生产单视图\"工作中心\"明细\n"
+#~ "     可编辑树\n"
+#~ "\n"
+#~ "\t在生产单下的视图增加工作中心标签增加一个按钮:\n"
+#~ "\t*开始(设为确认状态) 设定开始日期\n"
+#~ "\t*完成(设为完成)设定结束日期\n"
+#~ "   *设为草稿\n"
+#~ "\t*取消 设为取消状态\n"
+#~ "\t\n"
+#~ "\t当生产单变为\"准备生产\",操作必须变为\n"
+#~ "   确认.\n"
+#~ "\t当生产单完成所有操作必须变为完成.\n"
+#~ "\n"
+#~ "\t延迟字段是延迟(结束日期 - 开始日期).\n"
+#~ "   这样我们能比较理论延迟和实际延迟.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index 96430d12eab..d9c7485f008 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -4,53 +4,53 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-07 11:08+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 08:36+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "费用明细"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Ref"
-msgstr "维修单引用"
+msgstr "修理单参考"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
 msgid "Inventory Move"
-msgstr "库存移动"
+msgstr "库存调拨"
 
 #. module: mrp_repair
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义使用了无效的模块名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Untaxed amount"
-msgstr "未完税金额"
+msgstr "不含税金额"
 
 #. module: mrp_repair
 #: field:mrp.repair,state:0
 msgid "Repair State"
-msgstr "维修状态"
+msgstr "修理状态"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Printing Date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -76,7 +76,7 @@ msgstr "送货地址"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr "制作发票"
+msgstr "创建发票"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
@@ -87,24 +87,24 @@ msgstr "小计"
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Invoice address :"
-msgstr "发票地址："
+msgstr "发票地址:"
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "保修期限"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr "税收"
+msgstr "税"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Net Total :"
-msgstr "总净重："
+msgstr "净合计:"
 
 #. module: mrp_repair
 #: rml:repair.order:0
@@ -114,22 +114,22 @@ msgstr "增值税"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr ""
+msgstr "操作"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
 msgid "Move"
-msgstr "过帐"
+msgstr "调拨"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 msgid "Repair Orders"
-msgstr "维修单列表"
+msgstr "修理单"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
 msgid "Quotation / Order"
-msgstr "报价/订单"
+msgstr "报价单/订单"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -145,64 +145,64 @@ msgstr "业务伙伴"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_quotation_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_quotation
 msgid "Repairs in quotation"
-msgstr "报价状态的维修单列表"
+msgstr "修理报价单"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Confirmed"
-msgstr "已确认"
+msgstr "确认"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Recreate Invoice"
-msgstr "重新创建发票"
+msgstr "再创建发票"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
-msgstr "维修单"
+msgstr "修理单"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Repair Order N° :"
-msgstr "维修单编号："
+msgstr "修理单编号:"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: rml:repair.order:0
 msgid "Lot Number"
-msgstr "批次号"
+msgstr "批号"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Under Repair"
-msgstr ""
+msgstr "不修理"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "费用明细"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees line"
-msgstr ""
+msgstr "修理费用明细"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "收费明细"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
-msgstr "待开票"
+msgstr "要开发票"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Shipping address :"
-msgstr "货运地址："
+msgstr "运输地址:"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -212,28 +212,28 @@ msgstr "开始修理"
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr "数量（计量单位）"
+msgstr "数量(计量单位)"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr ""
+msgstr "开票"
 
 #. module: mrp_repair
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_order
 msgid "Repairs"
-msgstr "维修单列表"
+msgstr "修理"
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Total :"
-msgstr "总计："
+msgstr "总价:"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -243,24 +243,24 @@ msgstr "价格表"
 #. module: mrp_repair
 #: help:mrp.repair,state:0
 msgid "Gives the state of the Repair Order"
-msgstr ""
+msgstr "修理单的状态"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,quotation_notes:0
 msgid "Quotation Notes"
-msgstr ""
+msgstr "报价单备注"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_progress_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_progress
 msgid "Repairs in progress"
-msgstr ""
+msgstr "修理进度"
 
 #. module: mrp_repair
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -269,17 +269,17 @@ msgid ""
 "selected product. If the current date is below the garantee limit, each "
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
-msgstr ""
+msgstr "保证限制是:最后调拨日期 + 选择产品的保证定义.如果当前日期少于保证限制每个操作和费用将被设为‘不要开票’.注意你可以在以后手动修改."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr "维修单明细"
+msgstr "修理明细"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "N° :"
-msgstr ""
+msgstr "单号:"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
@@ -289,33 +289,33 @@ msgstr "开票方式"
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr "已维修"
+msgstr "已修理"
 
 #. module: mrp_repair
 #: wizard_field:mrp.repair.make_invoice,init,group:0
 msgid "Group by partner invoice address"
-msgstr "按业务伙伴发票地址分组"
+msgstr "业务伙伴发票地址组"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr "发票明细"
+msgstr "发票行"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Total amount"
-msgstr "总金额"
+msgstr "金额合计"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr "维修之前"
+msgstr "修理前"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
@@ -337,7 +337,7 @@ msgstr "已开票"
 #. module: mrp_repair
 #: wizard_button:mrp.repair.cancel,display,end:0
 msgid "No"
-msgstr "否"
+msgstr "编号"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.make_invoice,init:0
@@ -349,7 +349,7 @@ msgstr "创建发票"
 #: selection:mrp.repair.line,type:0
 #: rml:repair.order:0
 msgid "Add"
-msgstr "添加"
+msgstr "增加"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -360,18 +360,18 @@ msgstr "草稿"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_form
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_form
 msgid "New Repair"
-msgstr "新建维修单"
+msgstr "新的修理"
 
 #. module: mrp_repair
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "未完税金额"
+msgstr "不含税金额"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,state:0
@@ -381,25 +381,25 @@ msgstr "状态"
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "保证限制"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: rml:repair.order:0
 msgid "Product to Repair"
-msgstr "要维修的产品"
+msgstr "产品修理"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "定义选择业务伙伴的价格表"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.cancel,display:0
 msgid ""
 "This operation  will  cancel the  Repair process, but  will not cancel it's "
 "Invoice. Do you want to continue?"
-msgstr ""
+msgstr "这操作将取消修理处理但不会取消发票继续吗?"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -414,33 +414,33 @@ msgstr "计算"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr "确认维修单"
+msgstr "确认修理"
 
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Repair Quotation"
-msgstr "维修报价单"
+msgstr "修理报价单"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "End Repair"
-msgstr "结束维修"
+msgstr "结束修理"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repairs Order"
-msgstr "维修单"
+msgstr "修理单"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_ready_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_ready
 msgid "Repairs Ready to Start"
-msgstr "准备开始的维修单列表"
+msgstr "修理准备开始"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -457,7 +457,7 @@ msgstr "完成"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_2binvoiced_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_2binvoiced
 msgid "Repairs to be invoiced"
-msgstr "待开票的维修单列表"
+msgstr "修理要发票"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -467,7 +467,7 @@ msgstr "发票"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr ""
+msgstr "费用"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -483,22 +483,22 @@ msgstr "目标库位"
 #. module: mrp_repair
 #: rml:repair.order:0
 msgid "Operation Line(s)"
-msgstr ""
+msgstr "操作明细"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 msgid "Repair Operations Lines"
-msgstr ""
+msgstr "修理运算明细"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr "运货库位"
+msgstr "送货地点"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module"
-msgstr ""
+msgstr "产品修理模块"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -506,7 +506,7 @@ msgid ""
 "This field allow you to change the workflow of the repair order. If value "
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
-msgstr ""
+msgstr "这字段允许你修改修理单的工作流.如果你选的值不是‘没发票’他也允许你选择价格表和发票地址."
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
@@ -518,30 +518,30 @@ msgstr "单价"
 #. module: mrp_repair
 #: wizard_view:mrp.repair.make_invoice,init:0
 msgid "Do you really want to create the invoices ?"
-msgstr "您确定要创建发票吗?"
+msgstr "你真的要创建发票吗?"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
 #: field:mrp.repair.line,name:0
 #: rml:repair.order:0
 msgid "Description"
-msgstr "描述"
+msgstr "说明"
 
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr ""
+msgstr "操作明细"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr "货品"
+msgstr "产品"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr "已更正发票"
+msgstr "发票更正"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -550,7 +550,7 @@ msgid ""
 "repaired. If cheked, it will create a packing with selected product. Note "
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
-msgstr ""
+msgstr "如果你想管理产品修理的送货勾选此项.如果勾选它将为选择的产品创建一包装.请注意如果你有扩展的视图你可以选择库位的信息标签."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
@@ -565,13 +565,13 @@ msgstr "价格"
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr "运送"
+msgstr "送货"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr "内部备注"
+msgstr "内部单据"
 
 #. module: mrp_repair
 #: rml:repair.order:0
@@ -581,12 +581,12 @@ msgstr "税:"
 #. module: mrp_repair
 #: model:ir.actions.wizard,name:mrp_repair.wizard_mrp_repair_make_invoice
 msgid "Make invoices"
-msgstr "创建发票"
+msgstr "建立发票"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Ref"
-msgstr "维修单引用"
+msgstr "修理参考"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -597,12 +597,12 @@ msgstr "计量单位"
 #: selection:mrp.repair.line,type:0
 #: rml:repair.order:0
 msgid "Remove"
-msgstr "移除"
+msgstr "删除"
 
 #. module: mrp_repair
 #: wizard_view:mrp.repair.cancel,display:0
 msgid "Cancel Repair...??"
-msgstr ""
+msgstr "取消修理?"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
@@ -613,56 +613,75 @@ msgstr "产品计量单位"
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr "待开票地址"
+msgstr "发票地址"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "After Repair"
-msgstr ""
+msgstr "修理后"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr ""
+msgstr "发票"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
 msgid "Source Location"
-msgstr "来源货位"
+msgstr "源库位"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quality"
-msgstr "质量"
+msgstr "高级"
 
 #. module: mrp_repair
 #: model:ir.actions.wizard,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr ""
+msgstr "取消修理"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "No Invoice"
-msgstr ""
+msgstr "没发票"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "States"
-msgstr "省/州"
+msgstr "状态"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
-msgstr ""
+msgstr "这字段允许你选择将开票和送货的业务伙伴"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Ready to Repair"
-msgstr ""
+msgstr "准备修理"
+
+#~ msgid ""
+#~ "\n"
+#~ "           The aim is to have a complete module to manage all products "
+#~ "repairs. The following topics should be covered by this module:\n"
+#~ "           * Add/remove products in the reparation\n"
+#~ "           * Impact for stocks\n"
+#~ "           * Invoicing (products and/or services)\n"
+#~ "           * Warranty concept\n"
+#~ "           * Repair quotation report\n"
+#~ "           * Notes for the technician and for the final customer           \n"
+#~ msgstr ""
+#~ "\n"
+#~ "           目的是有一个完整模块来管理所有的产品修理.以下的主题将覆盖这模块:\t*增加和删除产品的修理\n"
+#~ "\t*作用于仓库\n"
+#~ "\t*发票(产品或者服务)\n"
+#~ "\t*保修\n"
+#~ "\t*修理报价单\n"
+#~ "\t*记录技术员和最终客户           \n"
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index 49d64bcb602..64d1feeb670 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 02:59+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 08:38+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
@@ -101,8 +101,8 @@ msgstr "物料需求计划子货品"
 #~ "\n"
 #~ "这模块允许你在一个生产单有几个要生产的产品\n"
 #~ "    你能在物料清单中确认子产品.\n"
-#~ "    没有这模块：\n"
+#~ "    没有这模块:\n"
 #~ "\tA + B + C -> D\n"
-#~ "     有这模块：\n"
+#~ "     有这模块:\n"
 #~ "\tA + B + C -> D + E\n"
 #~ "    "
diff --git a/addons/olap/i18n/de.po b/addons/olap/i18n/de.po
new file mode 100644
index 00000000000..d72a0c87680
--- /dev/null
+++ b/addons/olap/i18n/de.po
@@ -0,0 +1,1399 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:24+0000\n"
+"PO-Revision-Date: 2010-03-20 20:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/olap_extract/i18n/de.po b/addons/olap_extract/i18n/de.po
new file mode 100644
index 00000000000..8669fdf4fb0
--- /dev/null
+++ b/addons/olap_extract/i18n/de.po
@@ -0,0 +1,56 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-20 20:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 13ef9e5738e..f26d0b74c00 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -4,29 +4,29 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-18 11:01+0000\n"
-"Last-Translator: 冯超 <rainofchaos@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:09+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total paid"
-msgstr "总付"
+msgstr "付款合计"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Qty of product"
-msgstr "商品数量"
+msgstr "产品数量"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -36,68 +36,68 @@ msgstr "设为草稿"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr "销售点交易情况"
+msgstr "POS交易"
 
 #. module: point_of_sale
 #: wizard_view:pos.discount,init:0
 #: rml:pos.receipt:0
 msgid "Discount :"
-msgstr "折扣："
+msgstr "折扣:"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_nb:0
 msgid "Piece number"
-msgstr "件号"
+msgstr "领料/提货号"
 
 #. module: point_of_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
 msgid "Order Description"
-msgstr "订单说明"
+msgstr "说明"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_scan_product
 msgid "Scan Product"
-msgstr "扫描商品"
+msgstr "扫描产品"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Document"
-msgstr "单据"
+msgstr "文档"
 
 #. module: point_of_sale
 #: wizard_view:pos.add_product,init:0
 msgid "Add product :"
-msgstr "添加商品："
+msgstr "增加业务伙伴:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Net Total"
-msgstr "净总计"
+msgstr "净合计"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2
 msgid "Orders of the day"
-msgstr "该日订单"
+msgstr "单据日期"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr "销售（概要）"
+msgstr "销售(参考)"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
 msgid "This is the logged in user (not necessarily the salesman)."
-msgstr ""
+msgstr "这是登录用户不一定是销售员"
 
 #. module: point_of_sale
 #: wizard_view:pos.sale.get,init:0
 msgid "Select an Open Sale Order"
-msgstr "选择一个打开的销售订单"
+msgstr "选择待处理的销售单"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
@@ -122,12 +122,12 @@ msgstr "销售详情"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Base"
-msgstr "基本信息"
+msgstr "基础"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
 msgid "Scan product"
-msgstr "扫描商品"
+msgstr "扫描产品"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
@@ -137,22 +137,22 @@ msgstr "小计"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Partner Ref."
-msgstr "业务伙伴引用"
+msgstr "业务伙伴参考"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+msgstr "电话:"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line Description"
-msgstr "销售单细目说明"
+msgstr "说明"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
 msgid "Shop"
-msgstr "销售点"
+msgstr "商店"
 
 #. module: point_of_sale
 #: wizard_button:pos.refund_order,init,refund_n_quit:0
@@ -168,7 +168,7 @@ msgstr "备注"
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
 msgid "Pos order"
-msgstr ""
+msgstr "POS单"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -192,7 +192,7 @@ msgstr "销售明细"
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "No. Of Articles"
-msgstr ""
+msgstr "条款号"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
@@ -204,13 +204,13 @@ msgstr "代码"
 #: field:pos.order,date_validity:0
 #: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
-msgstr "生效时间"
+msgstr "有效期"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
-msgstr ""
+msgstr "领料/提货"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -221,17 +221,17 @@ msgstr "增值税"
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_refund
 msgid "Refund Orders"
-msgstr "退款单"
+msgstr "退货单"
 
 #. module: point_of_sale
 #: field:pos.order,last_out_picking:0
 msgid "Last Output Picking"
-msgstr ""
+msgstr "最近输出的领料/提货"
 
 #. module: point_of_sale
 #: wizard_view:pos.config.journal,init:0
 msgid "Select default journals"
-msgstr "选择默认帐目"
+msgstr "默认分类帐"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -242,12 +242,12 @@ msgstr "数量"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Logged in User"
-msgstr ""
+msgstr "登录用户"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 msgid "VAT(%)"
-msgstr "增值税（%）"
+msgstr "增值税(%)"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -257,7 +257,7 @@ msgstr "税"
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "Total Transaction"
-msgstr "总交易数"
+msgstr "交易数合计"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -268,7 +268,7 @@ msgstr "折扣"
 #: rml:pos.invoice:0
 #: rml:pos.receipt:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
@@ -283,39 +283,39 @@ msgstr "业务伙伴"
 #. module: point_of_sale
 #: field:pos.order,payments:0
 msgid "Order Payments"
-msgstr "订单支付方式"
+msgstr "单据付款"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Date :"
-msgstr "日期："
+msgstr "日期:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Ma_ke Payment"
-msgstr "支付(_K)"
+msgstr "付款"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_confirm
 #: wizard_button:pos.sale.get,init,set:0
 msgid "Confirm"
-msgstr "确认"
+msgstr "确定"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr "销售点订单"
+msgstr "POS单"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Disc. (%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Sales total"
-msgstr "销售总计"
+msgstr "销售合计"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -330,17 +330,17 @@ msgstr "状态"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Sum of subtotals"
-msgstr "小计总和"
+msgstr "合计小计"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_date:0
 msgid "Payment date"
-msgstr "支付时间"
+msgstr "付款日期"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_name:0
 msgid "Payment name"
-msgstr "支付方式名称"
+msgstr "付款名称"
 
 #. module: point_of_sale
 #: field:pos.order,lines:0
@@ -350,12 +350,12 @@ msgstr "订单明细"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Disc.(%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
 msgid "Point Of Sale"
-msgstr "销售点"
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
@@ -365,42 +365,42 @@ msgstr "创建日期"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS "
-msgstr "销售点 "
+msgstr "POS "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Point of Sale journal configuration."
-msgstr "销售点帐目设置"
+msgstr "POS分类帐设置"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal:0
 msgid "Default journal"
-msgstr "默认帐目"
+msgstr "默认分类帐"
 
 #. module: point_of_sale
 #: field:pos.order,account_receivable:0
 msgid "Default Receivable"
-msgstr ""
+msgstr "默认应收款"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_sale_get
 msgid "Get From Order"
-msgstr "从订单获取"
+msgstr "从单据获得"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config
@@ -417,22 +417,22 @@ msgstr "单价"
 #. module: point_of_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day
 msgid "POS Lines of the day"
-msgstr "该日销售明细"
+msgstr "今天POS明细"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
 msgid "Number of Print"
-msgstr ""
+msgstr "打印数"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
 msgid "Default journals"
-msgstr "默认帐目"
+msgstr "默认分类帐"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -442,37 +442,37 @@ msgstr "发票草稿"
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
 msgid "Discount (%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "财务状况备注:"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_add_product
 msgid "Add products"
-msgstr "添加商品"
+msgstr "增加产品"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr "合计数量"
+msgstr "总数量"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
 msgid "POS Lines"
-msgstr "销售单明细"
+msgstr "POS明细"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Sales Order POS"
-msgstr ""
+msgstr "POS销售单"
 
 #. module: point_of_sale
 #: wizard_button:pos.config.journal,init,set_default_journal:0
 msgid "Define default journals"
-msgstr ""
+msgstr "定义默认分类帐"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
@@ -482,7 +482,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr "销售点"
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:pos.order,salesman_id:0
@@ -498,23 +498,23 @@ msgstr "已开票"
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_rebate:0
 msgid "Default rebate journal"
-msgstr ""
+msgstr "默认回扣分类帐"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.wizard_default_journal
 msgid "Wizard default journals"
-msgstr ""
+msgstr "向导默认分类帐"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total of the day"
-msgstr "该日销售总计"
+msgstr "今天合计"
 
 #. module: point_of_sale
 #: wizard_button:pos.scan_product,init,add:0
 msgid "Add"
-msgstr "添加"
+msgstr "增加"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
@@ -524,33 +524,33 @@ msgstr "草稿"
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Paid"
-msgstr "已付"
+msgstr "付款"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "VAT :"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr "销售点订单明细"
+msgstr "POS单明细"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "E-mail :"
-msgstr "电子邮件："
+msgstr "电子邮件:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total invoiced"
-msgstr "总开票额"
+msgstr "已开票合计"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_today
 msgid "Sales of the day"
-msgstr "该日销售情况"
+msgstr "今天销售"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -561,7 +561,7 @@ msgstr "未知"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr "销售点订单明细"
+msgstr "POS单明细"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_discount
@@ -576,31 +576,31 @@ msgstr "用户"
 #. module: point_of_sale
 #: field:pos.payment,payment_date:0
 msgid "Payment Date"
-msgstr "支付日期"
+msgstr "付款日期"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_name:0
 msgid "Payment Name"
-msgstr ""
+msgstr "付款名称"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
-msgstr "时间"
+msgstr "日期"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by user"
-msgstr ""
+msgstr "销售用户"
 
 #. module: point_of_sale
 #: wizard_button:pos.add_product,init,add:0
 #: view:pos.order:0
 msgid "_Add product"
-msgstr "添加商品（_A）"
+msgstr "增加产品"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
@@ -611,33 +611,33 @@ msgstr "："
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Period:"
-msgstr "时期："
+msgstr "周期:"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree
 msgid "All the sales"
-msgstr ""
+msgstr "所有销售"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Compute"
-msgstr "计算"
+msgstr "公司"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Total:"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Summary"
-msgstr "概要"
+msgstr "摘要"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Create _Invoice"
-msgstr "创建发票（_I）"
+msgstr "创建发票"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,quantity:0
@@ -650,18 +650,18 @@ msgstr "数量"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Refund"
-msgstr "退款"
+msgstr "退货"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of payment"
-msgstr "付款模式"
+msgstr "付款方式"
 
 #. module: point_of_sale
 #: wizard_button:pos.payment,ask_pay,add_pay:0
 msgid "Ma_ke payment"
-msgstr "付款（_K）"
+msgstr "付款"
 
 #. module: point_of_sale
 #: wizard_button:pos.discount,init,apply_discount:0
@@ -681,22 +681,22 @@ msgstr "折扣百分比"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
 msgid "Receipt"
-msgstr "收据"
+msgstr "收入"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
 msgid "Refund order :"
-msgstr "退款单："
+msgstr "退货单:"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "交易数"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Net Total:"
-msgstr "总净重："
+msgstr "净合计:"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -706,7 +706,7 @@ msgstr "其它"
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Done"
-msgstr "已完成"
+msgstr "完成"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
@@ -738,61 +738,61 @@ msgstr "关闭"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order lines"
-msgstr "订单明细"
+msgstr "单据明细"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
 #: field:pos.payment,order_id:0
 msgid "Order Ref"
-msgstr "相关订单"
+msgstr "单据参考"
 
 #. module: point_of_sale
 #: wizard_view:pos.payment,ask_pay:0
 msgid "Add payment :"
-msgstr "添加支付方式："
+msgstr "增加付款:"
 
 #. module: point_of_sale
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment
 msgid "Pos Payment"
-msgstr ""
+msgstr "POS付款"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total discount"
-msgstr "总折扣"
+msgstr "折扣合计"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr "新建发票"
+msgstr "创建发票"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
 msgid "Refund "
-msgstr ""
+msgstr "退货 "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "POS明细"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "税:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr "总计"
+msgstr "金额合计"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,product:0
@@ -804,7 +804,7 @@ msgstr "产品"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Invoicing"
-msgstr ""
+msgstr "发票"
 
 #. module: point_of_sale
 #: field:pos.config.journal,journal_id:0
@@ -813,22 +813,22 @@ msgstr ""
 #: field:pos.payment,journal_id:0
 #: field:report.transaction.pos,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "分类帐"
 
 #. module: point_of_sale
 #: wizard_field:pos.scan_product,init,gencod:0
 msgid "Barcode"
-msgstr "条形码"
+msgstr "条码"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Canceled Invoice"
-msgstr "已取消发票"
+msgstr "取消发票"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr "销售点"
+msgstr "POS"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
@@ -838,17 +838,17 @@ msgstr "销售单明细"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Tel. :"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_nb:0
 msgid "Piece Number"
-msgstr ""
+msgstr "领料/提货号"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_gift:0
 msgid "Default gift journal"
-msgstr ""
+msgstr "默认赠品分类帐"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_payment
@@ -859,27 +859,27 @@ msgstr "付款"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3
 msgid "All orders"
-msgstr "全部订单"
+msgstr "所有单据"
 
 #. module: point_of_sale
 #: wizard_field:pos.sale.get,init,picking_id:0
 msgid "Sale Order"
-msgstr "销售订单"
+msgstr "销售单"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
 msgid "Sales of the month"
-msgstr "当月销售"
+msgstr "月销售"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "D_iscount"
-msgstr "折扣（_D）"
+msgstr "折扣"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr "订购日期"
+msgstr "订单日期"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -889,7 +889,7 @@ msgstr "付款"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "供应商退货"
 
 #. module: point_of_sale
 #: field:pos.config.journal,name:0
@@ -898,12 +898,12 @@ msgstr ""
 #: field:pos.payment,name:0
 #: rml:pos.receipt:0
 msgid "Description"
-msgstr "描述"
+msgstr "说明"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
 msgid "Account Entry"
-msgstr ""
+msgstr "凭证"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_id:0
@@ -917,35 +917,35 @@ msgstr "付款条件"
 #: wizard_field:pos.payment,ask_pay,amount:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr "数量"
+msgstr "金额"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Actions"
-msgstr "动作"
+msgstr "生效"
 
 #. module: point_of_sale
 #: help:pos.order,salesman_id:0
 msgid "This is the salesman actually making the order."
-msgstr ""
+msgstr "这是销售员实际产生的订单"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "税收模式"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Print Date:"
-msgstr "打印时间："
+msgstr "打印日期:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Company:"
-msgstr "公司："
+msgstr "公司:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
@@ -955,13 +955,13 @@ msgstr "打印日期"
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "OPERATION N° :"
-msgstr ""
+msgstr "操作员:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 #: field:pos.order,amount_total:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -970,3 +970,27 @@ msgstr "总计"
 #: rml:pos.receipt:0
 msgid "Price"
 msgstr "价格"
+
+#~ msgid ""
+#~ "\n"
+#~ "Main features :\n"
+#~ " - Fast encoding of the sale.\n"
+#~ " - Allow to choose one payment mode (the quick way) or to split the payment "
+#~ "between several payment mode.\n"
+#~ " - Computation of the amount of money to return.\n"
+#~ " - Create and confirm picking list automatically.\n"
+#~ " - Allow the user to create invoice automatically.\n"
+#~ " - Allow to refund former sales.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "主要特征:\n"
+#~ "    - 销售快速编码\n"
+#~ "    - 允许选择一个付款方式(快速方式)或在几个付款方式中分开付款\n"
+#~ "    - 计算金额\n"
+#~ "    - 自动创建和确认领料/提货单\n"
+#~ "    - 允许用户自动创建发票\n"
+#~ "    - 允许销售退款\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index f979d155fdb..e0d8ecdaa35 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -4,41 +4,41 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 03:11+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr "流程节点"
+msgstr "处理节点"
 
 #. module: process
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: process
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Roles from Workflow"
-msgstr "工作流程的角色"
+msgstr "工作流角色"
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -67,7 +67,7 @@ msgstr "详情"
 #. module: process
 #: field:process.node,help_url:0
 msgid "Help URL"
-msgstr "帮助 URL"
+msgstr "帮助URL"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_node_form
@@ -76,7 +76,7 @@ msgstr "帮助 URL"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr "流程节点"
+msgstr "处理节点"
 
 #. module: process
 #: view:process.process:0
@@ -99,7 +99,7 @@ msgstr "节点"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Workflow Trigger"
-msgstr "工作流触发器"
+msgstr "触发工作流"
 
 #. module: process
 #: field:process.transition,note:0
@@ -109,7 +109,7 @@ msgstr "说明"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr "流程转换动作"
+msgstr "处理转换生效"
 
 #. module: process
 #: field:process.condition,model_id:0
@@ -121,7 +121,7 @@ msgstr "对象"
 #. module: process
 #: field:process.transition,source_node_id:0
 msgid "Source Node"
-msgstr "来源节点"
+msgstr "源节点"
 
 #. module: process
 #: field:process.transition,transition_ids:0
@@ -131,12 +131,12 @@ msgstr "工作流转换"
 #. module: process
 #: field:process.transition.action,action:0
 msgid "Action ID"
-msgstr "动作标识符"
+msgstr "动作ID"
 
 #. module: process
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr "流程转换"
+msgstr "处理转换"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -148,12 +148,12 @@ msgstr "条件"
 #. module: process
 #: selection:process.transition.action,state:0
 msgid "Dummy"
-msgstr "伪动作"
+msgstr "哑元"
 
 #. module: process
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: process
 #: field:process.condition,name:0
@@ -167,19 +167,19 @@ msgstr "名称"
 #. module: process
 #: field:process.transition,role_ids:0
 msgid "Roles"
-msgstr "用户角色"
+msgstr "角色"
 
 #. module: process
 #: field:process.node,transition_in:0
 msgid "Starting Transitions"
-msgstr "起始转换"
+msgstr "开始转换"
 
 #. module: process
 #: field:process.node,note:0
 #: field:process.process,note:0
 #: view:process.transition:0
 msgid "Notes"
-msgstr "备注"
+msgstr "节点"
 
 #. module: process
 #: view:process.node:0
@@ -193,7 +193,7 @@ msgstr "转换"
 #: view:process.process:0
 #: view:process.transition:0
 msgid "Roles Required"
-msgstr "需要的用户角色"
+msgstr "角色要求"
 
 #. module: process
 #: view:process.node:0
@@ -205,12 +205,12 @@ msgstr "额外信息"
 #: selection:process.node,kind:0
 #: field:process.node,subflow_id:0
 msgid "Subflow"
-msgstr "子流"
+msgstr "子工作流"
 
 #. module: process
 #: field:process.process,active:0
 msgid "Active"
-msgstr "启用"
+msgstr "生效"
 
 #. module: process
 #: selection:process.transition.action,state:0
@@ -220,12 +220,12 @@ msgstr "动作"
 #. module: process
 #: field:process.node,flow_start:0
 msgid "Starting Flow"
-msgstr "起始流"
+msgstr "开始流程"
 
 #. module: process
 #: field:process.condition,model_states:0
 msgid "Expression"
-msgstr "表达式"
+msgstr "表达"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -235,7 +235,7 @@ msgstr "类型"
 #. module: process
 #: field:process.node,transition_out:0
 msgid "Ending Transitions"
-msgstr "终止转换"
+msgstr "结束转换"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_form
@@ -244,7 +244,7 @@ msgstr "终止转换"
 #: field:process.node,process_id:0
 #: view:process.process:0
 msgid "Process"
-msgstr "流程"
+msgstr "处理"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
@@ -268,7 +268,7 @@ msgstr "状态表达式"
 #: model:ir.model,name:process.model_process_transition
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr "流程转换"
+msgstr "处理转换"
 
 #. module: process
 #: field:process.transition,target_node_id:0
@@ -278,7 +278,7 @@ msgstr "目标节点"
 #. module: process
 #: field:process.node,kind:0
 msgid "Kind of Node"
-msgstr "节点种类"
+msgstr "分类节点"
 
 #. module: process
 #: view:process.node:0
@@ -301,3 +301,12 @@ msgstr "转换"
 #: selection:process.transition.action,state:0
 msgid "Object Method"
 msgstr "对象方法"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to manage your process for the end-users.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块允许你管理你的最终用户处理\n"
+#~ "    "
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 34adb11ee54..344fde38a0e 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-07 13:36+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -24,14 +24,14 @@ msgstr "最大利润"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr "基本价格"
+msgstr "基础价格"
 
 #. module: product
 #: help:product.template,standard_price:0
 msgid ""
 "The cost of the product for accounting stock valuation. It can serves as a "
 "base price for supplier price."
-msgstr "产品成本为会计存货估价。它也可以作为供应商基本价格。"
+msgstr "产品成本的会计库存价值.它能作为供应商价格的一个基础价格."
 
 #. module: product
 #: selection:product.template,type:0
@@ -43,7 +43,7 @@ msgstr "服务"
 msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
-msgstr "确定该产品在采购订单明细的货品选择表中是否可见"
+msgstr "如果产品列表中能看见这产品确定它"
 
 #. module: product
 #: help:product.supplierinfo,name:0
@@ -58,14 +58,14 @@ msgstr "DDR 512MB PC400"
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr "高级现场维护"
+msgstr "现场高级调试"
 
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid ""
 "The minimal quantity to purchase for this supplier, expressed in the default "
 "unit of measure."
-msgstr "从该供应商采购的最小数量，使用默认计量单位表示。"
+msgstr "供应商最少采购数量使用默认单位"
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -77,7 +77,7 @@ msgstr "净重"
 msgid ""
 "Quantities of products that are planned to arrive in selected locations or "
 "all internal if none have been selected."
-msgstr "所选存货点或全部内部存货点（如未选存货点）的计划到货数量。"
+msgstr "产品在选定库位计划接收数量或如果没有选定库位全部内部库位"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -85,7 +85,7 @@ msgid ""
 "Futur stock for this product according to the selected location or all "
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
-msgstr "该产品在所选存货点或全部内部存货点（如未选存货点）的未来库存。计算公式：实际库存+接收-发出"
+msgstr "产品在选定库位或者没选定在内部的未来库存.计算公式:实际库存 + 接收 - 发出"
 
 #. module: product
 #: field:product.packaging,width:0
@@ -97,7 +97,7 @@ msgstr "宽度"
 msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
-msgstr "如果此规则只能应用于一种产品模板，则在此设置该产品模板。如果可应用于所有产品，则置空。"
+msgstr "设置一模板如果这规则只适合一产品产品模板.留空为适用所有产品"
 
 #. module: product
 #: field:product.template,procure_method:0
@@ -107,17 +107,17 @@ msgstr "获得方式"
 #. module: product
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: product
 #: model:process.process,name:product.process_process_productprocess0
 msgid "Product Process"
-msgstr "产品流程"
+msgstr "产品工艺"
 
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr "产品表单中的关联字段"
+msgstr "产品的相关字段"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -127,7 +127,7 @@ msgstr "标准价"
 #. module: product
 #: help:product.packaging,height:0
 msgid "The height of the package"
-msgstr "包装高度"
+msgstr "包装的高度"
 
 #. module: product
 #: view:product.pricelist:0
@@ -142,7 +142,7 @@ msgstr "可销售"
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr "键盘＋鼠标套装"
+msgstr "键盘+鼠标套件"
 
 #. module: product
 #: field:product.price.type,name:0
@@ -162,7 +162,7 @@ msgstr "公司"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr "可租赁产品"
+msgstr "租借产品"
 
 #. module: product
 #: field:product.product,lst_price:0
@@ -178,7 +178,7 @@ msgstr "价格类型"
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "库存商品"
+msgstr "可库存产品"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -190,7 +190,7 @@ msgstr "服务"
 msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
-msgstr "计算客户价格的基础价格。也可称为目录价格。"
+msgstr "计算客户价格的基础价格.有时候它被称为目录价格"
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
@@ -205,12 +205,12 @@ msgstr "AMD Athlon XP 2200+ 处理器"
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr "价格种类名称"
+msgstr "价格类型名称"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr "该价格表版本的生效时间"
+msgstr "有效的价格表版本开始日期"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -231,24 +231,24 @@ msgstr "重量"
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr "静音风扇"
+msgstr "无声风扇"
 
 #. module: product
 #: help:product.template,supply_method:0
 msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Purchase will trigger purchase orders when requested."
-msgstr "生产将根据货品类型创建生产定单或任务。采购将在请求时触发采购订单。"
+msgstr "生产将根据产品类型创建生产单或任务.采购将在有需要时触发采购订单请求."
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
 msgid "You can see the list of suppliers for that product."
-msgstr "您能看到该货品的供应商名单"
+msgstr "你能在产品中看到供应商"
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layer on a palet or box"
-msgstr "托板或箱子的层数"
+msgstr "小包或箱子层数"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
@@ -259,7 +259,7 @@ msgstr "销售价格表"
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr "基础价格表"
+msgstr "其它价格表"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -276,10 +276,7 @@ msgid ""
 "Sets the price so that it is a multiple of this value.\n"
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
-msgstr ""
-"设置价格，为该数值的倍数。\n"
-"舍入适用打折之后，附加费之前。\n"
-"如想定以9.99为尾的价格，设舍入为10，附加费为-0.01。"
+msgstr "设定价格以便它有多个价格,折扣后使用四舍五入和之前的附加费,以价格9.99为例四舍五入为10附加费为-0.001."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -300,14 +297,14 @@ msgstr "固定的"
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr "度量单位分类"
+msgstr "计量单位类型"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
 msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
-msgstr "设置一个产品如果该规则只适用于一个产品，为所有产品留空"
+msgstr "设置产品类别如果这规则只适合产品.留空为为全部产品"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -345,7 +342,7 @@ msgstr "层数"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr "错误！您不能创建递归分类。"
+msgstr "错误!你不能创建递归的分类"
 
 #. module: product
 #: field:product.template,uom_id:0
@@ -355,7 +352,7 @@ msgstr "默认计量单位"
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr "制造周期"
+msgstr "生产提前期"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
@@ -366,7 +363,7 @@ msgstr "供应商价格表"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr "托盘尺寸"
+msgstr "托板尺寸"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -386,7 +383,7 @@ msgstr "业务伙伴"
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr "客户交货期"
+msgstr "客户交货提前期"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -399,7 +396,7 @@ msgid ""
 "Standard Price: the cost price is fixed and recomputed periodically (usually "
 "at the end of the year), Average Price: the cost price is recomputed at each "
 "reception of products."
-msgstr "标准价：成本价格定期不变，周期底重新计算（通常在年底)。平均价：成本价在每次到新货时重新计算。"
+msgstr "标准价:这价格是固定的和重新定价(通常在今年年底).平均价:这价格是在每个产品上重新计算."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -419,12 +416,12 @@ msgstr "平均价"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Create new Product"
-msgstr "新建产品"
+msgstr "创建新产品"
 
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr "价格表明细明确的规则名"
+msgstr "价格表明细详尽的规则名"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -449,12 +446,12 @@ msgstr "生产中"
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr "下级分类"
+msgstr "子类"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
 msgid "Accessories"
-msgstr "电脑外设"
+msgstr "配件"
 
 #. module: product
 #: field:product.supplierinfo,sequence:0
@@ -464,13 +461,13 @@ msgstr "优先级"
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr "根据需求硬盘型号"
+msgstr "硬盘要求"
 
 #. module: product
 #: field:product.uom,factor_inv:0
 #: field:product.uom,factor_inv_data:0
 msgid "Factor"
-msgstr "因数"
+msgstr "系数"
 
 #. module: product
 #: wizard_button:product.price_list,init,price:0
@@ -519,12 +516,12 @@ msgstr "业务伙伴产品名称"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr "杂项"
+msgstr "各种各样的"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr "该规则计算价格的模式"
+msgstr "计算价格公式的模式"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -537,12 +534,12 @@ msgstr "计量单位"
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr "客户参考号"
+msgstr "客户参考"
 
 #. module: product
 #: field:product.supplierinfo,qty:0
 msgid "Minimal Quantity"
-msgstr "最小数量"
+msgstr "最少数量"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
@@ -555,12 +552,12 @@ msgid ""
 "This is the average delay in days between the purchase order confirmation "
 "and the reception of goods for this product and for the default supplier. It "
 "is used by the scheduler to order requests based on reordering delays."
-msgstr "在供应商确认采购订单到交付完成货品之间的平均时间。调度程序使用该时间根据在订购延误生成订购请求。"
+msgstr "默认供应商在供应商确认采购订单到接收完成产品之间的平均延迟.用于计划调度订单请求时所根据的重新排序延误."
 
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr "供应商供货期"
+msgstr "供应商交货提前期"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -570,7 +567,7 @@ msgstr "默认的公共价格表版本"
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr "关键词"
+msgstr "关键字"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -587,7 +584,7 @@ msgstr "规则匹配测试"
 msgid ""
 "This pricelist will be used, instead of the default one,                     "
 "for sales to the current partner"
-msgstr "该价格表将替代当前业务伙伴默认的销售价格表。"
+msgstr "当前业务伙伴的销售价格表.不是默认值."
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist
@@ -598,17 +595,17 @@ msgstr "价格表"
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "可消费品"
+msgstr "消耗品"
 
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr "该字段的货币值表达为"
+msgstr "货币字段的表达式"
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr "单位为千克的毛重。"
+msgstr "毛重使用公斤"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -618,19 +615,19 @@ msgstr "盒"
 #. module: product
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: product
 #: help:product.template,sale_ok:0
 msgid ""
 "Determine if the product can be visible in the list of product within a "
 "selection from a sale order line."
-msgstr "确定该产品在销售订单明细的货品选择表中是否可见。"
+msgstr "如果在选择销售订单明细的产品列表中能看见这产品确定它"
 
 #. module: product
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: product
 #: field:product.category,parent_id:0
@@ -647,14 +644,14 @@ msgstr "开发中"
 msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
-msgstr "用于在编码里根据不同背景来选择特定的价格。请勿改变"
+msgstr "用代码来选择特定的价格.保持不改变"
 
 #. module: product
 #: help:product.product,outgoing_qty:0
 msgid ""
 "Quantities of products that are planned to leave in selected locations or "
 "all internal if none have been selected."
-msgstr "选定货位中计划离开的或如无选定货位内部所有的产品数量"
+msgstr "产品在选定库位的计划接收数量或如果没有选择库位全部内部库位"
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -667,19 +664,19 @@ msgid ""
 "'Make to Stock': When needed, take from the stock or wait until re-"
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
-msgstr "'备货型生产'：当需要时，从存货取货或等到重新供应。 '订货型生产'：当需要时，根据采购请求购买或生产。"
+msgstr "按库存:在库存取得或等待重新供应.按单:采购或生产这产品需求请求"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr "采购"
+msgstr "产品需求"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_product_category_action
 msgid "Products by Category"
-msgstr "分类的产品"
+msgstr "产品分类"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -692,9 +689,7 @@ msgid ""
 "When a version is duplicated it is set to non active, so that the dates do "
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
-msgstr ""
-"当复制版本时复本会被设定为未激活的。这样复本和原版的日期不会重叠。\"\r\n"
-"\"您应该改日期并激活价格表。"
+msgstr "当一个版本重复时它是设为不生效.这样在旧版本日期是不重复的"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
@@ -719,12 +714,12 @@ msgstr "货架"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr "计量单位分类"
+msgstr "计量单位类型"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr "装箱"
+msgstr "包"
 
 #. module: product
 #: field:product.product,ean13:0
@@ -741,12 +736,12 @@ msgstr "销售说明"
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr "销售计量单位"
+msgstr "销售单位"
 
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr "计量类型"
+msgstr "单位类型"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
@@ -756,14 +751,14 @@ msgstr "重量"
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr "根据需求处理器型号"
+msgstr "处理器要求"
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
 msgid ""
 "Name of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
-msgstr "业务伙伴货品名称将用在询价上。留空为使用内部名称。"
+msgstr "业务伙伴该产品名称将用在询价上.留空为使用内部名称"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -773,12 +768,12 @@ msgstr "供应方式"
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr "电脑配件包"
+msgstr "IT成套零部件"
 
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr "计量单位分类"
+msgstr "计量单位类型"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -811,7 +806,7 @@ msgstr "货币"
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr "一般的处理器配置"
+msgstr "通常处理器配置"
 
 #. module: product
 #: view:product.product:0
@@ -822,7 +817,7 @@ msgstr "说明"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Suppliers of Product"
-msgstr "货品供应商"
+msgstr "产品供应商"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -832,24 +827,24 @@ msgstr "开始日期"
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr "销售属性"
+msgstr "销售 属性"
 
 #. module: product
 #: help:product.product,qty_available:0
 msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
-msgstr "选定货位的或如无选定货位内部所有的现有货品数量。"
+msgstr "在选定库位当前产品的数量或如果没选择表示所有的内部库位"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr "基本电脑"
+msgstr "基础PC"
 
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr "行"
+msgstr "列"
 
 #. module: product
 #: field:product.template,categ_id:0
@@ -860,7 +855,7 @@ msgstr "分类"
 #: help:product.pricelist.item,min_quantity:0
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
-msgstr "该规则只适用于业务伙伴采购/销售超过此数量"
+msgstr "该规则只适用于业务伙伴采购/销售超过一定的数量"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
@@ -875,14 +870,14 @@ msgstr "实际库存"
 #. module: product
 #: view:product.category:0
 msgid "Product Categories"
-msgstr "产品分类"
+msgstr "产品类型"
 
 #. module: product
 #: help:product.uom,category_id:0
 msgid ""
 "Unit of Measure of a category can be converted between each others in the "
 "same category."
-msgstr "属于同分类的计量单位能互相转化"
+msgstr "类别单位能转化的同一类别"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
@@ -897,18 +892,18 @@ msgstr "可销售"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr "带外设的完整电脑"
+msgstr "完整的电脑外设"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类中。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr "ASUStek A7V8X-X 主板"
+msgstr "主板 ASUStek A7V8X-X"
 
 #. module: product
 #: field:product.uom,factor:0
@@ -947,7 +942,7 @@ msgstr "处理发票和库存管理两个计量单位的公司使用。例如，
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "需求单与地点"
+msgstr "产品需求&库位"
 
 #. module: product
 #: view:product.product:0
@@ -981,32 +976,32 @@ msgstr "价格舍入"
 #. module: product
 #: model:product.price.type,name:product.list_price
 msgid "Public Price"
-msgstr "对外价格"
+msgstr "标价"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr "最大价格利润"
+msgstr "最大毛利"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr "电脑配件"
+msgstr "IT零部件"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr "物流单位空包装的重量"
+msgstr "空包装的最大重量"
 
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr "运输单位编码"
+msgstr "运输单位代码"
 
 #. module: product
 #: field:product.template,uom_po_id:0
@@ -1021,17 +1016,17 @@ msgstr "产品价格类型"
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr "产品经理"
+msgstr "产品主管"
 
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr "产品变体附加差价"
+msgstr "额外价格变量"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr "普通 80mm 风扇"
+msgstr "通常80mm风扇"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
@@ -1045,12 +1040,12 @@ msgstr "产品供应商信息"
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr "变体价格差额"
+msgstr "变价幅度"
 
 #. module: product
 #: wizard_view:product.price_list,init:0
@@ -1060,12 +1055,12 @@ msgstr "价格表"
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr "中等配置电脑"
+msgstr "多媒体PC"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
 msgid "pricelist.partnerinfo"
-msgstr "pricelist.partnerinfo"
+msgstr "业务伙伴信息"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -1084,33 +1079,33 @@ msgstr "采购说明"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr "副计量单位"
+msgstr "第二计量单位"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr "戴尔电脑"
+msgstr "DELL"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr "存储地点"
+msgstr "存储库位"
 
 #. module: product
 #: help:product.packaging,length:0
 msgid "The length of the package"
-msgstr "包装长度"
+msgstr "包装的长度"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr "最小价格差额"
+msgstr "最小毛利"
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr "包装的欧洲商品编号(EAN)"
+msgstr "包装的EAN编码"
 
 #. module: product
 #: field:product.template,weight:0
@@ -1122,13 +1117,13 @@ msgstr "毛重"
 msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the packing order and is mainly used if you use the EDI module."
-msgstr "给出相同货品的不同包装方式。这不会影响挑选程序，主要用于您可选择地使用的EDI模块。"
+msgstr "给出相同产品的不同包装方式.如果你使用EDI模块这并不影响包装单和主要使用"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr "产品类别"
+msgstr "产品类型"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1144,7 +1139,7 @@ msgstr "价格表类型"
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr "告诉用户是否可以使用产品。"
+msgstr "产品在企业的状态"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
@@ -1154,28 +1149,26 @@ msgstr "业务伙伴产品代码"
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr "电脑相关"
+msgstr "电脑原材料"
 
 #. module: product
 #: field:product.packaging,code:0
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: product
 #: help:product.uom,factor_inv:0
 msgid ""
 "The coefficient for the formula:\n"
 "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
-msgstr ""
-"该公式的系数为：\n"
-"系数（基本单位）＝1（这单位）。因子＝1/比率。"
+msgstr "该公式的系数为:系数(基础单位)=1(这单位)×因子=1/比率"
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr "序号"
+msgstr "序列"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
@@ -1190,7 +1183,7 @@ msgstr "可变的"
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr "所有库存操作的默认计量单位。"
+msgstr "所有库存操作的默认计量单位"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -1203,14 +1196,14 @@ msgstr "产品模板"
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr "发货单位"
+msgstr "运输单位"
 
 #. module: product
 #: help:product.uom,rounding:0
 msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for products "
 "that can not be split."
-msgstr "计算数量将是该数值的倍数。对不能拆分的货品请使用1.0。"
+msgstr "这计算数量将是一个倍数值.产品使用1.0不能拆分."
 
 #. module: product
 #: field:product.packaging,height:0
@@ -1220,7 +1213,7 @@ msgstr "高度"
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
 msgid "Customizable PC"
-msgstr "定制电脑"
+msgstr "自选配置PC"
 
 #. module: product
 #: help:product.pricelist.version,date_end:0
@@ -1243,7 +1236,7 @@ msgstr "产品类型"
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
 msgid "Onsite Intervention"
-msgstr "现场维护"
+msgstr "现场调试"
 
 #. module: product
 #: model:product.category,name:product.cat0
@@ -1258,7 +1251,7 @@ msgstr "取消"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by palet or box."
-msgstr "可按箱或托板装的货品总数。"
+msgstr "产品总数你可以输入箱子或小包"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
@@ -1274,12 +1267,12 @@ msgstr "价格表"
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr "对外价格表"
+msgstr "标价价格表"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr "根据要求内存容量"
+msgstr "内存要求"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1295,7 +1288,7 @@ msgstr "希捷 7200.8 120GB 硬盘"
 #. module: product
 #: wizard_field:product.price_list,init,qty2:0
 msgid "Quantity-2"
-msgstr "数量二"
+msgstr "数量2"
 
 #. module: product
 #: view:product.product:0
@@ -1306,57 +1299,57 @@ msgstr "信息"
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr "编码"
+msgstr "代码"
 
 #. module: product
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty4:0
 msgid "Quantity-4"
-msgstr "数量四"
+msgstr "数量4"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty5:0
 msgid "Quantity-5"
-msgstr "数量五"
+msgstr "数量5"
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Other Info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr "延期"
+msgstr "延迟"
 
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr "价格表项"
+msgstr "价格表明细"
 
 #. module: product
 #: help:product.supplierinfo,product_code:0
 msgid ""
 "Code of the product for this partner, will be used when printing a request "
 "for quotation. Keep empty to use the internal one."
-msgstr "该业务伙伴的货品编码，将用在询价上。留空为使用内部编码"
+msgstr "业务伙伴的该产品的代码将用在询价上.留空为使用内部代码"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "Obsolete"
-msgstr "过期"
+msgstr "荒废"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr "托盘"
+msgstr "托板"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
@@ -1366,12 +1359,12 @@ msgstr "单价"
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr "保证期（月）"
+msgstr "保证期(月)"
 
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr "分层包装"
+msgstr "包装层"
 
 #. module: product
 #: help:product.template,type:0
@@ -1384,7 +1377,7 @@ msgstr "将会改变需求计划的处理方式。消耗品是拥有无限库存
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Product suppliers, with their product name, price, etc."
-msgstr "产品供应商，包含产品名称、价格等。"
+msgstr "产品供应商.产品名称、价格."
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -1419,7 +1412,7 @@ msgstr "说明"
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr "条码"
+msgstr ""
 
 #. module: product
 #: view:product.product:0
@@ -1438,7 +1431,7 @@ msgid ""
 "This is the average time between the confirmation of the customer order and "
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
-msgstr "在确认销售订单到交付完成产品之间的平均时间。是您承诺客户的时间。"
+msgstr "这是确认客户订单和交付的平均时间.是承诺客户的时间."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -1448,7 +1441,7 @@ msgstr "产品计量单位分类"
 #. module: product
 #: wizard_field:product.price_list,init,qty3:0
 msgid "Quantity-3"
-msgstr "数量三"
+msgstr "数量3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -1468,12 +1461,12 @@ msgstr "订货型生产"
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr "其他费用"
+msgstr "价格附加费"
 
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "您不能同时具有两个重叠的价格表版本。"
+msgstr "你不能有两个价格表版本它是重复的！"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1483,7 +1476,7 @@ msgstr "舍入方法"
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr "变动"
+msgstr "系列型号"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1493,12 +1486,12 @@ msgstr "价格计算"
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr "ASUStek A7N8X 主板"
+msgstr "主板 ASUStek A7N8X"
 
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr "箱"
+msgstr "盒"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
@@ -1514,7 +1507,7 @@ msgstr "产品分类"
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr "物流单位"
+msgstr "逻辑单位"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1526,16 +1519,14 @@ msgstr "物流单位"
 #: field:product.uom,name:0
 #: field:product.uom.categ,name:0
 msgid "Name"
-msgstr "名称"
+msgstr "完整的分类名称"
 
 #. module: product
 #: help:product.template,uos_coeff:0
 msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uom = uos * coeff"
-msgstr ""
-"计量单位到销售单位的转换系数\n"
-" 计量单位＝销售单位x系数"
+msgstr "计量单位到销售单位的转换系数 计量单位=销售单位×系数"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -1555,7 +1546,7 @@ msgstr "高速处理器配置"
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr "基础+PC(按订单组装)"
+msgstr "基础PC组装订单"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -1566,18 +1557,18 @@ msgstr "成本计算方法"
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr "托盘化"
+msgstr "托板化"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Prices & Suppliers"
-msgstr "价格与供应商"
+msgstr "价格&供应商"
 
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full of products palet or box."
-msgstr "满箱或托盘重量"
+msgstr "全部产品小包或箱子的重量"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1587,26 +1578,24 @@ msgstr "生命周期终止"
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
 msgid "Products & Pricelists"
-msgstr "产品与价格列表"
+msgstr "产品&价格表"
 
 #. module: product
 #: help:product.uom,factor:0
 msgid ""
 "The coefficient for the formula:\n"
 "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
-msgstr ""
-"该公式的系数为：\n"
-"1（基本单位）=系数（这单位）。比率=1/因子"
+msgstr "该公式的系数为:1(基础单位)=系数(这单位)×比率=1/因子"
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr "以千克为单位的净重。"
+msgstr "净重使用KG"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
 msgid "ATX Mid-size Tower"
-msgstr "ATX 中型塔式机箱"
+msgstr "ATX中型塔式机箱"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -1623,7 +1612,7 @@ msgstr "价格表版本"
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr "空的包装重量"
+msgstr "空包装重量"
 
 #. module: product
 #: field:product.template,list_price:0
@@ -1637,12 +1626,12 @@ msgid ""
 "and, if it is a multi-level bill of material, it's only for the level of "
 "this product. Different delays will be summed for all levels and purchase "
 "orders."
-msgstr "生产该产品的平均时间。它只用于生产订单，并且如果是多层的材料单，则只用于该产品所在层次。不同的延迟将会被综合到所有层次以及采购订单。"
+msgstr "产品生产的平均时间生产单才有的.如果它是一个多层物料清单在各层和采购订单在不同称和采购单的延迟汇总"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty1:0
 msgid "Quantity-1"
-msgstr "数量一"
+msgstr "数量1"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1652,7 +1641,7 @@ msgstr "长度"
 #. module: product
 #: model:product.category,name:product.cat2
 msgid "Private"
-msgstr "私人"
+msgstr "私有"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -1660,19 +1649,19 @@ msgid ""
 "Delay in days between the confirmation of the purchase order and the "
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
-msgstr "在确认采购订单到在仓库接收货品之间的平均天数。调度程序使用该时间为自动计算采购计划。"
+msgstr "延迟天数是确认采购订单到仓库接收产品之间的延迟天数.用于采购订单计划自动计算计划调度."
 
 #. module: product
 #: help:product.template,uom_po_id:0
 msgid ""
 "Default Unit of Measure used for purchase orders. It must in the same "
 "category than the default unit of measure."
-msgstr "采购订单采用的计量单位。它必须与默认计量单位属于同一类型。"
+msgstr "采购订单的默认计量单位它必须是与默认计量单位类型同级"
 
 #. module: product
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效EAN编码"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
@@ -1684,7 +1673,7 @@ msgstr "最小数量"
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his childs. Keep empty for all products"
-msgstr "如果该规则只适用于一类货品及其子类货品请设置货品分类。为所有货品留空。"
+msgstr "设置产品类别如果这规则只适合产品分类和它的子项.留空为为全部"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1694,7 +1683,7 @@ msgstr "产品标签"
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr "体积（立方米）"
+msgstr "这体积是m3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
@@ -1710,3 +1699,70 @@ msgstr "千克"
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
 msgstr "降价"
+
+#~ msgid "Price List Name:"
+#~ msgstr "价格表名称:"
+
+#~ msgid "Currency :"
+#~ msgstr "货币:"
+
+#~ msgid ""
+#~ "Used by companies that manages two unit of measure: invoicing and stock "
+#~ "management. For example, in food industries, you will manage a stock of ham "
+#~ "but invoice in Kg. Keep empty to use the default UOM."
+#~ msgstr "公司管理使用两个计量单位:发票和库存管理.例如:食品工业的仓库的火腿发票要公斤.留空为使用默认计量单位"
+
+#~ msgid "Product Pricelist"
+#~ msgstr "产品价格表"
+
+#~ msgid "Printing Date :"
+#~ msgstr "打印日期:"
+
+#~ msgid ""
+#~ "Will change the way procurements are processed. Consumables are stockable "
+#~ "products with infinite stock, or for use when you have no stock management "
+#~ "in the system."
+#~ msgstr "将改变产品需求处理.消耗品是可库存的产品并有无限的库存.或使用时没用库存管理系统来管理"
+
+#~ msgid "units"
+#~ msgstr "单位"
+
+#~ msgid ""
+#~ "\n"
+#~ "    This is the base module for managing products and pricelists in Open "
+#~ "ERP.\n"
+#~ "\n"
+#~ "    Products support variants, different pricing methods, suppliers\n"
+#~ "    information, make to stock/order, different unit of measures,\n"
+#~ "    packaging and properties.\n"
+#~ "\n"
+#~ "    Pricelists support:\n"
+#~ "    * Multiple-level of discount (by product, category, quantities)\n"
+#~ "    * Compute price based on different criteria:\n"
+#~ "        * Other pricelist,\n"
+#~ "        * Cost price,\n"
+#~ "        * List price,\n"
+#~ "        * Supplier price, ...\n"
+#~ "    Pricelists preferences by product and/or partners.\n"
+#~ "\n"
+#~ "    Print product labels with barcode.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这基础模块管理系统的产品和价格表.\n"
+#~ "\n"
+#~ "产品支持系列型号不同的\n"
+#~ "计价方式,供应商信息,按库存/按单生产,不同的单位,\n"
+#~ "包装和属性.\n"
+#~ "\n"
+#~ "价格表支持:\n"
+#~ "- 多层折扣(按产品,分类,数量)\n"
+#~ "- 计算价格根据不同的准则\n"
+#~ "\t- 其它价格表\n"
+#~ "\t- 成本价\n"
+#~ "\t- 标价\n"
+#~ "\t- 供应商价格..\n"
+#~ "价格表参数根据产品或业务伙伴\n"
+#~ "\n"
+#~ "打印产品标签和条码\n"
+#~ "    "
diff --git a/addons/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index 04963313286..5537b1b43f9 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -4,59 +4,59 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 03:26+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
 #: field:product.product,expected_margin_rate:0
 msgid "Expected Margin (%)"
-msgstr "预期毛利（%）"
+msgstr "预计利润(%)"
 
 #. module: product_margin
 #: wizard_field:product.margins,init,from_date:0
 msgid "From"
-msgstr "来自"
+msgstr "从"
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
 msgid ""
 "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
-msgstr "销售目录价格乘以客户发票数量总和"
+msgstr "客户发票(销售价×数量)合计"
 
 #. module: product_margin
 #: wizard_field:product.margins,init,to_date:0
 msgid "To"
-msgstr "至"
+msgstr "到"
 
 #. module: product_margin
 #: field:product.product,date_to:0
 msgid "To Date"
-msgstr "截止日期"
+msgstr "日期到"
 
 #. module: product_margin
 #: field:product.product,date_from:0
 msgid "From Date"
-msgstr "起始日期"
+msgstr "日期从"
 
 #. module: product_margin
 #: selection:product.margins,init,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Draft, Open and Paid"
-msgstr "草稿、未结和已付"
+msgstr "草稿、待处理和支付"
 
 #. module: product_margin
 #: model:ir.ui.menu,name:product_margin.menu_product_reporting
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
@@ -67,34 +67,34 @@ msgstr "平均单价"
 #. module: product_margin
 #: model:ir.module.module,shortdesc:product_margin.module_meta_information
 msgid "Margins in Product"
-msgstr "产品毛利"
+msgstr "产品利润"
 
 #. module: product_margin
 #: help:product.product,total_cost:0
 msgid ""
 "Sum of Multification of Invoice price and quantity of Supplier Invoices "
-msgstr "供应商发票价格乘以数量总和 "
+msgstr "供应商发票(发票价×数量)合计 "
 
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr "目录价格"
+msgstr "价目表"
 
 #. module: product_margin
 #: selection:product.margins,init,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Paid"
-msgstr "已付款"
+msgstr "支付"
 
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Excepted Sale - Turn Over"
-msgstr "预计销售—营业额"
+msgstr "额外销售-营业额"
 
 #. module: product_margin
 #: field:product.product,sale_expected:0
 msgid "Expected Sale"
-msgstr "预计销售"
+msgstr "预销售"
 
 #. module: product_margin
 #: view:product.product:0
@@ -109,7 +109,7 @@ msgstr "供应商发票数量合计"
 #. module: product_margin
 #: help:product.product,normal_cost:0
 msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
-msgstr "供应商发票数量乘以成本价格总和"
+msgstr "供应商发票  (成本价×数量)合计"
 
 #. module: product_margin
 #: view:product.product:0
@@ -121,7 +121,7 @@ msgstr "营业额"
 #: field:product.product,purchase_num_invoiced:0
 #: field:product.product,sale_num_invoiced:0
 msgid "# Invoiced"
-msgstr "# 已开票"
+msgstr "已开票"
 
 #. module: product_margin
 #: view:product.product:0
@@ -132,43 +132,43 @@ msgstr "总成本"
 #. module: product_margin
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: product_margin
 #: help:product.product,expected_margin:0
 msgid "Excepted Sale - Normal Cost"
-msgstr "预计销售-标准成本"
+msgstr "额外销售-普通成本"
 
 #. module: product_margin
 #: field:product.product,expected_margin:0
 msgid "Expected Margin"
-msgstr "预计毛利"
+msgstr "预计利润"
 
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnorder - Total Cost"
-msgstr "营业额—总成本"
+msgstr "总成本"
 
 #. module: product_margin
 #: view:product.product:0
 msgid "#Purchased"
-msgstr "#采购"
+msgstr "采购"
 
 #. module: product_margin
 #: help:product.product,turnover:0
 msgid ""
 "Sum of Multification of Invoice price and quantity of Customer Invoices"
-msgstr "客户发票价格乘以数量总和"
+msgstr "客户发票(发票价×数量)合计"
 
 #. module: product_margin
 #: help:product.product,expected_margin_rate:0
 msgid "Expected margin * 100 / Expected Sale"
-msgstr "预计毛利率×100/预销售"
+msgstr "预计利润率×100/预销售"
 
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
 msgid "Avg. Price in Customer Invoices)"
-msgstr "客户发票中的均价"
+msgstr "客户发票价格"
 
 #. module: product_margin
 #: wizard_view:product.margins,init:0
@@ -184,7 +184,7 @@ msgstr "发票状态"
 #. module: product_margin
 #: help:product.product,purchase_gap:0
 msgid "Normal Cost - Total Cost"
-msgstr "标准成本-总成本"
+msgstr "普通成本-总成本"
 
 #. module: product_margin
 #: view:product.product:0
@@ -195,7 +195,7 @@ msgstr "销售差距"
 #. module: product_margin
 #: field:product.product,normal_cost:0
 msgid "Normal Cost"
-msgstr "标准成本"
+msgstr "普通成本"
 
 #. module: product_margin
 #: view:product.product:0
@@ -205,17 +205,17 @@ msgstr "采购"
 #. module: product_margin
 #: help:product.product,purchase_avg_price:0
 msgid "Avg. Price in Supplier Invoices "
-msgstr "供应商发票的平均价格 "
+msgstr "供应商发票价格 "
 
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
-msgstr "总毛利"
+msgstr "总利润"
 
 #. module: product_margin
 #: help:product.product,total_margin_rate:0
 msgid "Total margin * 100 / Turnover"
-msgstr "总毛利×100/营业额"
+msgstr "总利润×100/营业额"
 
 #. module: product_margin
 #: view:product.product:0
@@ -226,7 +226,7 @@ msgstr "分析标准"
 #: selection:product.margins,init,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Open and Paid"
-msgstr "未结和支付"
+msgstr "待处理和支付"
 
 #. module: product_margin
 #: view:product.product:0
@@ -238,7 +238,7 @@ msgstr "销售"
 #: model:ir.ui.menu,name:product_margin.menu_action_product_margin
 #: view:product.product:0
 msgid "Product Margins"
-msgstr "产品毛利"
+msgstr "产品利润"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
@@ -248,12 +248,12 @@ msgstr "采购缺口"
 #. module: product_margin
 #: field:product.product,total_margin_rate:0
 msgid "Total Margin (%)"
-msgstr "总毛利率(%)"
+msgstr "总利润率(%)"
 
 #. module: product_margin
 #: wizard_button:product.margins,init,open:0
 msgid "Open Margins"
-msgstr "未结毛利"
+msgstr "待处理利润"
 
 #. module: product_margin
 #: wizard_button:product.margins,init,end:0
@@ -263,7 +263,7 @@ msgstr "取消"
 #. module: product_margin
 #: view:product.product:0
 msgid "Margins"
-msgstr "毛利"
+msgstr "利润"
 
 #. module: product_margin
 #: help:product.product,sale_num_invoiced:0
@@ -273,4 +273,14 @@ msgstr "客户发票数量合计"
 #. module: product_margin
 #: wizard_view:product.margins,init:0
 msgid "View Stock of Products"
-msgstr "查看货品库存"
+msgstr "查看库存产品"
+
+#~ msgid ""
+#~ "\n"
+#~ "Adds a reporting menu in products that computes sales, purchases, margins\n"
+#~ "and others interesting indicators based on invoices. The wizard to launch\n"
+#~ "the report has several options to help you get the data you need.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "在计算产m品销售,采购,利润和其它基于发票利益指标上增加一个报表菜单.\n"
+#~ "这向导启动几种选择报表来帮助你获得你需要的资料\n"
diff --git a/addons/profile_accounting/i18n/zh_CN.po b/addons/profile_accounting/i18n/zh_CN.po
index d81a8a2894e..63419ecb64d 100644
--- a/addons/profile_accounting/i18n/zh_CN.po
+++ b/addons/profile_accounting/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-03 13:28+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
@@ -22,13 +22,13 @@ msgid ""
 "Install more modules. A few modules are proposed according to the Account "
 "Profile you selected. You will be able to install them based on our "
 "requirements."
-msgstr ""
+msgstr "根据你选择的会计配置.有几个模块是被推荐的根据这你将完成安装."
 
 #. module: profile_accounting
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
@@ -42,14 +42,12 @@ msgid ""
 "automatically index, search and preview all kind of documents (internal "
 "documents, printed reports, calendar system). It opens an FTP access for the "
 "users to easily browse association's document."
-msgstr ""
-"Open ERP的单据管理系统，运行你保存、浏览、自动索引、搜索和预览所有单据（包括内部单据、打印报表、日历系统）。It opens an FTP "
-"access for the users to easily browse association's document."
+msgstr "系统文档管理允许你储存,浏览,自动建立索引,查找和预览各种文档."
 
 #. module: profile_accounting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
@@ -64,42 +62,42 @@ msgstr "供应商付款管理"
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_asset:0
 msgid "Asset Management"
-msgstr "固定资产管理"
+msgstr "资产管理"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "多个辅助核算方案"
 
 #. module: profile_accounting
 #: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
 msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
+msgstr "会计配置:安装额外的模块"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
 msgid "Invoice on Analytic Entries"
-msgstr ""
+msgstr "辅助核算凭证的发票"
 
 #. module: profile_accounting
 #: model:ir.module.module,description:profile_accounting.module_meta_information
 msgid "Profile for Accounting"
-msgstr ""
+msgstr "会计配置"
 
 #. module: profile_accounting
 #: help:profile.accounting.config.install_modules_wizard,account_budget:0
 msgid "Helps you to manage financial and analytic budgets."
-msgstr "帮助您管理财务预算"
+msgstr "帮助你管理财务和核算预算"
 
 #. module: profile_accounting
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,name:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_budget:0
@@ -114,17 +112,17 @@ msgstr "安装"
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Install Extra Module"
-msgstr ""
+msgstr "安装额外的模块"
 
 #. module: profile_accounting
 #: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
 msgid "Accounting only profile"
-msgstr ""
+msgstr "会计配置"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
 msgid "Analytic Accounting"
-msgstr "分析科目"
+msgstr "核算会计"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,board_document:0
@@ -140,3 +138,6 @@ msgstr "profile.accounting.config.install_modules_wizard"
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Cancel"
 msgstr "取消"
+
+#~ msgid "Accounting Management"
+#~ msgstr "会计管理"
diff --git a/addons/profile_crm/i18n/zh_CN.po b/addons/profile_crm/i18n/zh_CN.po
index 31134695e12..7230d302439 100644
--- a/addons/profile_crm/i18n/zh_CN.po
+++ b/addons/profile_crm/i18n/zh_CN.po
@@ -4,19 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 15:46+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
 #: model:ir.module.module,description:profile_crm.module_meta_information
 msgid "Profile for CRM"
 msgstr "客户关系管理配置"
+
+#~ msgid "CRM profile"
+#~ msgstr "客户关系管理配置"
diff --git a/addons/profile_manufacturing/i18n/zh_CN.po b/addons/profile_manufacturing/i18n/zh_CN.po
index 776f3b5b820..640bffbe2c0 100644
--- a/addons/profile_manufacturing/i18n/zh_CN.po
+++ b/addons/profile_manufacturing/i18n/zh_CN.po
@@ -4,43 +4,43 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 07:16+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
 msgid "Manufacturing Operations"
-msgstr "生产操作"
+msgstr "生产工序"
 
 #. module: profile_manufacturing
 #: model:ir.module.module,description:profile_manufacturing.module_meta_information
 msgid "Profile for manufacturing industries"
-msgstr "生产企业特定类型"
+msgstr "制造业配置"
 
 #. module: profile_manufacturing
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
 msgid "Just in Time Scheduling"
-msgstr "JIT（准时制）规划"
+msgstr "JIT(准时生产)日程表"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
 msgid "Manage by Journals"
-msgstr "按日记账管理"
+msgstr "分类帐管理"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -50,7 +50,7 @@ msgstr "关系管理"
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,portal:0
 msgid "This module allows you to manage a Portal system."
-msgstr "该模块使您能够管理一个门户网站系统"
+msgstr "这模块允许你管理一个门户系统"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,board_document:0
@@ -60,8 +60,7 @@ msgid ""
 "documents, printed reports, calendar system). It opens an FTP access for the "
 "users to easily browse association's document."
 msgstr ""
-"Open "
-"ERP文档管理系统使您能够储存、浏览、自动索引、搜索和预览所有种类的文档(内部文档、打印报表、日程表)。用户通过文件传送协议（FTP）访问浏览相关文档。"
+"文档管理系统你可以储存、浏览、自动索引、搜索和预览所有分类的文档(内部文档、打印报表、日程表系统).用户打开一个FTP访问以方便浏览相关文档."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
@@ -69,18 +68,18 @@ msgid ""
 "This module  allows you to manage your sales, invoicing and picking by "
 "journals. You can define journals for trucks, salesman, departments, "
 "invoicing date delivery period, etc."
-msgstr "该模块使您能够按日记账管理销售、发票和分拣。你能定义卡车、业务员、部门、发票日期、交付期限、等日记账。"
+msgstr "这模块允许你管理你的销售、发票和领料/提货分类帐.你能定义跟踪、业务员、部门、发票日期交付期限等分类帐."
 
 #. module: profile_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: profile_manufacturing
 #: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Manufacturing Profile: Install Extra Modules"
-msgstr "制造业特定类型：安装额外的模块."
+msgstr "生产配置:安装额外的模块"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
@@ -88,7 +87,7 @@ msgid ""
 "The JIT module allows you to not run the scheduler periodically. It's easier "
 "and faster for real time stock computation but, in counter-part, it manages "
 "less efficiently priorities in procurements."
-msgstr "JIT（准时制）模块允许您不定期地运行调度程序。这样实时计算库存更方便并更快速，但是它会降低需求单的优先权管理效率。"
+msgstr "这JIT(准时生产)模块可以让你不运行定期调度.更容易和更快速实时计算库存.在相对部分它控制有效地减少优先产品需求."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
@@ -96,7 +95,7 @@ msgid ""
 "This module allows you to not only manage by production order but also by "
 "work order/operation. You will be able to planify, analyse the cost, check "
 "times, ... on all operations of each manufacturing order"
-msgstr "该模块不仅让您能按生产单管理也让您能按工作单/操作管理。每个生产单的操作都可以规划、分析成本、检查时间等。"
+msgstr "该模块不仅可以让你管理生产单而且能管理工作单/工序.你将在每个生产单运作能规划、分析成本、检查时间."
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,board_document:0
@@ -106,24 +105,24 @@ msgstr "文档管理"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,portal:0
 msgid "Portal"
-msgstr "门户网站"
+msgstr "门户"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Stock & Manufacturing"
-msgstr "库存及生产"
+msgstr "库存&生产"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
 msgid ""
 "Allow to manage product repairs. Handle the guarantee limit date and the "
 "invoicing of products and services."
-msgstr "让你能够管理货品修理。处理保证期限和货品、服务发票。"
+msgstr "允许你管理产品修理.处理保证期日期和产品、服务的发票"
 
 #. module: profile_manufacturing
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: profile_manufacturing
 #: model:ir.actions.todo,note:profile_manufacturing.config_install_module
@@ -131,22 +130,22 @@ msgid ""
 "Install more modules. A few modules are proposed according to the "
 "manufacturing profile you selected. You will be able to install them based "
 "on our requirements."
-msgstr "安装更多的模块。根据你选择的制造业特定类型推荐一些模块。你将根据要求安装。"
+msgstr "根据你选择的生产配置所推荐的几个模块.你将据此安装."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
 msgid "This module allows you to add sub poducts in mrp bom."
-msgstr "安装更多的模块。根据你选择的制造业特定类型推荐一些模块。你将根据要求安装。"
+msgstr "这模块允许你在MRP的物料清单中增加子产品."
 
 #. module: profile_manufacturing
 #: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
 msgid "Manufacturing industry profile"
-msgstr "制造业特定类型"
+msgstr "制造业配置"
 
 #. module: profile_manufacturing
 #: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
 msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr "profile.manufacturing.config.install_modules_wizard"
+msgstr "生产模块安装设置向导"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
@@ -154,7 +153,7 @@ msgid ""
 "This installs the customer relationship features like: leads and "
 "opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
 "on."
-msgstr "这将安装客户关系的功能：例如线索和商机跟踪、共享日程、职员空缺跟踪、错误跟踪等。"
+msgstr "安装客户关系的功能:例如商机和销售机会跟踪、共享日程、职位跟踪、缺陷跟踪等."
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -169,12 +168,12 @@ msgstr "客户关系管理和日程表"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
 msgid "Repair"
-msgstr "修复"
+msgstr "修理"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
 msgid "Display margins on the sale order form."
-msgstr "在销售订单上显示毛利率。"
+msgstr "显示这订单销售利润."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
@@ -183,12 +182,12 @@ msgid ""
 "form for pos operations. You must also check our frontend point of sale for "
 "a perfect ergonomy with touchscreen materials and payment processing "
 "hardware."
-msgstr "该模块使您能够管理销售点（POS ）系统。它提供一个基本的POS经营模式。您应该查看与触摸屏和付款处理硬件相配的销售点前台。"
+msgstr "这模块允许你管理POS系统.它提供一个基本模式为POS的操作.你必须检查POS前台有一个完美的触摸屏和付款处理POS硬件."
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
 msgid "Mrp Sub Product"
-msgstr "物料需求计划子货品"
+msgstr "MRP子产品"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -198,12 +197,12 @@ msgstr "销售管理"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,warning:0
 msgid "Warning"
-msgstr "警示"
+msgstr "警告"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
 msgid "Margins on Sales Order"
-msgstr "毛利在销售订单上"
+msgstr "销售订单管理"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
@@ -213,8 +212,7 @@ msgid ""
 "operations, etc. This module is often used for: localisation of products, "
 "managing a manufacturing chain, a quality control location, product that you "
 "rent, etc."
-msgstr ""
-"使您能够管理不同货位的高级物流。为每一个产品定义不同的货位、不同操作的货位路径等。这模块经常在：货品货位、管理生产链、质量控制、租赁货品、等情况下使用。"
+msgstr "允许你管理不同库位的高级逻辑.你能定义产品不同的库位、不同操作的库位路径等.这模块经常使用在:产品库位、管理一个生产链、质量控制等."
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
@@ -224,9 +222,12 @@ msgstr "取消"
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
 msgid "Point of Sale"
-msgstr "销售点"
+msgstr "POS"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
 msgid "Advanced Locations"
-msgstr "高级货位"
+msgstr "高级库位"
+
+#~ msgid "Able you to set warnings on products and partners."
+#~ msgstr "你可以设定产品和业务伙伴的警告."
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index d04845039e1..a462a6ad690 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:11+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:47+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr "已分配的任务"
+msgstr "指派任务"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
@@ -29,12 +29,12 @@ msgstr "任务流程"
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr "已委托给用户任务的新标题"
+msgstr "这用户的任务委派新标题"
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr "更改剩余时间"
+msgstr "改变剩余时间"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
@@ -44,17 +44,17 @@ msgstr "关闭任务"
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr "项目任务列表"
+msgstr "项目任务"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr "打开已完成的任务"
+msgstr "打开完成任务"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -64,7 +64,7 @@ msgstr "确认小时数"
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr "进度"
+msgstr "进展"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -72,7 +72,7 @@ msgstr "进度"
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
-msgstr "总剩余时间，可以由任务执行人重新估计。"
+msgstr "总剩余时间.能由任务分派人重新估计"
 
 #. module: project
 #: field:project.project,child_id:0
@@ -82,23 +82,23 @@ msgstr "子项目"
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr "项目成员"
+msgstr "项目管理"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "委托的任务"
+msgstr "委派任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_my_run
 msgid "My Running Projects"
-msgstr "我正在进行中的项目"
+msgstr "我运行的项目"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "已委托的任务列表"
+msgstr "委派任务"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -110,7 +110,7 @@ msgstr "任务关闭时通知客户的消息邮件的头"
 #. module: project
 #: field:project.task,priority:0
 msgid "Importance"
-msgstr "重要度"
+msgstr "重要"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -120,7 +120,7 @@ msgstr "更新"
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr "您想要委托此任务的用户。"
+msgstr "用户想把这任务委托给"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
@@ -135,7 +135,7 @@ msgstr "设为未决"
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr "定义需求并设置计划时间"
+msgstr "确认要求和设置计划时间"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
@@ -146,12 +146,12 @@ msgstr "任务类型"
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "基于此模板新建项目"
+msgstr "新的基于模板的项目"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr "项目包含的任务"
+msgstr "项目任务"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -161,7 +161,7 @@ msgstr "非常紧急"
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -170,15 +170,14 @@ msgid ""
 "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
 "    "
 msgstr ""
-"项目管理模块可以跟踪管理多个层次的项目，任务，\n"
-"以及完成任务所做的工作等。它可以触发创建计划，或订单任务。\n"
+"项目管理跟踪多层次项目,任务,任务工作完成等,它能使用计划,任务预定等\n"
 "    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr "我进行中的任务列表"
+msgstr "我的任务进展"
 
 #. module: project
 #: view:project.project:0
@@ -188,7 +187,7 @@ msgstr "设为模板"
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr "任务草案"
+msgstr "草稿任务"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -201,7 +200,7 @@ msgstr "任务"
 msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
-msgstr "验证您向谁委派此任务的估计完成时间"
+msgstr "确认你向谁委派这任务完成的估计时间"
 
 #. module: project
 #: view:project.project:0
@@ -209,7 +208,7 @@ msgstr "验证您向谁委派此任务的估计完成时间"
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr "注释"
+msgstr "备注"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -232,19 +231,19 @@ msgstr "项目"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr "启动任务"
+msgstr "开始任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr "我的任务草案列表"
+msgstr "我的任务草稿"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
-msgstr "用于开头和末尾的自动变量。请使用完全相同的标记。"
+msgstr "页眉页脚的自动变量.使用同一个符号."
 
 #. module: project
 #: selection:project.project,state:0
@@ -261,39 +260,39 @@ msgstr "邮件头"
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr "完成的任务"
+msgstr "完成任务"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "任务已完成"
+msgstr "任务完成"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr "委托任务到其他用户"
+msgstr "委派任务给其它用户"
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr "任务完成的工作时间合计"
+msgstr "计算任务工作时间完成的合计"
 
 #. module: project
 #: help:project.project,warn_customer:0
 msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
-msgstr "如果勾选此处。用户在完成任务时会有一个弹出窗口要求填写发送给客户的email的内容。"
+msgstr "如果勾选此项用户关闭任务时将弹出一个信息这信息会发送给客户"
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
-msgstr "在用户的任务列表中包括此任务描述"
+msgstr "在这用户任务中包含任务说明"
 
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr "项目分类"
+msgstr "辅助核算项目"
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -310,7 +309,7 @@ msgstr "所有任务"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr "正在计划"
+msgstr "计划"
 
 #. module: project
 #: view:project.task:0
@@ -327,33 +326,33 @@ msgstr "业务伙伴"
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr "计划小时数"
+msgstr "已计划的小时数"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr "任务：%(name)s"
+msgstr "任务:%(名称)"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr "重置为项目"
+msgstr "重设项目"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr "委托"
+msgstr "委派"
 
 #. module: project
 #: help:project.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
-msgstr "项目成员没有被任何统计计算所使用，而是仅仅为了记录信息。"
+msgstr "项目成员不用于任何计算,只是为了信息"
 
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr "我的项目列表"
+msgstr "我的项目"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
@@ -364,27 +363,27 @@ msgstr "所有项目"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "它将从草案状态转换为打开状态"
+msgstr "从草稿状态它将进入待处理状态"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr "已委托的项目"
+msgstr "委派任务"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "待办任务总数和已关闭任务的百分比"
+msgstr "结束任务和全部要做任务的百分比"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr "新任务描述"
+msgstr "新任务说明"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr "项目的内部说明"
+msgstr "项目内部说明"
 
 #. module: project
 #: field:project.project,parent_id:0
@@ -394,7 +393,7 @@ msgstr "上级项目"
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "计算方法：花费时间－剩余时间"
+msgstr "计算:花费时间 + 剩余时间"
 
 #. module: project
 #: field:project.task,type:0
@@ -411,25 +410,25 @@ msgstr "周"
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr "我的当前任务列表"
+msgstr "我当前的任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr "新建项目"
+msgstr "新项目"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr "中"
+msgstr "媒体"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "剩余小时数"
+msgstr "剩余的小时数"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
@@ -439,14 +438,14 @@ msgstr "项目任务类型"
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr "计划时间"
+msgstr "已计划时间"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr "任务工作"
+msgstr "工作任务"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -457,36 +456,36 @@ msgstr "小时"
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
 #: model:ir.ui.menu,name:project.menu_tasks_yours_pending
 msgid "My Pending Tasks"
-msgstr "我的未决任务列表"
+msgstr "我未决的任务"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr "进行中的任务列表"
+msgstr "任务进展"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
 #: model:ir.ui.menu,name:project.menu_action_view_task7
 msgid "Unassigned Tasks"
-msgstr "未分配任务列表"
+msgstr "未指派任务"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr "委托标题"
+msgstr "委派标题"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr "我的项目列表"
+msgstr "我的项目"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
-msgstr "委托用户关闭此任务的估计时间"
+msgstr "关闭这授权用户的任务估计时间"
 
 #. module: project
 #: selection:project.project,state:0
@@ -503,23 +502,23 @@ msgstr "设置"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr "项目列表"
+msgstr "项目"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr "时间"
+msgstr "日期"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr "任务详情"
+msgstr "任务细节"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
@@ -529,7 +528,7 @@ msgstr "触发发票"
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr "进行中的任务草案"
+msgstr "待处理任务草稿"
 
 #. module: project
 #: view:project.project:0
@@ -539,23 +538,23 @@ msgstr "用户：%(user_id)s"
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr "延迟小时数"
+msgstr "延迟时间"
 
 #. module: project
 #: field:project.project,contact_id:0
 msgid "Contact"
-msgstr "联系人"
+msgstr "联系"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "委托"
+msgstr "委派"
 
 #. module: project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -568,7 +567,7 @@ msgstr "项目管理"
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr "花费时间"
+msgstr "花费的时间"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
@@ -585,12 +584,12 @@ msgstr "任务类型"
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr "新建任务"
+msgstr "新任务"
 
 #. module: project
 #: help:project.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "从时间表的工作时间来调整甘特图报表"
+msgstr "时间表工作小时数甘特图"
 
 #. module: project
 #: view:project.project:0
@@ -600,38 +599,38 @@ msgstr "项目成员"
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr "当任务完成时创建相关发票"
+msgstr "任务结束后创建发票"
 
 #. module: project
 #: help:project.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr "计算方式：花费时间 / 总时间"
+msgstr "计算:花费时间/总时间"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr "我的任务列表"
+msgstr "我的任务"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr "状态：%(state)s"
+msgstr "状态: %(state)s"
 
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr "已计划"
+msgstr "计划"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr "与此项目相关任务的总小时数"
+msgstr "项目所有任务的总时间"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr "已委托的任务"
+msgstr "委派任务"
 
 #. module: project
 #: view:project.task:0
@@ -641,7 +640,7 @@ msgstr "信息"
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr "复审"
+msgstr "检查"
 
 #. module: project
 #: view:project.project:0
@@ -651,19 +650,19 @@ msgstr "管理"
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
 msgid "E-Mails"
-msgstr "Email"
+msgstr "电子邮件"
 
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr "从销售订单细目触发发票"
+msgstr "销售订单明细触发的发票"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -673,7 +672,7 @@ msgstr "低"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr "项目经理"
+msgstr "项目管理"
 
 #. module: project
 #: view:project.project:0
@@ -694,7 +693,7 @@ msgstr "状态"
 msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
-msgstr "您任务的新状态。当此委托任务关闭时未决的将被自动重新打开。"
+msgstr "你自己任务的新状态.未决的项目将被自动重新委派任务是关闭的."
 
 #. module: project
 #: field:res.company,project_time_mode:0
@@ -720,12 +719,12 @@ msgstr "总时间"
 #. module: project
 #: field:project.task,active:0
 msgid "Active"
-msgstr "活动的"
+msgstr "有效"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr "错误"
+msgstr "缺陷"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
@@ -735,19 +734,19 @@ msgstr "报价"
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr "任务版本"
+msgstr "任务编辑"
 
 #. module: project
 #: help:project.task,delay_hours:0
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
-msgstr "计算方法：总时间 - 估计时间。它提供项目经理时间估计和任务实际关闭时间的差距。"
+msgstr "计算:总时间 - 估计时间.它提供给项目经理时间估计和任务实际的关闭时间之间的差距"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr "打开任务"
+msgstr "待处理任务"
 
 #. module: project
 #: field:project.project,timesheet_id:0
@@ -762,12 +761,12 @@ msgstr "月"
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr "当任务完成将转换为完成状态。"
+msgstr "当任务完成它将进入完成状态"
 
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr "时间"
+msgstr "日期"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -775,84 +774,82 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
-msgstr ""
-"此项设置项目和任务的时间单位。\n"
-"如果您使用时间表链接到项目（project_timesheet 模块），别忘记为员工设置正确的时间单位。"
+msgstr "这将设置项目和任务的计量单位如果你使用链接的时间表不要忘记设置你员工的计量单位"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr "用户的项目"
+msgstr "用户计划"
 
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr "重新激活项目"
+msgstr "重新启动项目"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Urgent"
-msgstr "紧急"
+msgstr "紧急的"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegate this task to a user"
-msgstr "委托此任务给一个用户"
+msgstr "外派这任务给一个用户"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr "委托给"
+msgstr "委派給"
 
 #. module: project
 #: field:project.task,date_close:0
 msgid "Date Closed"
-msgstr "关闭日期"
+msgstr "结束时间"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Assigned to"
-msgstr "分配给"
+msgstr "指派到"
 
 #. module: project
 #: help:project.task,planned_hours:0
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
-msgstr "做任务的估计时间，通常是任务在草案状态时由项目经理设置。"
+msgstr "做任务的估计时间.通常由项目经理在任务草稿阶段设定"
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr "与此项目有关的所有任务花费的总时间"
+msgstr "项目所有任务的时间合计"
 
 #. module: project
 #: help:project.task,project_id:0
 msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
-msgstr "如果在项目名称中有 [?] 标志, 表示没有分析科目与此项目关联。"
+msgstr "如果你有[?]的名字这意味相关项目没有辅助核算项目"
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr "与此项目有关的所有任务的计划时间"
+msgstr "项目所有任务的计划时间合计"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
 msgid "Month works"
-msgstr "每月工作"
+msgstr "本月工作"
 
 #. module: project
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
 #: model:ir.actions.report.xml,name:project.report_project_task_gantt
 msgid "Gantt Representation"
-msgstr "甘特图"
+msgstr "甘特图描述"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "通知业务伙伴"
+msgstr "警告业务伙伴"
 
 #. module: project
 #: field:project.project,state:0
@@ -862,12 +859,12 @@ msgstr "状态"
 #. module: project
 #: field:project.task,name:0
 msgid "Task summary"
-msgstr "任务概述"
+msgstr "任务摘要"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr "开始时间：%(date_start)s"
+msgstr "开始日期:%(date_start)"
 
 #. module: project
 #: help:project.project,category_id:0
@@ -875,7 +872,7 @@ msgid ""
 "Link this project to an analytic account if you need financial management on "
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
-msgstr "如果你需要对此项目实施财务管理请将一个分析科目与之关联。这样我们就能对该项目进行预算，计划，成本，收益等的分析。"
+msgstr "如果你需要项目的财务管理链接到这项目的辅助核算项目行,它能让你在链接的项目的有预算、计划、成本和收益分析、项目的时间表等."
 
 #. module: project
 #: view:project.project:0
@@ -900,12 +897,12 @@ msgstr "取消"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr "创建任务"
+msgstr "创建一个任务"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr "打开"
+msgstr "待处理"
 
 #. module: project
 #: view:project.project:0
@@ -915,18 +912,18 @@ msgstr "标识符：%(task_id)s"
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr "进行中"
+msgstr "进展"
 
 #. module: project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr "重新激活"
+msgstr "恢复"
 
 #. module: project
 #: field:project.task,parent_id:0
@@ -946,12 +943,12 @@ msgstr "非常低"
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr "发送邮件给客户"
+msgstr "发送邮件到客户"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr "通知项目经理"
+msgstr "警告信息"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
@@ -961,17 +958,17 @@ msgstr "config.compute.remaining"
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
 msgid "Quiet close"
-msgstr "安静地关闭"
+msgstr "安静关闭"
 
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr ""
+msgstr "你自己任务的新标题到确认工作完成"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr "进度（％）"
+msgstr "进度%"
 
 #. module: project
 #: field:project.task,description:0
@@ -1004,19 +1001,19 @@ msgstr "工作完成"
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr "进行中"
+msgstr "运行"
 
 #. module: project
 #: help:project.project,parent_id:0
 msgid ""
 "If you have [?] in the name, it means there are no analytic account linked "
 "to project."
-msgstr "如果在项目名称中有 [?] 标志, 表示没有分析科目与此项目关联。"
+msgstr "如果你有[?]的名字这意味相关项目没有辅助核算项目"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
 msgid "Delegate Task"
-msgstr "委托任务"
+msgstr "委派任务"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1028,22 +1025,22 @@ msgstr "项目任务"
 msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
-msgstr "如果选中此字段，项目经理当他的团队完成每一个任务的时候将收到一个请求。"
+msgstr "如果勾选此项项目经理将收到他团队每个任务完成时间的请求"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr "新特性"
+msgstr "新特征"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr "编码您的工作时间"
+msgstr "你工作小时编码"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr "您的任务标题"
+msgstr "你的任务主题"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
@@ -1053,7 +1050,7 @@ msgstr "项目任务"
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr "花费小时数"
+msgstr "时间花费"
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1070,14 +1067,14 @@ msgstr "项目模板"
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: project
 #: help:project.project,warn_footer:0
 msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr "任务关闭时客户通知邮件的开始将添加页脚。"
+msgstr "任务关闭时通知客户的消息邮件的页脚"
 
 #. module: project
 #: view:project.project:0
@@ -1087,7 +1084,7 @@ msgstr "业务伙伴信息"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
 msgid "Compute Remaining Hours"
-msgstr "计算剩余小时数"
+msgstr "计算剩余时间"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
@@ -1097,37 +1094,37 @@ msgstr "确认状态"
 #. module: project
 #: constraint:project.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr "错误！您不能创建循环的项目。"
+msgstr "错误!你不能创建递归的项目"
 
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "最后期限"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr "分配给"
+msgstr "指派到"
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr "工作概述"
+msgstr "工作摘要"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date_stop)s"
-msgstr "停止时间：%(date_stop)s"
+msgstr "停止日期:%(date_stop)"
 
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr "预计结束时间"
+msgstr "预期结束"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr "委托您的任务给其他用户"
+msgstr "委派你的任务给其它用户"
 
 #. module: project
 #: view:project.project:0
@@ -1139,4 +1136,4 @@ msgstr "邮件页脚"
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr "正在进行的任务"
+msgstr "运行项目"
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index 6b0ce3e9ecd..68f425a678a 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index 7a30f0c2a06..79419fff25c 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-11 03:12+0000\n"
-"Last-Translator: 一念轮回 <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:47+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -25,7 +25,7 @@ msgstr "可见列"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
@@ -35,7 +35,7 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
 msgid "My Deadlines"
-msgstr "我的截止日期"
+msgstr "我的截止期限"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
@@ -50,17 +50,17 @@ msgstr "上级时间盒"
 #. module: project_gtd
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件!"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,task_ids:0
 msgid "Tasks selection"
-msgstr "选择任务"
+msgstr "任务选择"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_priority:0
 msgid "Priority"
-msgstr "优先级"
+msgstr "优先"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_inbox
@@ -71,54 +71,54 @@ msgstr "我的收件箱"
 #. module: project_gtd
 #: field:project.gtd.context,project_default_id:0
 msgid "Default Project"
-msgstr "默认项目"
+msgstr "默认的项目"
 
 #. module: project_gtd
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在动作定义中无效的模块名"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context4_id:0
 msgid "Context 4"
-msgstr ""
+msgstr "上下文4"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
 msgid "Set to Timebox"
-msgstr ""
+msgstr "设为时间箱"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Other"
-msgstr "其他"
+msgstr "其它"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_task_inbox
 msgid "Inbox Tasks"
-msgstr "收件箱任务列表"
+msgstr "收件箱任务"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 #: field:project.gtd.timebox,name:0
 #: field:project.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "时间箱"
 
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "GTD - 时间管理模块"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
 msgid "Timebox Tasks"
-msgstr ""
+msgstr "时间箱任务"
 
 #. module: project_gtd
 #: wizard_view:project.gtd.timebox.fill,init:0
 msgid "Timebox tasks selection"
-msgstr ""
+msgstr "时间箱任务选择"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,type:0
@@ -133,17 +133,17 @@ msgstr "有效时间"
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_empty
 msgid "Empty Timebox"
-msgstr ""
+msgstr "空时间箱"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
 msgid "My Pending Tasks"
-msgstr "我的未决任务列表"
+msgstr "我未决的任务"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
 msgid "Timebox Definition"
-msgstr ""
+msgstr "时间箱定义"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,user_id:0
@@ -154,7 +154,7 @@ msgstr "用户"
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_daily
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_daily_inbox
 msgid "My Daily Timebox"
-msgstr ""
+msgstr "我每天的时间箱"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
@@ -164,49 +164,49 @@ msgstr ""
 #. module: project_gtd
 #: field:project.gtd.timebox,context1_id:0
 msgid "Context 1"
-msgstr ""
+msgstr "上下文1"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context2_id:0
 msgid "Context 2"
-msgstr ""
+msgstr "上下文2"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context3_id:0
 msgid "Context 3"
-msgstr ""
+msgstr "上下文3"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,process:0
 msgid "Add to Timebox"
-msgstr ""
+msgstr "加到时间箱"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context5_id:0
 msgid "Context 5"
-msgstr ""
+msgstr "上下文5"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context6_id:0
 msgid "Context 6"
-msgstr ""
+msgstr "上下文6"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
 #: view:project.gtd.timebox:0
 msgid "Contexts"
-msgstr ""
+msgstr "上下文"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
 msgid "Daily"
-msgstr "每日"
+msgstr "每天"
 
 #. module: project_gtd
 #: model:ir.actions.wizard,name:project_gtd.open_gtd_timebox_fill
 msgid "Plannify Timebox"
-msgstr ""
+msgstr "计划中的时间箱"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_project:0
@@ -218,14 +218,14 @@ msgstr "项目"
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree_my
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_my_timeboxes
 msgid "My Timeboxes"
-msgstr ""
+msgstr "我的时间箱"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
 #: view:project.gtd.timebox:0
 msgid "Timeboxes"
-msgstr ""
+msgstr "时间箱"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -237,12 +237,12 @@ msgstr "已计划"
 #: field:project.gtd.context,name:0
 #: field:project.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "上下文"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
 msgid "My Open Tasks"
-msgstr "我进行中的任务列表"
+msgstr "我打开的任务"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
@@ -253,7 +253,7 @@ msgstr "时间管理"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "GTD"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,task1_ids:0
@@ -270,27 +270,27 @@ msgstr "任务"
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0
 msgid "Sequence"
-msgstr "顺序"
+msgstr "序列"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,child_ids:0
 msgid "Child Timeboxes"
-msgstr ""
+msgstr "子时间箱"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_time_allinbox
 msgid "All My Timeboxes"
-msgstr ""
+msgstr "所有我的时间箱"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "截止期限"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_id:0
 msgid "Get from Timebox"
-msgstr ""
+msgstr "从时间箱"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,end:0
@@ -300,12 +300,12 @@ msgstr "取消"
 #. module: project_gtd
 #: field:project.gtd.timebox,col_date_start:0
 msgid "Date Start"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,col_planned_hours:0
 msgid "Planned Hours"
-msgstr "计划小时数"
+msgstr "计划时间"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index 3538540d566..c913f9871e4 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-18 11:07+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:49+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "订单的每个产品和服务"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -30,54 +30,54 @@ msgstr "任务"
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procure method is Make to order and supply method is produce"
-msgstr ""
+msgstr "如果采购方式是按单和供应方式是生产"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
-msgstr ""
+msgstr "如果采购类型是服务创建这任务"
 
 #. module: project_mrp
 #: field:project.task,procurement_id:0
 msgid "Procurement"
-msgstr "需求单"
+msgstr "获得"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr ""
+msgstr "产品类型是服务创建这任务"
 
 #. module: project_mrp
 #: model:ir.module.module,shortdesc:project_mrp.module_meta_information
 msgid "Project Management - MRP and Sale Integration"
-msgstr ""
+msgstr "项目管理 - MRP和销售一体化"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procure Task"
-msgstr ""
+msgstr "获得任务"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr ""
+msgstr "创建一提供服务的任务"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
 msgid "Order Task"
-msgstr ""
+msgstr "订单任务"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
 msgid "Sale Order Task"
-msgstr ""
+msgstr "销售订单任务"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
 msgid "Create Task"
-msgstr ""
+msgstr "创建任务"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "在销售订单这事务是销售服务"
diff --git a/addons/project_retro_planning/i18n/zh_CN.po b/addons/project_retro_planning/i18n/zh_CN.po
index c1f8ad4b33a..39b9160bf1d 100644
--- a/addons/project_retro_planning/i18n/zh_CN.po
+++ b/addons/project_retro_planning/i18n/zh_CN.po
@@ -4,19 +4,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:52+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
 msgid "Project Retro planning"
-msgstr ""
+msgstr "项目补充计划"
+
+#~ msgid ""
+#~ "\n"
+#~ "        - Stop date of project is change will change all the tasks of that "
+#~ "project to same number of days "
+#~ msgstr ""
+#~ "\n"
+#~ "        项目的停止日期将改变项目所有的任务日期 "
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index 6ca685cc3e5..e62d0090944 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 15:45+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 09:53+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -24,4 +24,4 @@ msgstr "项目时间表"
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
 msgid "Related Timeline Id"
-msgstr "相关的时间明细 ID"
+msgstr "有关的时间ID"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index c34ce45b746..f4f7421ccf0 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-26 14:01+0000\n"
-"Last-Translator: Varga Zoltán <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 19:39+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -834,7 +834,7 @@ msgstr "Su referencia"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "Confirmación de orden de compra Nº"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -901,4 +901,4 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Movimientos de stock"
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 6c55b7751eb..9221cfbc82b 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-21 06:56+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:53+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -24,17 +24,17 @@ msgstr "已开票并付清"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 msgid "Supplier Invoice pre-generated on receptions for control"
-msgstr "收货时预生成供应商的发票用来核对"
+msgstr "供应商发票预产生控制"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
 msgid "Destination"
-msgstr "目的货位"
+msgstr "目的地"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr "根据分拣"
+msgstr "来自领料/提货"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -44,7 +44,7 @@ msgstr "审核人"
 #. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
@@ -54,7 +54,7 @@ msgstr "供应商"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr "递送"
+msgstr "送货"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
@@ -64,12 +64,12 @@ msgstr "数量"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Order"
-msgstr "根据采购订单"
+msgstr "来自订单"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 msgid "Confirmed Purchase"
-msgstr "已确认采购"
+msgstr "已确定采购"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -91,24 +91,24 @@ msgstr "创建发票"
 msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
-msgstr "这价格表将取代默认的价格表用于当前业务伙伴采购"
+msgstr "这价格表将用于当前业务伙伴采购的价格表而不是默认的价格表"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
 msgid "Create invoice from product recept"
-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:process.process,name:purchase.process_process_purchaseprocess0
@@ -118,7 +118,7 @@ msgstr "采购流程"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 msgid "Invoice from Packing list"
-msgstr "装箱单发票"
+msgstr "从包装单创建发票"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -128,7 +128,7 @@ msgstr "批准采购"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Approved"
-msgstr "已审核通过"
+msgstr "已通过"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action4
@@ -147,7 +147,7 @@ msgstr "未完税金额"
 #: view:purchase.order.line:0
 #: field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -168,12 +168,12 @@ msgstr "采购订单"
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Regards,"
-msgstr "敬意，"
+msgstr "问候"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Total :"
-msgstr "净总额："
+msgstr "净合计:"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -190,8 +190,8 @@ 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,origin:0
@@ -201,7 +201,7 @@ msgstr "来源"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 msgid "Incoming Products"
-msgstr "入库货品"
+msgstr "接收产品"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -217,32 +217,32 @@ msgstr "手动更正"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr "参照"
+msgstr "参考"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "TVA :"
-msgstr "增值税 ："
+msgstr "增值税:"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Tel.:"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 msgid "Purchase Order lines"
-msgstr "采购订单细目"
+msgstr "采购订单明细"
 
 #. module: purchase
 #: field:purchase.order,validator:0
 msgid "Validated by"
-msgstr "审核人："
+msgstr "审核人:"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -254,11 +254,12 @@ msgid ""
 "Manual: no invoice will be pre-generated. The accountant will have to encode "
 "manually."
 msgstr ""
+"来自订单:根据采购单预先生成发票草稿,财务人员将只是验证发票控制.   来自领料/提货:根据已经验证的接收来预先产生发票草稿.  手动:没有发票预先生成"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Invoice based on deliveries"
-msgstr "根据收货分拣创建发票"
+msgstr "发票基于送货"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -273,12 +274,12 @@ msgstr "采购订单明细"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Confirmed"
-msgstr "已审核"
+msgstr "已确认"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Product Receipt"
-msgstr "接收货品"
+msgstr "产品收据"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -288,13 +289,13 @@ msgstr "确认"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr "发票核对"
+msgstr "发票控制"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr "报价请求"
+msgstr "要求报价"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -314,17 +315,17 @@ msgstr "仓库"
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr "采购订单细目"
+msgstr "订单明细"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirm Purchase order from Request for quotation without origin"
-msgstr "确认没有单据来源的报价请求转为采购订单"
+msgstr "没有询价确定采购订单"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Fax:"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -334,12 +335,12 @@ msgstr "未完税金额"
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Expected Date"
-msgstr "预计时间"
+msgstr "预计日期"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Shipping address :"
-msgstr "运货地址："
+msgstr "运货地址:"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -350,17 +351,17 @@ msgstr "采购价格表"
 #. module: purchase
 #: field:purchase.order,minimum_planned_date:0
 msgid "Planned Date"
-msgstr "计划时间"
+msgstr "计划日期"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved by Supplier"
-msgstr "供应商审核通过"
+msgstr "供应商通过"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Packing"
-msgstr "分拣"
+msgstr "包装"
 
 #. module: purchase
 #: model:ir.actions.wizard,name:purchase.purchase_order_merge
@@ -375,7 +376,7 @@ msgstr "预定目的地"
 #. module: purchase
 #: field:purchase.order,name:0
 msgid "Order Reference"
-msgstr "订单编号"
+msgstr "订单参考"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -390,27 +391,27 @@ msgstr "价格表"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "When controlling invoice from orders"
-msgstr "当从采购订单核对发票"
+msgstr "当订单控制发票时"
 
 #. module: purchase
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "Pre-generated supplier invoice to control based on order"
-msgstr "根据采购订单预生成供应商发票用来核对"
+msgstr "基于订单预产生供应商发票"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice from Purchase"
-msgstr "根据采购订单生成发票"
+msgstr "从采购产生发票"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "Packing is created for the products reception control."
-msgstr "创建分拣单用来核对货品接收"
+msgstr "产品接收控制创建包装"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -420,29 +421,29 @@ msgstr "手动"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirming Purchase"
-msgstr "确认采购订单"
+msgstr "确定采购"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "Approve Purchase order after Confirming"
-msgstr "确认后批准采购订单"
+msgstr "确定后审批通过采购订单"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Shipping Exception"
-msgstr "运送异常"
+msgstr "运输异常"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Encoded manually by the user."
-msgstr "用户手动输入。"
+msgstr "用户手动"
 
 #. 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.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -455,17 +456,17 @@ 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
 #: rml:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr "报价请求："
+msgstr "询价:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirm Purchase order from Request for quotation"
-msgstr "以报价请求确认转为采购订单"
+msgstr "从询价确定采购订单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -476,7 +477,7 @@ msgstr "审核采购订单"
 #: 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
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
@@ -487,22 +488,22 @@ msgstr "采购管理"
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Partner Ref."
-msgstr "业务伙伴编号"
+msgstr "业务伙伴参考"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Taxes :"
-msgstr "税："
+msgstr "税:"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "开发票"
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr "目的地地址"
+msgstr "目的地址"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -513,17 +514,17 @@ msgstr "采购订单明细"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr "日历视图"
+msgstr "日程表视图"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr "设置为草稿"
+msgstr "草稿"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 msgid "Purchase order is approved by supplier."
-msgstr "采购订单已由供应商批准"
+msgstr "采购订单供应商审批通过"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -539,27 +540,27 @@ msgstr "采购订单"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 msgid "Request for quotation is proposed by the system."
-msgstr "报价请求已由系统提出。"
+msgstr "询价进展"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 msgid "Packing Invoice"
-msgstr "分拣单发票"
+msgstr "包装发票"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
 msgid "Creates invoice from packin list"
-msgstr "根据分拣单生成发票"
+msgstr "从包装列表创建发票"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr "该文件已创建日期"
+msgstr "文档的创建日期"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoices"
-msgstr "递送与发票"
+msgstr "送货&发票"
 
 #. module: purchase
 #: field:purchase.order,date_order:0
@@ -569,12 +570,12 @@ msgstr "日期"
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr "生成该采购报价请求的单据编号"
+msgstr "参考的文档生成这个采购订单请求"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Tél. :"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -589,12 +590,12 @@ msgstr "计划日期"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Our Order Reference"
-msgstr "我方的采购订单编号"
+msgstr "订单参考"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "TVA:"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -604,7 +605,7 @@ msgstr "计算"
 #. module: purchase
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "你不能有两个重复的价格表版本！"
+msgstr "你不能有两个价格表版本它是重复的！"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -614,27 +615,27 @@ msgstr "取消采购订单"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Create Packing list"
-msgstr "创建分拣单"
+msgstr "创建包装单"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "When purchase order is approved , it creates its packing list."
-msgstr "当采购订单批准以后将创建分拣单。"
+msgstr "当采购订单获得批准时,它创建包装单"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr "历史"
+msgstr "日志"
 
 #. module: purchase
 #: field:purchase.order,state:0
 msgid "Order Status"
-msgstr "采购订单状态"
+msgstr "订单状态"
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -655,12 +656,12 @@ msgstr "单价"
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "财务状况"
+msgstr "财务结构"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr "报价请求编号："
+msgstr "询价"
 
 #. module: purchase
 #: field:purchase.order,invoice_id:0
@@ -700,13 +701,13 @@ msgstr "合并采购订单"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action_new
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
 msgid "New Purchase Order"
-msgstr "新建采购订单"
+msgstr "新的采购订单"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
@@ -723,12 +724,12 @@ msgstr "报价请求"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Out Packing"
-msgstr "发货分拣单"
+msgstr "发出的包装"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Control invoices on receptions"
-msgstr "接收时核对发票"
+msgstr "控制发票在接收"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -738,16 +739,14 @@ msgstr "要求日期"
 #. module: purchase
 #: field:purchase.order,date_approve:0
 msgid "Date Approved"
-msgstr "批准日期"
+msgstr "通过日期"
 
 #. module: purchase
 #: model:ir.module.module,description:purchase.module_meta_information
 msgid ""
 "Module for purchase management\n"
 "    Request for quotation, Create Supplier Invoice, Print Order..."
-msgstr ""
-"采购管理模块\\n\n"
-"    报价请求,创建供应商发票，打印采购订单。。"
+msgstr "采购管理模块报价,创建供应商发票,打印单据.."
 
 #. module: purchase
 #: field:purchase.order.line,product_id:0
@@ -764,23 +763,23 @@ msgstr "说明"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "Product recept invoice"
-msgstr "货品接收的发票"
+msgstr "产品接收发票"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr "预定送货地址："
+msgstr "预期交货地址:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action3
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
 msgid "Purchase Order Waiting Approval"
-msgstr "采购订单等待批准"
+msgstr "等待审批的采购订单"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 msgid "Confirming Purchase Order"
-msgstr "正在确认采购定单"
+msgstr "确定采购订单"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -795,7 +794,7 @@ msgstr "预定"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "Purchase order is confirmed by the user."
-msgstr "采购订单已由该用户确认。"
+msgstr "采购订单用户确定"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
@@ -805,33 +804,33 @@ msgstr "采购发票"
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Your Order Reference"
-msgstr "您的订单编号"
+msgstr "你订单参考"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr "采购订单确认编号"
+msgstr "采购订单确认"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr "总金额"
+msgstr "金额合计"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Date Ordered"
-msgstr "订货日期"
+msgstr "订购日期"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr "采购管理"
+msgstr "采购控制"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
 msgid "Request For Quotations"
-msgstr "报价请求"
+msgstr "询价"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -841,22 +840,22 @@ msgstr "开票方式"
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr "批准"
+msgstr "通过"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 msgid "Approved Purchase"
-msgstr "已批准采购"
+msgstr "通过采购"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
 msgid "From Packing list, Create invoice."
-msgstr "从分拣单创建发票"
+msgstr "从包装单创建发票"
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: purchase
 #: wizard_view:purchase.order.merge,init:0
@@ -866,7 +865,7 @@ msgstr "你确定要合并此订单吗？"
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approving Purchase Order"
-msgstr "正在批准采购订单"
+msgstr "通过采购订单"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -876,4 +875,13 @@ msgstr "采购订单审批通过后创建供应商发票"
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr "库存调拨列表"
+msgstr "仓库调拨"
+
+#~ msgid "Purchase Order Lines"
+#~ msgstr "采购订单明细"
+
+#~ msgid "Invoicing"
+#~ msgstr "发票"
+
+#~ msgid "Address"
+#~ msgstr "地址"
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index f9006fb7d48..6548e5a5257 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:56+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "辅助核算分配"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr ""
+msgstr "采购辅助核算分配管理"
 
 #. module: purchase_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
diff --git a/addons/report_account/i18n/zh_CN.po b/addons/report_account/i18n/zh_CN.po
index 5ac78aaeb98..c3e42db49fc 100644
--- a/addons/report_account/i18n/zh_CN.po
+++ b/addons/report_account/i18n/zh_CN.po
@@ -4,48 +4,48 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 15:53+0000\n"
-"Last-Translator: baomin <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:57+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "客户退款"
 
 #. module: report_account
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "月度"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "客户发票"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "发票建立在15天前"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "最近15天创建的发票报表"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
@@ -55,7 +55,7 @@ msgstr "供应商发票"
 #. module: report_account
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "省"
+msgstr "状态"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
@@ -65,177 +65,180 @@ msgstr "草稿"
 #. module: report_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中输入的对象名称错误"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_account
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: report_account
 #: field:report.account.receivable,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "科目类型"
 
 #. module: report_account
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: report_account
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "金额合计"
 
 #. module: report_account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "剩余的"
 
 #. module: report_account
 #: field:report.invoice.created,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "发票日期"
 
 #. module: report_account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "科目类型"
 
 #. module: report_account
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "发票编号"
 
 #. module: report_account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "未完税"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "到今天旧的应收款"
 
 #. module: report_account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "应收款科目"
 
 #. module: report_account
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "到期日"
 
 #. module: report_account
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "贷方"
 
 #. module: report_account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "范围"
 
 #. module: report_account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "在基础账户模块里增加新的报表模块"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "供应商退款"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: report_account
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "余额"
 
 #. module: report_account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "科目报表-报表"
 
 #. module: report_account
 #: field:report.invoice.created,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "源"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "科目余额"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Invoices"
-msgstr ""
+msgstr "发票"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "形式发票"
 
 #. module: report_account
 #: field:report.invoice.created,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "货币"
 
 #. module: report_account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "年里的周"
 
 #. module: report_account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "旧的应收款"
 
 #. module: report_account
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: report_account
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "未完税金额"
+
+#~ msgid "A Temporary table used for Dashboard view"
+#~ msgstr "控制台视图使用的临时表"
diff --git a/addons/report_analytic/i18n/zh_CN.po b/addons/report_analytic/i18n/zh_CN.po
index 17adcd1ea9d..7c59dc21156 100644
--- a/addons/report_analytic/i18n/zh_CN.po
+++ b/addons/report_analytic/i18n/zh_CN.po
@@ -7,79 +7,79 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:57+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
 #: model:ir.model,name:report_analytic.model_report_analytic_account_close
 msgid "Analytic account to close"
-msgstr ""
+msgstr "辅助核算项关闭"
 
 #. module: report_analytic
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以x_开头并且不能含有特殊字符"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity_max:0
 msgid "Max. Quantity"
-msgstr ""
+msgstr "最大数量"
 
 #. module: report_analytic
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,name:0
 msgid "Analytic account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,state:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "截止期限"
 
 #. module: report_analytic
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中无效的模块名"
 
 #. module: report_analytic
 #: model:ir.module.module,shortdesc:report_analytic.module_meta_information
 msgid "Analytic Account Reporting"
-msgstr ""
+msgstr "辅助核算项报表"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "差额"
 
 #. module: report_analytic
 #: model:ir.actions.act_window,name:report_analytic.action_analytic_account_tree
 #: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
 #: view:report.analytic.account.close:0
 msgid "Expired analytic accounts"
-msgstr ""
+msgstr "过期的辅助核算项"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
diff --git a/addons/report_analytic_line/i18n/zh_CN.po b/addons/report_analytic_line/i18n/zh_CN.po
index 9d331c042b5..09a9234d97a 100644
--- a/addons/report_analytic_line/i18n/zh_CN.po
+++ b/addons/report_analytic_line/i18n/zh_CN.po
@@ -4,87 +4,90 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:14+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:57+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
 msgid "Lines to Invoice"
-msgstr ""
+msgstr "辅助核算开发票"
 
 #. module: report_analytic_line
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: report_analytic_line
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.action_account_analytic_line_to_invoice
 #: model:ir.ui.menu,name:report_analytic_line.account_analytic_lines_to_invoice_report
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines to Invoice"
-msgstr ""
+msgstr "辅助核算的发票"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,sale_price:0
 msgid "Sale price"
-msgstr ""
+msgstr "售价"
 
 #. module: report_analytic_line
 #: model:ir.module.module,shortdesc:report_analytic_line.module_meta_information
 msgid "Analytic lines - Reporting"
-msgstr ""
+msgstr "辅助核算 - 报表"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,name:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,account_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: report_analytic_line
 #: model:ir.model,name:report_analytic_line.model_report_account_analytic_line_to_invoice
 msgid "Analytic lines to invoice report"
-msgstr ""
+msgstr "辅助核算开的发票报表"
 
 #. module: report_analytic_line
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,unit_amount:0
 msgid "Units"
-msgstr ""
+msgstr "单位"
 
 #. module: report_analytic_line
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "计量单位"
+
+#~ msgid "A report on analytic lines, costs by products, months and accounts."
+#~ msgstr "辅助核算明细的报表:产品成本,月度和科目"
diff --git a/addons/report_analytic_planning/i18n/zh_CN.po b/addons/report_analytic_planning/i18n/zh_CN.po
index 1d2cae18663..c52fb236960 100644
--- a/addons/report_analytic_planning/i18n/zh_CN.po
+++ b/addons/report_analytic_planning/i18n/zh_CN.po
@@ -7,187 +7,187 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 09:58+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "To:"
-msgstr ""
+msgstr "到:"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning by Account"
-msgstr ""
+msgstr "计划科目"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr ""
+msgstr "项目摘要"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr ""
+msgstr "数量(计量单位)"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "有责任的"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr ""
+msgstr "计划统计"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: report_analytic_planning
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在动作定义中无效的模块名"
 
 #. module: report_analytic_planning
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须是以x_开头并且不能包含特殊的字符"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr ""
+msgstr "计划统计"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_account
 msgid "Planning account stat"
-msgstr ""
+msgstr "计划科目统计"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned hours"
-msgstr ""
+msgstr "计划时间"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Real"
-msgstr ""
+msgstr "真"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my
 msgid "My Planning Statistics"
-msgstr ""
+msgstr "我的计划统计"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,description:report_analytic_planning.module_meta_information
 msgid "Planning on analytic accounts."
-msgstr ""
+msgstr "辅助核算项计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr ""
+msgstr "计划名"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Quantities"
-msgstr ""
+msgstr "数量"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr ""
+msgstr "人力资源计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.account,sum_amount_real:0
 #: field:report_account_analytic.planning.stat.user,sum_amount_real:0
 msgid "Timesheet"
-msgstr ""
+msgstr "时间表"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning:0
 msgid "Planning Line"
-msgstr ""
+msgstr "计划明细"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Responsible:"
-msgstr ""
+msgstr "有责任的:"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,amount:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by Account"
-msgstr ""
+msgstr "科目数量"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "From:"
-msgstr ""
+msgstr "从:"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by Account"
-msgstr ""
+msgstr "时间科目"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "结束时间"
 
 #. module: report_analytic_planning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Time by User"
-msgstr ""
+msgstr "用户时间"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_my_manager_form
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_stat_my_manager
 msgid "Planning Statistics of My Projects"
-msgstr ""
+msgstr "我的项目计划统计"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current
 msgid "Current Planning"
-msgstr ""
+msgstr "当前的计划"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr ""
+msgstr "用户摘要"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Analysis"
-msgstr ""
+msgstr "辅助核算"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -195,39 +195,39 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,user_id:0
 #: field:report_account_analytic.planning.stat.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Timesheet"
-msgstr ""
+msgstr "总时间表"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 msgid "Details of user's time by projects"
-msgstr ""
+msgstr "项目用户时间详情"
 
 #. module: report_analytic_planning
 #: model:ir.model,name:report_analytic_planning.model_report_account_analytic_planning_stat_user
 msgid "Planning user stat"
-msgstr ""
+msgstr "计划用户统计"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat.account,quantity:0
 #: field:report_account_analytic.planning.stat.user,quantity:0
 msgid "Planned"
-msgstr ""
+msgstr "已计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr ""
+msgstr "计划辅助核算"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -237,12 +237,12 @@ msgstr ""
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr ""
+msgstr "计划明细"
 
 #. module: report_analytic_planning
 #: model:ir.module.module,shortdesc:report_analytic_planning.module_meta_information
 msgid "Analytic planning - Reporting"
-msgstr ""
+msgstr "辅助核算计划 - 报表"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -253,49 +253,49 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_my2
 msgid "My Planning"
-msgstr ""
+msgstr "我的计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_user_ids:0
 msgid "Planning by user"
-msgstr ""
+msgstr "用户计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,stat_account_ids:0
 msgid "Planning by account"
-msgstr ""
+msgstr "科目计划"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Quantities by User"
-msgstr ""
+msgstr "用户数量"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_current_my
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_current_my
 msgid "My Current Planning"
-msgstr ""
+msgstr "我当前的计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat.account,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "管理人员"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form
@@ -310,35 +310,35 @@ msgstr ""
 #: field:report_account_analytic.planning.stat.account,planning_id:0
 #: field:report_account_analytic.planning.stat.user,planning_id:0
 msgid "Planning"
-msgstr ""
+msgstr "计划"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Planned"
-msgstr ""
+msgstr "总计划"
 
 #. module: report_analytic_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: report_analytic_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr ""
+msgstr "计划统计"
 
 #. module: report_analytic_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr ""
+msgstr "打开"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_form_new
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
-msgstr ""
+msgstr "新计划"
diff --git a/addons/report_crm/i18n/zh_CN.po b/addons/report_crm/i18n/zh_CN.po
index 5a9c2eafb64..d3699752252 100644
--- a/addons/report_crm/i18n/zh_CN.po
+++ b/addons/report_crm/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 07:25+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:58+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
@@ -25,34 +25,34 @@ msgstr "分类"
 #: field:report.crm.case.categ,probability:0
 #: field:report.crm.case.user,probability:0
 msgid "Avg. Probability"
-msgstr "平均. 概率"
+msgstr "平均概率"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,planned_revenue:0
 msgid "Planned Revenue"
-msgstr "计划收入"
+msgstr "已计划收入"
 
 #. module: report_crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_categ
 msgid "Cases by section and category"
-msgstr "按组和分类排列案例"
+msgstr "业务个案项和分类"
 
 #. module: report_crm
 #: field:report.crm.case.categ,section_id:0
 #: field:report.crm.case.section,section_id:0
 #: field:report.crm.case.user,section_id:0
 msgid "Section"
-msgstr "组"
+msgstr "项"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,user_id:0
 msgid "Responsible"
-msgstr "负责的"
+msgstr "有责任的"
 
 #. module: report_crm
 #: field:report.crm.case.section,perc_done:0
@@ -62,30 +62,30 @@ msgstr "%完成"
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,planned_cost:0
 msgid "Planned Costs"
-msgstr "计划成本"
+msgstr "已计划成本"
 
 #. module: report_crm
 #: field:report.crm.case.section,nbr_cases:0
 #: field:report.crm.case.user,nbr:0
 msgid "# of Cases"
-msgstr "# 案例"
+msgstr "业务个案"
 
 #. module: report_crm
 #: model:ir.module.module,shortdesc:report_crm.module_meta_information
 msgid "CRM Management - Reporting"
-msgstr "客户关系管理-报表"
+msgstr "客户关系管理 - 报表"
 
 #. module: report_crm
 #: field:report.crm.case.categ,delay_close:0
 msgid "Delay Close"
-msgstr "办理期"
+msgstr "延迟关闭"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_section_tree
 #: model:ir.model,name:report_crm.model_report_crm_case_section
 #: view:report.crm.case.section:0
 msgid "Cases by Section"
-msgstr "按组排列案例"
+msgstr "业务个案项"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
@@ -99,13 +99,13 @@ msgstr "草稿"
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Closed"
-msgstr "已关闭"
+msgstr "关闭"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree_month
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree_month
 msgid "Cases by categories and section (this month)"
-msgstr "按(该月)分类和组排列案例"
+msgstr "业务个案分类和项(该月)"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_66
@@ -122,7 +122,7 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #: field:report.crm.case.categ,amount_revenue_prob:0
 #: field:report.crm.case.user,amount_revenue_prob:0
 msgid "Est. Rev*Prob."
-msgstr "评估收入乘以可能性"
+msgstr "估计收入 × 概率"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
@@ -134,7 +134,7 @@ msgstr "未决"
 #. module: report_crm
 #: field:report.crm.case.section,avg_answers:0
 msgid "Avg. Answers"
-msgstr "回答平均值"
+msgstr "平均回答"
 
 #. module: report_crm
 #: field:report.crm.case.categ,state:0
@@ -152,33 +152,33 @@ msgstr "说明"
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month
 msgid "Cases by user and section (this month)"
-msgstr "按(该月)用户和组排列案例"
+msgstr "用户业务个案和项(该月)"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_user
 msgid "Monthly cases by user"
-msgstr "按用户排列月度案例"
+msgstr "月度用户业务个案"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_64
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "Planned costs"
-msgstr "计划成本"
+msgstr "已计划成本"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_view_closed_crm_case_dashboard
 msgid "Closed CRM Cases Within Past 15 Days"
-msgstr "关闭15天前的客户关系管理案例"
+msgstr "关闭15天前的客户关系管理业务个案"
 
 #. module: report_crm
 #: field:report.crm.case.categ,amount_costs:0
 #: field:report.crm.case.user,amount_costs:0
 msgid "Est.Cost"
-msgstr "评估成本"
+msgstr "估计成本"
 
 #. module: report_crm
 #: field:report.crm.case.user,user_id:0
@@ -188,7 +188,7 @@ msgstr "用户"
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_section_2_report_crm_case_categ
 msgid "Monthly cases by section"
-msgstr "按组排列月度案例"
+msgstr "月度业务个案项"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,date:0
@@ -199,7 +199,7 @@ msgstr "日期"
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_month_my
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_month_my
 msgid "My cases by section (this month)"
-msgstr "我的按组排列的案例(该月)"
+msgstr "我的业务个案项(该月)"
 
 #. module: report_crm
 #: model:ir.ui.menu,name:report_crm.next_id_65
@@ -209,7 +209,7 @@ msgstr "本月"
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_view_open_crm_case_dashboard
 msgid "Open CRM Cases Within Past 15 Days"
-msgstr "15天前的未结客户关系管理案例"
+msgstr "打开15天前的客户关系管理业务个案"
 
 #. module: report_crm
 #: constraint:ir.ui.view:0
@@ -219,7 +219,7 @@ msgstr "无效XML视图结构!"
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_service_dashboard
 msgid "Report of Closed and Open CRM Cases within past 15 days"
-msgstr "15天前关闭或未结的客户关系管理案例报表"
+msgstr "关闭报表和打开15天前的客户关系管理业务个案"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree
@@ -227,24 +227,24 @@ msgstr "15天前关闭或未结的客户关系管理案例报表"
 #: view:report.crm.case.categ:0
 #: view:report.crm.case.user:0
 msgid "Cases by User and Section"
-msgstr "按用户和组排列案例"
+msgstr "用户业务个案和项"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.act_crm_case_categ_2_report_crm_case_categ
 #: model:ir.actions.act_window,name:report_crm.act_res_users_2_report_crm_case_user
 msgid "Monthly cases"
-msgstr "月度案例"
+msgstr "月度业务个案"
 
 #. module: report_crm
 #: field:report.crm.case.categ,amount_revenue:0
 #: field:report.crm.case.user,amount_revenue:0
 msgid "Est.Revenue"
-msgstr "评估收入"
+msgstr "估计收入"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,date_closed:0
 msgid "Date Closed"
-msgstr "关闭日期"
+msgstr "结束日期"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,priority:0
@@ -260,38 +260,38 @@ msgstr "%取消"
 #: field:report.crm.case.section,delay_close:0
 #: field:report.crm.case.user,delay_close:0
 msgid "Delay to close"
-msgstr "办理期"
+msgstr "延迟关闭"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_categ_tree
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_categ_tree
 msgid "Cases by Categories and Section"
-msgstr "按分类和组排列案例"
+msgstr "业务个案分类和项"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "CRM Cases"
-msgstr "客户关系管理案例"
+msgstr "客户关系管理业务个案"
 
 #. module: report_crm
 #: model:ir.actions.act_window,name:report_crm.action_report_crm_case_user_tree_my
 #: model:ir.ui.menu,name:report_crm.menu_crm_case_user_tree_my
 msgid "My cases by section"
-msgstr "我的按组排列案例"
+msgstr "我的业务个案项"
 
 #. module: report_crm
 #: field:report.crm.case.categ,name:0
 #: field:report.crm.case.section,name:0
 #: field:report.crm.case.user,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,create_date:0
@@ -306,7 +306,7 @@ msgstr "最后期限"
 #. module: report_crm
 #: model:ir.model,name:report_crm.model_report_crm_case_user
 msgid "Cases by user and section"
-msgstr "按用户和组排列案例"
+msgstr "用户业务个案和项"
 
 #. module: report_crm
 #: field:report.crm.case.service.dashboard,partner_id:0
@@ -318,16 +318,16 @@ msgstr "业务伙伴"
 msgid ""
 "A module that adds new reports based on CRM cases.\n"
 "    Case By section, Case By category"
-msgstr ""
+msgstr "这模块增加一新报表基于客户关系管理业务个案,项业务个案,分类业务个案"
 
 #. module: report_crm
 #: selection:report.crm.case.categ,state:0
 #: selection:report.crm.case.service.dashboard,state:0
 #: selection:report.crm.case.user,state:0
 msgid "Open"
-msgstr "未结"
+msgstr "待处理"
 
 #. module: report_crm
 #: view:report.crm.case.service.dashboard:0
 msgid "Planned revenue"
-msgstr "计划收入"
+msgstr "已计划收入"
diff --git a/addons/report_document/i18n/zh_CN.po b/addons/report_document/i18n/zh_CN.po
index 9e99ada9516..626abb32638 100644
--- a/addons/report_document/i18n/zh_CN.po
+++ b/addons/report_document/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 08:55+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 09:59+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
@@ -31,7 +31,7 @@ msgstr "月度文件"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_wall
@@ -43,19 +43,19 @@ msgstr "羞愧者名单"
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr "按业务伙伴排列文件详情"
+msgstr "业务伙伴文件详细信息"
 
 #. module: report_document
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr "文件大小"
+msgstr "文件尺寸"
 
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
@@ -71,37 +71,37 @@ msgstr "我的文件"
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "按用户排列文件"
+msgstr "用户文件"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files"
-msgstr "文件列表"
+msgstr "文件"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr "按月度排列文件"
+msgstr "每月的文件"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr "我的文件（所有月份）"
+msgstr "我的文件(所有月份)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr "最近上传的文件"
+msgstr "最近发布的文件名"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr "一个月内没有新文件的用户"
+msgstr "一个月以来用户没有新文件"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
@@ -117,7 +117,7 @@ msgstr "目录类型"
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr "按业务伙伴排列文件"
+msgstr "业务伙伴文件"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this
@@ -133,36 +133,36 @@ msgstr "用户"
 #. module: report_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr "所有用户的文件"
+msgstr "所有用户文件"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr "我的文件（本月）"
+msgstr "我的文件(这月)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_user
 msgid "Files details by Users"
-msgstr "用户的文件详情"
+msgstr "用户详细信息"
 
 #. module: report_document
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr "所有者"
+msgstr "拥有者"
 
 #. module: report_document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr "文件数目"
+msgstr "文件号"
 
 #. module: report_document
 #: field:report.document.user,directory:0
@@ -173,22 +173,22 @@ msgstr "目录"
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_user_graph
 msgid "Files By Users"
-msgstr "用户的文件"
+msgstr "用户文件"
 
 #. module: report_document
 #: model:ir.module.module,shortdesc:report_document.module_meta_information
 msgid "Document Management - Reporting"
-msgstr "文档管理——报表"
+msgstr "文档管理 - 报表"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree1
 msgid "All Users files (All months)"
-msgstr "所有用户的文件（所有月份）"
+msgstr "所有文件(所有月份)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_file
 msgid "Files details by Directory"
-msgstr "按目录排列文件详情"
+msgstr "文件详细目录"
 
 #. module: report_document
 #: field:report.document.user,change_date:0
@@ -200,7 +200,7 @@ msgstr "修改日期"
 #: model:ir.actions.act_window,name:report_document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr "按月度排列文件大小"
+msgstr "这月的文件大小"
 
 #. module: report_document
 #: field:report.document.user,file_title:0
@@ -216,24 +216,24 @@ msgstr "文件名"
 #: field:report.document.wall,name:0
 #: field:report.files.partner,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr "按月度排列文件"
+msgstr "这月的文件"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr "按资源类型排列文件"
+msgstr "文件的资源类型"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr "所有用户的文件（本月）"
+msgstr "所有文件(所有月份)"
 
 #. module: report_document
 #: field:report.document.wall,last:0
@@ -245,3 +245,19 @@ msgstr "最近的发布时间"
 #: field:report.files.partner,partner:0
 msgid "Partner"
 msgstr "业务伙伴"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Reporting for the Document Management module:\n"
+#~ "    * My Files\n"
+#~ "    * All users Files \n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    报告文档管理模块:\n"
+#~ "\t\t- 我的文件\n"
+#~ "\t\t- 所有用户的文件 \n"
+#~ "    "
+
+#~ msgid "Files Per Partner"
+#~ msgstr "每个业务伙伴文件"
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index dbe5946dfb5..06009a43b55 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-21 12:25+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:00+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名必须要以x_开头并且不能含有特殊字符"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr "已取消发票"
+msgstr "已取消的发票"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr "折扣（％）"
+msgstr "折扣 (%)"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree
@@ -51,12 +51,12 @@ msgstr "单价"
 #. module: report_intrastat
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "这动作定义中无效的模块名"
 
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr "时段"
+msgstr "会计周期"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -66,22 +66,22 @@ msgstr "所有月份"
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Import"
-msgstr "导入"
+msgstr "收入"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr "文件"
+msgstr "文档"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -92,7 +92,7 @@ msgstr "税:"
 #: rml:account.invoice.intrastat:0
 #: field:report.intrastat.code,description:0
 msgid "Description"
-msgstr "说明"
+msgstr "描述"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
@@ -117,12 +117,12 @@ msgstr "内部统计报告-报告"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "基于"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -137,22 +137,22 @@ msgstr "本月"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr "业务伙伴参照"
+msgstr "业务伙伴参考"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "总计(含税)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr "退款"
+msgstr "退还"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
@@ -167,12 +167,12 @@ msgstr "发票"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr "税款"
+msgstr "税"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr "总计"
+msgstr "金额"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -182,7 +182,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr "数值"
+msgstr "价格"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -199,7 +199,7 @@ msgstr "发票草稿"
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "供应单位"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -212,7 +212,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr "来源"
+msgstr "源"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -228,7 +228,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr "税目"
+msgstr "税"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
@@ -243,22 +243,22 @@ msgstr "货币"
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr "导出"
+msgstr "支出"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr "供应商退款"
+msgstr "供应商退还"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "总计(不含税)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
diff --git a/addons/report_mrp/i18n/zh_CN.po b/addons/report_mrp/i18n/zh_CN.po
index 56a40c5219c..fe2e2ea6dd8 100644
--- a/addons/report_mrp/i18n/zh_CN.po
+++ b/addons/report_mrp/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 08:45+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:01+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
@@ -25,18 +25,18 @@ msgstr "周"
 #. module: report_mrp
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: report_mrp
 #: model:ir.ui.menu,name:report_mrp.next_id_77
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_mrp
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
@@ -51,7 +51,7 @@ msgstr "工作中心负荷"
 #. module: report_mrp
 #: model:ir.module.module,shortdesc:report_mrp.module_meta_information
 msgid "MRP Management - Reporting"
-msgstr "MRP管理—报表"
+msgstr "MRP管理 - 报表"
 
 #. module: report_mrp
 #: field:report.mrp.inout,value:0
@@ -88,15 +88,20 @@ msgstr "每周库存值变动"
 #. module: report_mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
 msgid "Stock value variation"
-msgstr "库存值变动"
+msgstr "库存值变化"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenter load"
 msgstr "工作中心负荷"
+
+#~ msgid ""
+#~ "A module that adds new reports based on MRP cases.\n"
+#~ "    Workcenter loads, Weekly Stock value variation"
+#~ msgstr "这模块增加新的报表基于MRP业务个案,工作中心负荷,每周的库存变化"
diff --git a/addons/report_project/i18n/zh_CN.po b/addons/report_project/i18n/zh_CN.po
index 802f5f45631..f1d6f04d9e5 100644
--- a/addons/report_project/i18n/zh_CN.po
+++ b/addons/report_project/i18n/zh_CN.po
@@ -7,70 +7,70 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-16 01:45+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:02+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree_month
 msgid "Tasks finished by project (this month)"
-msgstr ""
+msgstr "项目的完成的任务(这月)"
 
 #. module: report_project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以x_开头并且不能含有特殊字符"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree
 msgid "Tasks Closed by Project and User"
-msgstr ""
+msgstr "项目和用户关闭的任务"
 
 #. module: report_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "这动作定义中无效的模块名"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
 msgid "Tasks finished by project and user (this month)"
-msgstr ""
+msgstr "项目和用户完成的任务(这月)"
 
 #. module: report_project
 #: field:report.project.task,hours_effective:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "有效时间"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr "用户的任务和项目"
+msgstr "项目和用户的任务"
 
 #. module: report_project
 #: field:report.project.task,task_closed:0
 #: field:report.project.task.user,task_closed:0
 msgid "Task Closed"
-msgstr ""
+msgstr "任务关闭"
 
 #. module: report_project
 #: view:report.project.task:0
 msgid "Tasks by Project"
-msgstr "项目任务"
+msgstr "项目的任务"
 
 #. module: report_project
 #: model:ir.module.module,shortdesc:report_project.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr "销售管理——报表"
+msgstr "销售管理 - 报表"
 
 #. module: report_project
 #: field:report.project.task.user,user_id:0
@@ -80,7 +80,7 @@ msgstr "用户"
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by Project and User"
-msgstr ""
+msgstr "项目和用户的任务"
 
 #. module: report_project
 #: model:ir.ui.menu,name:report_project.next_id_63
@@ -90,12 +90,12 @@ msgstr "本月"
 #. module: report_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效的视图结构xml文件"
 
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by projects and users"
-msgstr "按项目和用户的任务"
+msgstr "项目和用户的任务"
 
 #. module: report_project
 #: field:report.project.task,project_id:0
@@ -107,13 +107,13 @@ msgstr "项目"
 #: field:report.project.task,closing_days:0
 #: field:report.project.task.user,closing_days:0
 msgid "Avg Closing Delay"
-msgstr "平均延迟关闭"
+msgstr "平均关闭延迟"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task
 #: view:report.project.task:0
 msgid "Tasks by project"
-msgstr "按项目任务"
+msgstr "项目任务"
 
 #. module: report_project
 #: field:report.project.task,hours_delay:0
@@ -131,7 +131,7 @@ msgstr "月"
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree
 msgid "Tasks Closed by Project"
-msgstr ""
+msgstr "项目关闭的任务"
 
 #. module: report_project
 #: field:report.project.task,hours_planned:0
diff --git a/addons/report_purchase/i18n/zh_CN.po b/addons/report_purchase/i18n/zh_CN.po
index 47f4e0f60b6..6df88e5462a 100644
--- a/addons/report_purchase/i18n/zh_CN.po
+++ b/addons/report_purchase/i18n/zh_CN.po
@@ -4,23 +4,23 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-03 13:39+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:09+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_average:0
 #: field:report.purchase.order.product,price_average:0
 msgid "Average Price"
-msgstr "均价"
+msgstr "平均价格"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,state:0
@@ -33,23 +33,23 @@ msgstr "订单状态"
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category_all
 #: view:report.purchase.order.category:0
 msgid "Purchases by Category of Products"
-msgstr "商品种类采购情况"
+msgstr "产品采购类别"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_product
 msgid "Purchases Orders by Products"
-msgstr "商品采购订单"
+msgstr "产品采购订单"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product_all
 msgid "Purchases by Products"
-msgstr "商品采购情况"
+msgstr "产品采购"
 
 #. module: report_purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中无效的模块名"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_75
@@ -60,29 +60,29 @@ msgstr "所有月份"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Waiting Schedule"
-msgstr "等待安排"
+msgstr "等待的计划调度"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product
 msgid "Purchases by Products (this month)"
-msgstr "商品采购情况（本月）"
+msgstr "采购的产品(这月)"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_category
 msgid "Purchases Orders by Categories"
-msgstr "分类采购订单"
+msgstr "采购订单的类别"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "产品"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_73
@@ -92,7 +92,7 @@ msgstr "报表"
 #. module: report_purchase
 #: model:ir.module.module,shortdesc:report_purchase.module_meta_information
 msgid "Purchase Management - Reporting"
-msgstr "采购管理——报表"
+msgstr "采购管理 - 报表"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
@@ -104,24 +104,24 @@ msgstr "发票异常"
 #: field:report.purchase.order.category,price_total:0
 #: field:report.purchase.order.product,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "总价格"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,quantity:0
 #: field:report.purchase.order.product,quantity:0
 msgid "# of Products"
-msgstr "商品数"
+msgstr "产品#"
 
 #. module: report_purchase
 #: view:report.purchase.order.product:0
 msgid "Purchases by products"
-msgstr "商品采购情况"
+msgstr "产品采购"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.act_product_category_2_report_purchase_order_category
 #: model:ir.actions.act_window,name:report_purchase.act_product_product_2_report_purchases_order_product
 msgid "Monthly purchases"
-msgstr "月度采购"
+msgstr "每月采购"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_74
@@ -135,63 +135,65 @@ msgid ""
 "    Purchase By Product, Purchase By Category of Product, All Months, "
 "Current Month."
 msgstr ""
+"模块增加视图\n"
+"    产品采购, 产品采购类型, 所有月份, 当前月份."
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Quotation"
-msgstr "报价单"
+msgstr "数量"
 
 #. module: report_purchase
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Manual in progress"
-msgstr "正在手工处理"
+msgstr "手动进展"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category
 msgid "Purchases by Category of Product (this month)"
-msgstr "商品种类采购情况（本月）"
+msgstr "产品采购类型(这月)"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Shipping Exception"
-msgstr "发货例外项"
+msgstr "运输异常"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "In progress"
-msgstr "正在处理"
+msgstr "进展"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,name:0
 #: field:report.purchase.order.product,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,count:0
 msgid "# of Lines"
-msgstr "行数"
+msgstr "明细#"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Done"
-msgstr "已完成"
+msgstr "完成"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,category_id:0
 msgid "Categories"
-msgstr "分类"
+msgstr "类别"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
diff --git a/addons/report_sale/i18n/zh_CN.po b/addons/report_sale/i18n/zh_CN.po
index 59b328e84e6..99ffaf6c888 100644
--- a/addons/report_sale/i18n/zh_CN.po
+++ b/addons/report_sale/i18n/zh_CN.po
@@ -4,73 +4,73 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-07 08:07+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
 msgid "In Progress"
-msgstr "进行中"
+msgstr "进展"
 
 #. module: report_sale
 #: field:report.sale.order.category,price_average:0
 #: field:report.sale.order.product,price_average:0
 msgid "Average Price"
-msgstr "均价"
+msgstr "平均价"
 
 #. module: report_sale
 #: field:report.sale.order.category,state:0
 #: field:report.sale.order.created,state:0
 #: field:report.sale.order.product,state:0
 msgid "Order State"
-msgstr "订单状态"
+msgstr "状态"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_created
 msgid "Report of Created Sale Order"
-msgstr "已创建销售单的报表"
+msgstr "创建销售订单报表"
 
 #. module: report_sale
 #: view:report.sale.order.category:0
 msgid "Sales Orders by category"
-msgstr "按类别分类的销售订单"
+msgstr "销售订单分类"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_6
 #: model:ir.report.custom,title:report_sale.ir_report_custom_6
 msgid "Monthly cumulated sales turnover over one year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_product
 msgid "Sales Orders by Products"
-msgstr "按商品分类的销售订单"
+msgstr "销售订单产品"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu1
 msgid "Monthly Sales Turnover Over One Year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_turnover_product_tree
 #: model:ir.model,name:report_sale.model_report_turnover_per_product
 #: view:report.turnover.per.product:0
 msgid "Turnover Per Product"
-msgstr ""
+msgstr "每产品的营业额"
 
 #. module: report_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_82
@@ -81,54 +81,54 @@ msgstr "所有月份"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Waiting Schedule"
-msgstr "等待安排"
+msgstr "等待调度"
 
 #. module: report_sale
 #: field:report.sale.order.category,price_total:0
 #: field:report.sale.order.product,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "价格合计"
 
 #. module: report_sale
 #: field:report.sale.order.product,product_id:0
 #: field:report.turnover.per.product,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "产品"
 
 #. module: report_sale
 #: model:ir.model,name:report_sale.model_report_sale_order_category
 msgid "Sales Orders by Categories"
-msgstr "按类别分类的销售单列表"
+msgstr "销售订单分类"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_sale_list
 #: model:ir.ui.menu,name:report_sale.menu_report_order_sale_list
 msgid "Sales of the Month"
-msgstr "月度销售情况"
+msgstr "这月的销售"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_product_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product
 msgid "Sales by Product (this month)"
-msgstr "商品销售情况（本月）"
+msgstr "销售的产品(这月)"
 
 #. module: report_sale
 #: field:report.sale.order.created,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr "发运地址"
+msgstr "运输地址"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_4
 #: model:ir.report.custom,title:report_sale.ir_report_custom_4
 msgid "Monthly sales turnover over one year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
@@ -140,37 +140,37 @@ msgstr "发票异常"
 #. module: report_sale
 #: model:ir.module.module,shortdesc:report_sale.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr "销售管理——报表"
+msgstr "销售管理 - 报表"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree_all
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category_all
 #: view:report.sale.order.category:0
 msgid "Sales by Category of Products"
-msgstr "商品分类的销售情况"
+msgstr "销售的产品分类"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu3
 msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr ""
+msgstr "一年内月累积营业额"
 
 #. module: report_sale
 #: field:report.sale.order.category,quantity:0
 #: field:report.sale.order.product,quantity:0
 msgid "# of Products"
-msgstr "商品数量"
+msgstr "产品#"
 
 #. module: report_sale
 #: field:report.sale.order.created,name:0
 msgid "Order Reference"
-msgstr "订单引用"
+msgstr "订单参考"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_sale.menu_report_order_product_all
 #: view:report.sale.order.product:0
 msgid "Sales by Product"
-msgstr "商品销售情况"
+msgstr "销售的产品"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_81
@@ -197,34 +197,34 @@ msgstr "客户"
 #. module: report_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_view_created_sale_order_dashboard
 msgid "Created Sale Orders"
-msgstr "已创建的销售订单列表"
+msgstr "创建销售订单"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.next_id_80
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_turnover_month_tree
 #: model:ir.model,name:report_sale.model_report_turnover_per_month
 #: view:report.turnover.per.month:0
 msgid "Turnover Per Month"
-msgstr ""
+msgstr "每月的营业额"
 
 #. module: report_sale
 #: model:ir.ui.menu,name:report_sale.ir_ui_menu2
 msgid "Daily Sales Turnover Over One Year"
-msgstr ""
+msgstr "一年内每天的营业额"
 
 #. module: report_sale
 #: field:report.sale.order.created,date_order:0
 msgid "Date Ordered"
-msgstr "订货日期"
+msgstr "订单日期"
 
 #. module: report_sale
 #: view:sale.order:0
@@ -240,66 +240,66 @@ msgstr "图表"
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Manual in progress"
-msgstr "正在手工处理的"
+msgstr "手动处理"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.created,state:0
 #: selection:report.sale.order.product,state:0
 msgid "Shipping Exception"
-msgstr "发货例外项"
+msgstr "运输异常"
 
 #. module: report_sale
 #: field:report.turnover.per.month,turnover:0
 #: field:report.turnover.per.product,turnover:0
 msgid "Total Turnover"
-msgstr ""
+msgstr "总营业额"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
 #: selection:report.sale.order.product,state:0
 msgid "In progress"
-msgstr "正在处理"
+msgstr "图表"
 
 #. module: report_sale
 #: view:report.sale.order.created:0
 msgid "Reference"
-msgstr "引用"
+msgstr "参考"
 
 #. module: report_sale
 #: model:ir.actions.act_window,name:report_sale.action_order_category_tree
 #: model:ir.ui.menu,name:report_sale.menu_report_order_category
 msgid "Sales by Category of Product (this month)"
-msgstr "商品分类销售情况（本月）"
+msgstr "销售的产品分类(这月)"
 
 #. module: report_sale
 #: model:ir.report.custom,name:report_sale.ir_report_custom_5
 #: model:ir.report.custom,title:report_sale.ir_report_custom_5
 msgid "Daily sales turnover over one year"
-msgstr ""
+msgstr "一年内每天的营业额"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
 msgid "Manual In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: report_sale
 #: field:report.sale.order.category,name:0
 #: field:report.sale.order.product,name:0
 #: field:report.turnover.per.month,name:0
 msgid "Month"
-msgstr "月份"
+msgstr "月"
 
 #. module: report_sale
 #: field:report.sale.order.category,count:0
 #: field:report.sale.order.product,count:0
 msgid "# of Lines"
-msgstr "行数"
+msgstr "明细#"
 
 #. module: report_sale
 #: field:report.sale.order.created,create_date:0
 msgid "Create Date"
-msgstr "创建时间"
+msgstr "创建日期"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
@@ -311,7 +311,7 @@ msgstr "完成"
 #. module: report_sale
 #: view:report.sale.order.created:0
 msgid "Created Sales orders"
-msgstr "已创建的销售订单"
+msgstr "创建销售订单"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
@@ -324,9 +324,33 @@ msgstr "取消"
 #: model:ir.actions.act_window,name:report_sale.action_so_pipeline
 #: view:sale.order:0
 msgid "Sales by State"
-msgstr ""
+msgstr "销售的状态"
 
 #. module: report_sale
 #: field:report.sale.order.created,amount_untaxed:0
 msgid "Untaxed Amount"
 msgstr "未完税金额"
+
+#~ msgid ""
+#~ "\n"
+#~ "    Reporting for the sale module:\n"
+#~ "    * Sales order by product (my/this month/all)\n"
+#~ "    * Sales order by category of product (my/this month/all)\n"
+#~ "\n"
+#~ "    Some predefined lists:\n"
+#~ "    * Sales of the month\n"
+#~ "    * Open quotations\n"
+#~ "    * Uninvoiced Sales\n"
+#~ "    * Uninvoiced but shipped Sales\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    销售报表模块:\n"
+#~ "\t- 销售订单产品(我的、这月、所有)\n"
+#~ "\t- 销售订单的产品分来(我的、这月、所有)\n"
+#~ "\t\n"
+#~ "\t\t一些预定清单:\n"
+#~ "\t\t- 这月的销售\n"
+#~ "\t\t- 待处理的报价\n"
+#~ "\t\t- 未开票但已运输的销售\n"
+#~ "    "
diff --git a/addons/report_task/i18n/zh_CN.po b/addons/report_task/i18n/zh_CN.po
index 4057041bc92..b78738d6f17 100644
--- a/addons/report_task/i18n/zh_CN.po
+++ b/addons/report_task/i18n/zh_CN.po
@@ -4,178 +4,178 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 11:14+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 10:11+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_project_task
 #: model:ir.ui.menu,name:report_task.menu_project_task_user_tree
 #: view:report.task.user.pipeline.open:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "用户任务"
 
 #. module: report_task
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: report_task
 #: field:report.closed.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "剩余的小时数"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "No Task"
-msgstr ""
+msgstr "没任务"
 
 #. module: report_task
 #: model:ir.module.module,shortdesc:report_task.module_meta_information
 msgid "Report on tasks by user for projects"
-msgstr ""
+msgstr "项目用户任务报表"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Delay"
-msgstr ""
+msgstr "延迟"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "非常低"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低"
 
 #. module: report_task
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_task
 #: field:report.closed.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "任务摘要"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Pending"
-msgstr ""
+msgstr "未决"
 
 #. module: report_task
 #: field:report.closed.task,state:0
 #: field:report.task.user.pipeline.open,task_state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "中"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:report_task.menu_timesheet_task_user
 msgid "Timesheet / Task Hours Per Month"
-msgstr ""
+msgstr "时间表/每月任务小时数"
 
 #. module: report_task
 #: field:report.closed.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "进度(%)"
 
 #. module: report_task
 #: field:report.closed.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "重要"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "公司"
 
 #. module: report_task
 #: model:ir.ui.menu,name:report_task.next_id_57
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: report_task
 #: model:ir.module.module,description:report_task.module_meta_information
 msgid ""
 "Gives statistics on tasks by user on projects to check the pipeline of users."
-msgstr ""
+msgstr "项目用户任务的统计来检查用户的管线"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,user_id:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: report_task
 #: model:ir.actions.act_window,name:report_task.action_closed_task_board
 msgid "Task Closed Within Past 15 Days"
-msgstr ""
+msgstr "15天前关闭的任务"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "非常紧急"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_hrs:0
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "任务的小时数"
 
 #. module: report_task
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "延迟的小时数"
 
 #. module: report_task
 #: field:report.closed.task,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_nbr:0
 msgid "Task Number"
-msgstr ""
+msgstr "任务数"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_timesheet_task_user
@@ -185,80 +185,83 @@ msgstr ""
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_task_user_pipeline_open
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "用户任务和项目"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Planned"
-msgstr ""
+msgstr "已计划"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: report_task
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "时间表/每月任务小时数报表"
 
 #. module: report_task
 #: field:report.task.user.pipeline.open,task_progress:0
 msgid "Task Progress"
-msgstr ""
+msgstr "任务进度"
 
 #. module: report_task
 #: field:report.closed.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "关闭日期"
 
 #. module: report_task
 #: field:report.closed.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "指定给"
 
 #. module: report_task
 #: field:report.closed.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: report_task
 #: model:ir.model,name:report_task.model_report_closed_task
 msgid "Closed Task Report"
-msgstr ""
+msgstr "关闭任务报表"
 
 #. module: report_task
 #: field:report.timesheet.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: report_task
 #: selection:report.closed.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "紧急"
 
 #. module: report_task
 #: field:report.closed.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "最后期限"
 
 #. module: report_task
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "时间表小时数"
 
 #. module: report_task
 #: view:report.closed.task:0
 msgid "Closed Tasks"
-msgstr ""
+msgstr "关闭任务"
 
 #. module: report_task
 #: selection:report.task.user.pipeline.open,task_state:0
 msgid "Open"
-msgstr ""
+msgstr "待处理"
 
 #. module: report_task
 #: field:report.closed.task,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "已计划的小时数"
+
+#~ msgid "All Months"
+#~ msgstr "所有月份"
diff --git a/addons/report_timesheet/i18n/zh_CN.po b/addons/report_timesheet/i18n/zh_CN.po
index c363dc912a3..37913942aeb 100644
--- a/addons/report_timesheet/i18n/zh_CN.po
+++ b/addons/report_timesheet/i18n/zh_CN.po
@@ -4,34 +4,34 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-19 07:49+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:12+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_my
 msgid "My daily timesheets by account"
-msgstr ""
+msgstr "我的科目每天时间表"
 
 #. module: report_timesheet
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr ""
+msgstr "用户时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_all
 msgid "Timesheet by Account"
-msgstr ""
+msgstr "科目时间表"
 
 #. module: report_timesheet
 #: constraint:ir.model:0
@@ -42,25 +42,25 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #. module: report_timesheet
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr ""
+msgstr "科目时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_invoice
 #: model:ir.model,name:report_timesheet.model_report_timesheet_invoice
 msgid "Costs to invoice"
-msgstr "费用发票"
+msgstr "成本开发票"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_my
 msgid "My Timesheet of the Month"
-msgstr ""
+msgstr "我的月度时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_lines_board
 #: model:ir.model,name:report_timesheet.model_random_timesheet_lines
 msgid "Random Timesheet Lines"
-msgstr ""
+msgstr "任意时间表明细"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_account_analytic_account_2_report_timehsheet_account
@@ -70,50 +70,50 @@ msgstr "时间表"
 #. module: report_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在操作定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr ""
+msgstr "每科目时间表"
 
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr ""
+msgstr "时间表开发票"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr ""
+msgstr "每天时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_date_all
 msgid "Daily Timesheet by Account"
-msgstr ""
+msgstr "科目每日时间表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "产品"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,name:0
 #: field:report.random.timesheet,name:0
 msgid "Description"
-msgstr ""
+msgstr "说明"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr ""
+msgstr "每科目时间表"
 
 #. module: report_timesheet
 #: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
 msgid "Timesheet - Reporting"
-msgstr ""
+msgstr "时间表 - 报表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,date:0
@@ -121,12 +121,12 @@ msgstr ""
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: report_timesheet
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr ""
+msgstr "发票时间表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,quantity:0
@@ -136,7 +136,7 @@ msgstr ""
 #: field:report_timesheet.invoice,quantity:0
 #: field:report_timesheet.user,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "数量"
 
 #. module: report_timesheet
 #: model:ir.ui.menu,name:report_timesheet.next_id_69
@@ -147,12 +147,12 @@ msgstr "本月"
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_account_my
 msgid "My timesheets by account"
-msgstr ""
+msgstr "我的科目时间表"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_random_timesheet
 msgid "Random Timesheet Report"
-msgstr ""
+msgstr "任意时间表报表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,user_id:0
@@ -162,98 +162,98 @@ msgstr ""
 #: field:report_timesheet.invoice,user_id:0
 #: field:report_timesheet.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: report_timesheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
 
 #. module: report_timesheet
 #: view:report.random.timesheet:0
 msgid "Random Timesheets"
-msgstr ""
+msgstr "任意时间表"
 
 #. module: report_timesheet
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr ""
+msgstr "科目每日时间表"
 
 #. module: report_timesheet
 #: view:random.timesheet.lines:0
 msgid "Random Timesheets Lines"
-msgstr ""
+msgstr "任意时间表明细"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,account_id:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,amount_invoice:0
 msgid "To invoice"
-msgstr ""
+msgstr "开发票"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user_all
 msgid "Timesheet by User"
-msgstr ""
+msgstr "用户时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_all
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_all
 msgid "Timesheet by Invoice"
-msgstr ""
+msgstr "发票时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_random_timesheet_board
 msgid "Random Timesheet"
-msgstr ""
+msgstr "任意时间表"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "发票"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "一般科目"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr ""
+msgstr "每天时间表"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_invoice_stat_my
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_invoice_my
 msgid "My timesheets to invoice"
-msgstr ""
+msgstr "我的时间表开发票"
 
 #. module: report_timesheet
 #: model:ir.model,name:report_timesheet.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr ""
+msgstr "科目每日时间表"
 
 #. module: report_timesheet
 #: model:ir.module.module,description:report_timesheet.module_meta_information
 msgid ""
 "Module to add timesheet views like\n"
 "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
-msgstr ""
+msgstr "模块增加时间表视图如:所有月份,用户时间表,月度时间表,科目时间表"
 
 #. module: report_timesheet
 #: field:report_timesheet.account,name:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,analytic_account_id:0
@@ -261,25 +261,28 @@ msgstr ""
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
 
 #. module: report_timesheet
 #: field:report_timesheet.invoice,manager_id:0
 msgid "Manager"
-msgstr ""
+msgstr "管理者"
 
 #. module: report_timesheet
 #: field:report_timesheet.user,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
 
 #. module: report_timesheet
 #: field:random.timesheet.lines,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_user_stat
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user
 msgid "Timesheet by user (this month)"
-msgstr ""
+msgstr "用户时间表(这月)"
+
+#~ msgid "All Months"
+#~ msgstr "所有月份"
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 77e50b8edd6..0a98fb5366f 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -4,22 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-04 15:14+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:13+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr "分批出货"
+msgstr "部分交付"
 
 #. module: sale
 #: view:sale.order:0
@@ -39,34 +39,34 @@ msgstr "送货单"
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr "分配业务伙伴"
+msgstr "分配给业务伙伴"
 
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr "等待MRP计算"
+msgstr "等待调度"
 
 #. 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 "如果您没有足够的库存可以一次运输所有货物，您是否可以接受分批出货?"
+msgstr "如果你没足够的库存可以一次提供,可以接受部分货物不?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr "备货"
+msgstr "来自库存"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr "完成销售订单的步骤"
+msgstr "步骤提供销售订单"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,qtty:0
@@ -77,7 +77,7 @@ msgstr "数量"
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "You invoice has been successfully created !"
-msgstr "您的发票已成功创建！"
+msgstr "你的发票已经成功创建!"
 
 #. module: sale
 #: view:sale.order:0
@@ -105,27 +105,27 @@ msgstr "发票异常"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr "此是该发票生成的运货清单."
+msgstr "这领料/提货单已产生在此发票上."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Delivery, from the warehouse to the customer."
-msgstr "送货，从仓库到客户"
+msgstr "送货,从仓库到客户"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
 msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+msgstr "销售设置领料/提货方式"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr "生成发票"
+msgstr "建立发票"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -137,7 +137,7 @@ msgstr "小计"
 msgid ""
 "Whenever confirm button is clicked, the draft state is moved to manual. that "
 "is, quotation is moved to  sale order."
-msgstr "当点击确认按钮草稿状态将转到手动.报价单转到销售订单."
+msgstr "当点击确认按钮草稿状态将转为手动.报价单转为销售订单."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -161,7 +161,7 @@ msgstr "手动指定"
 #: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
@@ -177,12 +177,12 @@ msgstr "税款"
 #. module: sale
 #: rml:sale.order:0
 msgid "Net Total :"
-msgstr "净总额："
+msgstr "净合计:"
 
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr "发运策略"
+msgstr "运送方式"
 
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.order.line,state:0
@@ -192,12 +192,12 @@ msgstr "已取消"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Shipping Exception"
-msgstr "送货异常"
+msgstr "运送异常"
 
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr "总计"
+msgstr "合计"
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -212,7 +212,7 @@ msgstr "发票地址"
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr "发出货品"
+msgstr "发出的产品"
 
 #. module: sale
 #: view:sale.order:0
@@ -222,23 +222,23 @@ msgstr "参考"
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr "一次性发出"
+msgstr "所有一起"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr "销售订单确认后生成需求单"
+msgstr "确认销售订单后创建产品需求"
 
 #. module: sale
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "TVA :"
-msgstr "增值税："
+msgstr "增值税:"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -253,7 +253,7 @@ msgstr "额外信息"
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr "传真："
+msgstr "传真:"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
@@ -264,12 +264,12 @@ msgstr "净价"
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr "我的处理中订单"
+msgstr "我的销售订单进展"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr "数量（销售单位）"
+msgstr "数量(销售单位)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -279,17 +279,18 @@ msgid ""
 "choose if you 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
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr "已审核"
+msgstr "已确认"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr "默认付款期限"
+msgstr "默认付款条件"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
@@ -305,7 +306,7 @@ msgstr "确认"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr "发运地址"
+msgstr "运送地址"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -315,13 +316,13 @@ msgstr "已运数量"
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr "基于销售订单开票"
+msgstr "发票基于销售订单"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr "销售点"
+msgstr "销售商店"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -342,19 +343,19 @@ msgstr "订单明细"
 #. module: sale
 #: rml:sale.order:0
 msgid "Disc.(%)"
-msgstr "折扣（％）"
+msgstr "折扣(%)"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr "发票明细"
+msgstr "发票行"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
 msgid "Force Assignation"
-msgstr "强制分配"
+msgstr "强制指定"
 
 #. module: sale
 #: view:sale.order:0
@@ -366,30 +367,30 @@ msgstr "未完税金额"
 msgid ""
 "Packing list is created when 'Assign' is being clicked after confirming the "
 "sale order. This transaction moves the sale order to packing list."
-msgstr "确认销售订单后点击‘分配’时创建发货分拣清单.销售订单转到发货分拣单"
+msgstr "确认销售订单点击‘指定’后创建包装单.销售订单转为包装单"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree8
 #: model:ir.ui.menu,name:sale.menu_action_order_tree8
 msgid "My sales order waiting Invoice"
-msgstr "我的待开票订单"
+msgstr "我的待开票的销售订单"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Shipping address :"
-msgstr "货运地址："
+msgstr "运送地址:"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
-msgstr "当你选择交货方式=‘送货后自动产生发票’.送货后将自动创建发票."
+msgstr "当你选择运送方式=‘送货后自动产生发票’.将在送货后自动创建发票."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr "一次性出货"
+msgstr "完成送货"
 
 #. module: sale
 #: view:sale.order:0
@@ -399,7 +400,7 @@ msgstr "手动添加描述"
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr "数量（计量单位）"
+msgstr "数量(计量单位)"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree1
@@ -416,27 +417,27 @@ msgstr "已订数量"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sale Order Procurement"
-msgstr "销售订单需求单"
+msgstr "销售单产品需求"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr "审核订单"
+msgstr "确认订单"
 
 #. module: sale
 #: field:sale.order,name:0
 msgid "Order Reference"
-msgstr "订单编号"
+msgstr "订单参考"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -459,17 +460,17 @@ msgstr "设置"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr "送货后按订单开发票"
+msgstr "按发票运送"
 
 #. module: sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效XML视图结构!"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Packing"
-msgstr "相关的分拣单"
+msgstr "相关的包装"
 
 #. module: sale
 #: field:sale.shop,payment_account_id:0
@@ -479,12 +480,12 @@ msgstr "付款科目"
 #. module: sale
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "错误：销售单位必须和计量单位在不同的分类。"
+msgstr "错误:销售单位必须和计量单位在不同的分类."
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Ref"
-msgstr "客户引用"
+msgstr "客户参考"
 
 #. module: sale
 #: view:sale.order:0
@@ -495,7 +496,7 @@ msgstr "销售订单"
 #: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr "需求单"
+msgstr "产品需求"
 
 #. module: sale
 #: view:sale.shop:0
@@ -511,7 +512,7 @@ msgstr "关闭"
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Draft Invoice"
-msgstr "草稿发票"
+msgstr "发票草稿"
 
 #. module: sale
 #: wizard_field:sale.order.line.make_invoice,init,grouped:0
@@ -533,18 +534,18 @@ msgstr "降价 (%)"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr "会计人员即将审查的客户发票草稿"
+msgstr "会计人员审查的客户发票草稿"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_tree3
 msgid "Sales Order To Be Invoiced"
-msgstr "要开票的销售订单"
+msgstr "销售订单开发票"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Procurement for each line"
-msgstr "每订单行的需求单"
+msgstr "产品需求明细"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree10
@@ -555,7 +556,7 @@ msgstr "我的报价单"
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "Invoices"
-msgstr "发票列表"
+msgstr "发票"
 
 #. module: sale
 #: view:sale.order:0
@@ -565,7 +566,7 @@ msgstr "订单明细"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Packing Default Policy"
-msgstr "默认出货方式"
+msgstr "包装默认方式"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
@@ -575,7 +576,7 @@ msgstr "管理送货和发票进展"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr "默认交货方式"
+msgstr "默认运送方式"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -608,18 +609,18 @@ msgstr "业务员"
 msgid ""
 "In sale order , procuerement for each line and it comes into the procurement "
 "order"
-msgstr "每销售订单行均计算需求并生成需求单"
+msgstr "在销售订单产品需求的每个明细并都转为产品需求单."
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Taxes :"
-msgstr "税捐 :"
+msgstr "税:"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "已开票"
+msgstr "已开发票"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.advance_payment
@@ -642,7 +643,7 @@ msgstr "未开票明细"
 msgid ""
 "This Configuration step use to set default picking policy when make sale "
 "order"
-msgstr "这设置步骤用来设定建立销售订单的默认出货方式"
+msgstr "这设置步骤用来设定建立销售订单的默认领料/提货方式"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -661,13 +662,13 @@ msgstr "创建发票"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "错误：默认计量单位和采购计量单位必须在同一分类下。"
+msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree7
 #: model:ir.ui.menu,name:sale.menu_action_order_tree7
 msgid "My sales in shipping exception"
-msgstr "我的销售运输异常"
+msgstr "我销售的运输异常"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -683,7 +684,7 @@ msgstr "销售异常"
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "订货"
+msgstr "来自订单"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -693,12 +694,12 @@ msgstr "草稿"
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr "已付"
+msgstr "支付"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Procurement Corrected"
-msgstr "需求单已更正"
+msgstr "产品需求已修正"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -709,12 +710,12 @@ msgstr "交货及手动开发票"
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Sale Procurement"
-msgstr "销售需求单"
+msgstr "销售产品需求"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sale Order Logistic"
-msgstr "配置销售订单物流"
+msgstr "设置销售订单逻辑"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -729,17 +730,17 @@ msgstr "状态"
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Packing Policy"
-msgstr "分拣策略"
+msgstr "包装方式"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr "货品销售"
+msgstr "产品销售"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Our Salesman"
-msgstr "我方销售员"
+msgstr "业务员"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,init,create:0
@@ -749,7 +750,7 @@ msgstr "创建预付款发票"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid "One procurement for each product."
-msgstr "每个产品的需求单"
+msgstr "每个产品的产品需求"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -760,12 +761,12 @@ msgstr "销售订单"
 #. module: sale
 #: field:product.product,pricelist_sale:0
 msgid "Sale Pricelists"
-msgstr "销售价格列表"
+msgstr "销售价格表"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr "直接运送"
+msgstr "直接送货"
 
 #. module: sale
 #: view:sale.order:0
@@ -783,14 +784,14 @@ msgstr "报价"
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 msgid "Advance Product"
-msgstr "Advance Product"
+msgstr "预付产品"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
-msgstr "确认订单后点击‘创建发票’则会创建一个新的发票。这笔交易把销售订单转移到发票"
+msgstr "确认销售订单点击‘创建发票’创建发票.销售订单转为发票."
 
 #. module: sale
 #: view:sale.order:0
@@ -813,17 +814,17 @@ msgstr "增值税"
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 #: model:ir.ui.menu,name:sale.menu_action_order_tree4
 msgid "Sales Order in Progress"
-msgstr "销售订单在进展中"
+msgstr "销售订单进展"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
 msgid "Assign"
-msgstr "分配"
+msgstr "指定"
 
 #. module: sale
 #: view:sale.order:0
 msgid "History"
-msgstr "历史记录"
+msgstr "日志"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -839,18 +840,16 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
-"付运条款是用于同步发票与送货.\\n\n"
-"  - ‘送货前付款’选项将会先生成发票，按此发票付款完成后生成分拣单.\\n\n"
-"  - ‘交货及手动开发票’选项将直接创建分拣单并在用户手动点击‘发票’后生成发\n"
-"票.\\n\"\n"
-"  - ‘送货后按订单开发票’选项将会在所有分拣单完成后按照销售订单生成草稿发\n"
-"票.\\n\"\n"
-"  - ‘按发货分拣单开发票’选项用于在准备发货过程中创建发票."
+"运输策略是用来同步发票和交货操作\n"
+"  在运输前付款将先产生发票和包装单后支付发票\n"
+"  运输和手动开发票将创建包装单并等待用户手动开发票\n"
+"  发票在交货后将在销售订单建立所有包装单后产生发票\n"
+"  发票来自包装是用户在包装的时候生成发票"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Your Reference"
-msgstr "您的编号"
+msgstr "你参考"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -866,12 +865,12 @@ msgstr "销售订单明细"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 msgid "Sales"
-msgstr "销售订单"
+msgstr "销售"
 
 #. module: sale
 #: view:sale.order:0
@@ -882,12 +881,12 @@ msgstr "数量"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Packing OUT is created for stockable products."
-msgstr "为可库存货品创建发货分拣单"
+msgstr "可库存物产品发出包装"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other data"
-msgstr "其他数据"
+msgstr "其它数据"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,amount:0
@@ -899,12 +898,12 @@ msgstr "单价"
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "应税设定"
+msgstr "财务结构"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Invoice address :"
-msgstr "发票地址："
+msgstr "发票地址:"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -933,6 +932,8 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"给出这报价单或销售订单的状态这异常状态是在发票确认(发票异常)或在包装单处理(送货异常)自动设定时取消操作发生的.这\"等待调度表\"状态是在发票已确认但"
+"在等待在\"日期排序\"内运行调度."
 
 #. module: sale
 #: view:sale.order:0
@@ -943,40 +944,40 @@ msgstr "计量单位"
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr "包装数量"
+msgstr "包装数"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
 msgid ""
 "Confirming the packing list moves them to delivery order. This can be done "
 "by clicking on 'Validate' button."
-msgstr "点击‘确认’按钮把分拣单转到送货单"
+msgstr "点击‘确认’按钮.确认包装单转为送货单"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "In Progress"
-msgstr "在进程中"
+msgstr "进展"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
 msgid "Advance Payment"
-msgstr "预付款"
+msgstr "预付款支付"
 
 #. module: sale
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
 msgid "Confirm sale order and Create invoice."
-msgstr "确认销售订单并生成发票"
+msgstr "确认销售订单并创建发票"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Packing List & Delivery Order"
-msgstr "发货分拣单及送货单"
+msgstr "包装单&送货单"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1003,12 +1004,12 @@ msgstr "你确定要创建发票吗?"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Invoice based on packing lists"
-msgstr "按分拣单生成发票"
+msgstr "发票基于包装单"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Set Default"
-msgstr "设为默认"
+msgstr "设为草稿"
 
 #. module: sale
 #: view:sale.order:0
@@ -1018,7 +1019,7 @@ msgstr "销售订单"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Quotation (A sale order in draft state)"
-msgstr "报价（一份销售订单草稿）"
+msgstr "报价(销售订单在草稿状态)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1039,12 +1040,12 @@ msgstr "产品"
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,open:0
 msgid "Open Advance Invoice"
-msgstr "打开预付发票"
+msgstr "待处理预付款发票"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr "订单联系人"
+msgstr "订购联系"
 
 #. module: sale
 #: rml:sale.order:0
@@ -1060,22 +1061,22 @@ msgstr "价格"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Deliver"
-msgstr "运送"
+msgstr "送货"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr "报价/订单"
+msgstr "报价单/订单"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Tel. :"
-msgstr "电话："
+msgstr "电话:"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr "报价编号"
+msgstr "报价单号"
 
 #. module: sale
 #: field:stock.move,sale_line_id:0
@@ -1085,18 +1086,18 @@ msgstr "销售订单明细"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
-msgstr "取消分配"
+msgstr "取消指定"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from the Packing"
-msgstr "按发货分拣单生成发票"
+msgstr "发票来自包装"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
 msgid "Make invoices"
-msgstr "创建发票"
+msgstr "建立发票"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
@@ -1113,7 +1114,7 @@ msgstr "客户"
 #. module: sale
 #: field:product.product,pricelist_purchase:0
 msgid "Purchase Pricelists"
-msgstr "采购价格列表"
+msgstr "采购价格表"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1127,7 +1128,7 @@ msgstr "销售订单"
 #. module: sale
 #: field:sale.config.picking_policy,name:0
 msgid "Name"
-msgstr "姓名"
+msgstr "名称"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1138,12 +1139,12 @@ msgstr "开票依据"
 #: model:ir.actions.act_window,name:sale.action_order_tree_new
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_new
 msgid "New Quotation"
-msgstr "新报价"
+msgstr "新报价单"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total amount"
-msgstr "总金额"
+msgstr "金额合计"
 
 #. module: sale
 #: rml:sale.order:0
@@ -1154,7 +1155,7 @@ msgstr "订购日期"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr "货品销售单位"
+msgstr "产品销售单位"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1173,12 +1174,12 @@ msgid ""
 "in your warehouse and partner locations. This will configure the most common "
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
-msgstr ""
+msgstr "默认情况下系统能管理复杂的路线和从你的仓库到业务伙伴库位的路径.这将设置最常见和最简单的方法把产品交付给客户通过一、两个操作."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sale Order"
-msgstr "设置销售订单出货方式"
+msgstr "销售订单设置领料/提货方式"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_order0
@@ -1198,7 +1199,7 @@ msgstr "已更正发票"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Delay"
-msgstr "货运延期"
+msgstr "运送延期"
 
 #. module: sale
 #: view:sale.order:0
@@ -1218,7 +1219,7 @@ msgstr "付款条件"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr "交货前付款"
+msgstr "运送前付款"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1226,7 +1227,7 @@ msgid ""
 "This is the list of invoices that have been generated for this sale order. "
 "The same sale order may have been invoiced in several times (by line for "
 "example)."
-msgstr "这是该销售订单生成的发票列表.同一销售订单可能已经开发票几次（比如按行开具）."
+msgstr "这是发票列表已经产生销售订单.上述销售订单可能已经开发票."
 
 #. module: sale
 #: view:sale.order:0
@@ -1242,18 +1243,18 @@ msgstr "重量"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "After confirming order, Create the invoice."
-msgstr "确认订单后创建发票。"
+msgstr "创建这发票"
 
 #. module: sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "错误：无效的(EAN)条码"
+msgstr "错误:无效EAN编码"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
 #: field:sale.order,shipped:0
 msgid "Picked"
-msgstr "已提货"
+msgstr "已领料/退货"
 
 #. module: sale
 #: view:sale.shop:0
@@ -1263,7 +1264,7 @@ msgstr "会计"
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr "按送货单开发票"
+msgstr "发票基于送货单"
 
 #. module: sale
 #: view:sale.order:0
@@ -1279,4 +1280,39 @@ msgstr "我的销售订单"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sale Order line"
-msgstr "订单明细"
+msgstr "销售订单明细"
+
+#~ msgid ""
+#~ "\n"
+#~ "    The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ "    * Workflow with validation steps:\n"
+#~ "        - Quotation -> Sale order -> Invoice\n"
+#~ "    * Invoicing methods:\n"
+#~ "        - Invoice on order (before or after shipping)\n"
+#~ "        - Invoice on delivery\n"
+#~ "        - Invoice on timesheets\n"
+#~ "        - Advance invoice\n"
+#~ "    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ "    * Products stocks and prices\n"
+#~ "    * Delivery methods:\n"
+#~ "        - all at once, multi-parcel\n"
+#~ "        - delivery costs\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这基础模块管理报价和销售订单\n"
+#~ "\n"
+#~ "\t* 工作流批准的步骤:\n"
+#~ "\t\t- 报价 -》 销售订单 -》 发票\n"
+#~ "\t*开票方式:\n"
+#~ "\t\t- 发票基于订单(之前和之后运输)\n"
+#~ "\t\t- 发票基于送货单\n"
+#~ "\t\t- 发票基于时间表\n"
+#~ "\t\t- 预付款发票\n"
+#~ "\t*业务伙伴优先级(运输单,发票,国际贸易术语)\n"
+#~ "    *库存产品和价格\n"
+#~ "\t*送货方式:\n"
+#~ "\t\t- 多业务伙伴一起\n"
+#~ "\t\t- 送货成本\n"
+#~ "    "
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index 96170575bc5..a1c13d7e2fb 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 10:14+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "辅助核算分配"
 
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
+msgstr "销售辅助核算分配管理"
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index b1e5469afe4..f575659f433 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -4,32 +4,32 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 08:42+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:15+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
 msgid "Crm opportunity quotation"
-msgstr "客户管理系统商机报价"
+msgstr "CRM销售机会报价"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
 msgid "Opportunity Analytic"
-msgstr "商机分析"
+msgstr "销售机会分析"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
 msgid "Use this partner if there is no partner on the case"
-msgstr "如果案例中没有业务伙伴请使用这个业务伙伴"
+msgstr "如果没有业务伙伴用这业务伙伴"
 
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
@@ -39,17 +39,17 @@ msgstr "创建"
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "All at once"
-msgstr "全部一次性"
+msgstr "所有一齐"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构！"
+msgstr "无效XML视图结构!"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr "商机转为报价"
+msgstr "销售机会转为报价"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
@@ -59,17 +59,17 @@ msgstr "分析科目"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmquotation0
 msgid "Convert opportunity to quotation"
-msgstr "转换商机为报价"
+msgstr "销售机会转为报价"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,description:0
 msgid "Your action"
-msgstr "您的方式"
+msgstr "你的行动"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,picking_policy:0
 msgid "Packing Policy"
-msgstr "出货方式"
+msgstr "包装方式"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,order:0
@@ -79,22 +79,22 @@ msgstr "创建报价"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr "合同交易额（价目表）"
+msgstr "合同交易额(价目表)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
 msgid "CRM Opportunity"
-msgstr "客户关系管理商机"
+msgstr "CRM销售机会"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Sale CRM Stuff"
-msgstr "销售客户关系管理有关资料"
+msgstr "销售CRM"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity convert into quotation"
-msgstr "商机转化为报价"
+msgstr "销售机会转为报价"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
@@ -104,7 +104,7 @@ msgstr "直接送货"
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity Quotation"
-msgstr "商机报价"
+msgstr "销售机会报价"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
@@ -120,7 +120,7 @@ msgstr "转为报价"
 #. module: sale_crm
 #: help:crm.case.make_order,init,close:0
 msgid "Check this to close the case after having created the sale order."
-msgstr "在这儿打勾以创建销售订单后关闭案例"
+msgstr "选择这结束的业务个案后创建销售订单"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,partner_id:0
@@ -130,7 +130,7 @@ msgstr "客户"
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr "商机转为价目表"
+msgstr "销售机会转为价目表"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
@@ -140,7 +140,7 @@ msgstr "负责的用户"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractanalytic0
 msgid "Reflect the contract made with customer"
-msgstr "反映与客户签订的协议"
+msgstr "带来客户合同"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
@@ -150,13 +150,13 @@ msgstr "产品"
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,close:0
 msgid "Close Case"
-msgstr "关闭案例"
+msgstr "结束业务个案"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
 #: wizard_view:sale_crm.make_case,init:0
 msgid "Make Case"
-msgstr "建立案例"
+msgstr "建立业务个案"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,shop_id:0
@@ -166,12 +166,12 @@ msgstr "商店"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmopportunity0
 msgid "The CRM Opportunity can lead to a quotation."
-msgstr "该客户关系管理商机能带来报价"
+msgstr "这CRM销售机会能带来报价"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr "商机价格表"
+msgstr "销售机会价格表"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
@@ -181,13 +181,13 @@ msgstr "合同价格表"
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
 msgid "Case Description"
-msgstr "案例说明"
+msgstr "业务个案说明"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,analytic_account:0
 #: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项目"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
@@ -203,4 +203,4 @@ msgstr "取消"
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
-msgstr "案例组"
+msgstr "业务个案项"
diff --git a/addons/sale_delivery_report/i18n/zh_CN.po b/addons/sale_delivery_report/i18n/zh_CN.po
index 2e602af6e61..7f9a4483848 100644
--- a/addons/sale_delivery_report/i18n/zh_CN.po
+++ b/addons/sale_delivery_report/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 08:02+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:16+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
@@ -24,7 +24,7 @@ msgstr "订单日期"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Order Ref."
-msgstr "订单参照"
+msgstr "订单参考"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -34,7 +34,7 @@ msgstr "重量"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Designation"
-msgstr "指名"
+msgstr "目标"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -59,7 +59,7 @@ msgstr "运送者"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Invoiced to"
-msgstr "开发票至"
+msgstr "开票到"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -69,9 +69,12 @@ msgstr "批次"
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "运送日期"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Quantity"
 msgstr "数量"
+
+#~ msgid "Allows to print a delivery order."
+#~ msgstr "允许打印这送货单"
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index 316d79d78a4..5f4feae02c1 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -4,56 +4,56 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:57+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:18+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
 msgid "Monthly sales"
-msgstr "月销售"
+msgstr "每月销售"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
 msgid "Assigned packing"
-msgstr "已分配的分拣单"
+msgstr "指定的包装"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "assigned"
-msgstr "已分配"
+msgstr "已指定"
 
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Waiting Schedule"
-msgstr "等待日程"
+msgstr "等待日程表"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "to be invoiced"
-msgstr "需开发票"
+msgstr "要发票"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
 #: view:sale_journal.sale.journal:0
 #: field:stock.picking,sale_journal_id:0
 msgid "Sale Journal"
-msgstr "销售日记账"
+msgstr "销售分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.sale.journal,sale_stats_ids:0
@@ -70,25 +70,25 @@ msgstr "等待"
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Set to Draft"
-msgstr "设置为草稿"
+msgstr "设为草稿"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date:0
 #: field:sale_journal.sale.journal,date:0
 msgid "Journal date"
-msgstr "日记账日期"
+msgstr "分类帐日期"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
 msgid "Packing by Invoice Method"
-msgstr "按发票方式排列分拣单"
+msgstr "按发票包装"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
 msgid "Packing Journals"
-msgstr "分拣单日记账"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
@@ -99,25 +99,25 @@ msgstr "备注"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
 msgid "My open journals"
-msgstr "我的未结日记账"
+msgstr "我待处理的分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,count:0
 #: field:sale_journal.picking.stats,count:0
 #: field:sale_journal.sale.stats,count:0
 msgid "# of Lines"
-msgstr "# 行"
+msgstr "行号"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
 msgid "All Open Journals"
-msgstr "所有未结日记账"
+msgstr "所有待处理的分类帐"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr "按日记账管理销售并送货"
+msgstr "管理销售和送货分类帐"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
@@ -130,17 +130,17 @@ msgstr "完成"
 #: field:sale_journal.picking.stats,price_average:0
 #: field:sale_journal.sale.stats,price_average:0
 msgid "Average Price"
-msgstr "均价"
+msgstr "平均价"
 
 #. module: sale_journal
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr "已分组"
+msgstr "组"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,state:0
@@ -160,52 +160,52 @@ msgstr "所有月份"
 #: field:sale_journal.picking.stats,price_total:0
 #: field:sale_journal.sale.stats,price_total:0
 msgid "Total Price"
-msgstr "总价"
+msgstr "价格合计"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
 msgid "Packing journals"
-msgstr "分拣单日记账"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
 msgid "My open packing journals"
-msgstr "我未结的分拣单日记账"
+msgstr "我待处理的包装分类帐"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
 msgid "Sales Orders by Journal"
-msgstr "按日记账排列销售订单"
+msgstr "销售订单分类帐"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all
 msgid "Open journals"
-msgstr "未结的日记账"
+msgstr "待处理分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and packing."
-msgstr "该日记账类型用于销售和分拣"
+msgstr "这分类帐类型用于销售和包装"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "None"
-msgstr "无"
+msgstr "空"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
 msgid "Sales by journal (this month)"
-msgstr "按日记账排列销售（本月）"
+msgstr "销售分类帐(这月)"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -218,18 +218,18 @@ msgstr "手动进展"
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
 msgid "Packing by journal"
-msgstr "按日记账排列分拣单"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Cancel Packing"
-msgstr "取消分拣单"
+msgstr "取消包装"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
 msgid "Confirmed packing"
-msgstr "确认分拣单"
+msgstr "确认包装"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -239,7 +239,7 @@ msgstr "进展"
 #. module: sale_journal
 #: view:sale_journal.picking.stats:0
 msgid "Packing by journals"
-msgstr "按日记账排列分拣单"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,name:0
@@ -258,12 +258,12 @@ msgstr "发票状态"
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
 #: view:sale_journal.invoice.type.stats:0
 msgid "Packing by invoice method"
-msgstr "按发票方式排列分拣\""
+msgstr "按发票包装"
 
 #. module: sale_journal
 #: field:sale_journal.sale.stats,state:0
 msgid "Order State"
-msgstr "销售订单状态"
+msgstr "订单状态"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
@@ -309,7 +309,7 @@ msgstr "草稿"
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr "在职"
+msgstr "有效"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
@@ -324,7 +324,7 @@ msgstr "报价"
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal
 msgid "Sales Journals"
-msgstr "销售日记账"
+msgstr "销售分类帐"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
@@ -334,7 +334,7 @@ msgstr "sale_journal.invoice.type.tree"
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Confirm Sales"
-msgstr "销售确认"
+msgstr "确认销售"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_created:0
@@ -346,19 +346,19 @@ msgstr "创建日期"
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr "发票方式"
+msgstr "开票方式"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,code:0
 #: field:sale_journal.sale.journal,code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Open Journal"
-msgstr "未结日记账"
+msgstr "待处理分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
@@ -370,7 +370,7 @@ msgstr "销售"
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
 #: view:sale_journal.picking.journal:0
 msgid "Packing Journal"
-msgstr "分拣日记账"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
@@ -387,41 +387,41 @@ msgstr "取消"
 #. module: sale_journal
 #: field:sale_journal.picking.journal,picking_stats_ids:0
 msgid "Journal Stats"
-msgstr "销售统计"
+msgstr "分类帐统计"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Open"
-msgstr "未结"
+msgstr "待处理"
 
 #. module: sale_journal
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,user_id:0
 #: field:sale_journal.sale.journal,user_id:0
 msgid "Responsible"
-msgstr "负责人"
+msgstr "有责任"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open
 msgid "My Open Journals"
-msgstr "我的未结的日记账"
+msgstr "我待处理的分类帐"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
 msgid "Statistics on packing to invoice"
-msgstr "根据分拣单开发票统计"
+msgstr "统计包装到发票"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
@@ -439,18 +439,18 @@ msgstr "发票类型"
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "invoiced"
-msgstr "已开发票"
+msgstr "已开票"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "confirmed"
-msgstr "已确认"
+msgstr "确定"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
 msgid "Packing lists by Journal"
-msgstr "按日记账排列分拣单"
+msgstr "包装单分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,quantity:0
@@ -469,13 +469,13 @@ msgstr "数量"
 #: field:sale_journal.sale.stats,journal_id:0
 #: field:stock.picking,journal_id:0
 msgid "Journal"
-msgstr "日记帐"
+msgstr "分类帐"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 #: field:sale_journal.invoice.type.stats,invoice_type_id:0
 msgid "Invoicing method"
-msgstr "发票方式"
+msgstr "开票方式"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
@@ -489,38 +489,38 @@ msgstr "本月"
 #: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu
 #: view:sale_journal.sale.stats:0
 msgid "Sales by Journal"
-msgstr "按日记账排列销售"
+msgstr "销售分类帐"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoicing Methods"
-msgstr "发票方式"
+msgstr "开票方式"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr "未分组"
+msgstr "没分组"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
 msgid "Packing to invoice"
-msgstr "需开发票的分拣单"
+msgstr "包装到发票"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Journal Information"
-msgstr "日记账信息"
+msgstr "分类帐信息"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
 msgid "Stats on packing by invoice method"
-msgstr "按开票方式统计分拣单"
+msgstr "统计按发票包装"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 msgid "Invoice Types"
-msgstr "按发票方式排列分拣统计"
+msgstr "发票类型"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
@@ -533,20 +533,68 @@ msgstr "状态"
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
 msgid "Packing by Journal"
-msgstr "按日记账排列分拣单"
+msgstr "包装分类帐"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Close Journal"
-msgstr "关闭日记账"
+msgstr "关闭分类帐"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
 msgid "Packing to Invoice"
-msgstr "需开发票的分拣单"
+msgstr "包装到发票"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
 msgid "Approved sales"
-msgstr "已批准销售"
+msgstr "批准销售"
+
+#~ msgid ""
+#~ "\n"
+#~ "    The sale journal modules allows you to categorise your\n"
+#~ "    sales and deliveries (packing lists) between different journals.\n"
+#~ "    This module is very helpful for bigger companies that\n"
+#~ "    works by departments.\n"
+#~ "\n"
+#~ "    You can use journal for different purposes, some examples:\n"
+#~ "    * isolate sales of different departments\n"
+#~ "    * journals for deliveries by truck or by UPS\n"
+#~ "\n"
+#~ "    Journals have a responsible and evolves between different status:\n"
+#~ "    * draft, open, cancel, done.\n"
+#~ "\n"
+#~ "    Batch operations can be processed on the different journals to\n"
+#~ "    confirm all sales at once, to validate or invoice packing, ...\n"
+#~ "\n"
+#~ "    It also supports batch invoicing methods that can be configured by\n"
+#~ "    partners and sales orders, examples:\n"
+#~ "    * daily invoicing,\n"
+#~ "    * monthly invoicing, ...\n"
+#~ "\n"
+#~ "    Some statistics by journals are provided.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    这销售分类帐模块,允许你在不同的分类帐中分类出\n"
+#~ "你的销售和送货(包装单)\n"
+#~ "\t这模块对大公司的\n"
+#~ "工作部门是非常有帮助的\n"
+#~ "\n"
+#~ "\t你能使用分类帐达到不同目的的,如:\n"
+#~ "\t*分开不同部门的销售\n"
+#~ "\t*跟踪用快递送货分类帐\n"
+#~ "\t\n"
+#~ "\t分类帐有不同的状态下:\n"
+#~ "              草稿,待处理,取消,完成\n"
+#~ "\t\n"
+#~ "在不同的分类帐批处理\n"
+#~ "一次确认所有销售，使生效或者发票,包装。。\n"
+#~ "\n"
+#~ "\t它还支持配置业务伙伴和销售订单的开票方式如:\n"
+#~ "        *每日开票\n"
+#~ "        *每月开票\n"
+#~ "\t\n"
+#~ "\t提供在一个会计期间的分类帐统计\n"
+#~ "    "
diff --git a/addons/scrum/i18n/zh_CN.po b/addons/scrum/i18n/zh_CN.po
index c5a7e222f3e..67f50c7eeaf 100644
--- a/addons/scrum/i18n/zh_CN.po
+++ b/addons/scrum/i18n/zh_CN.po
@@ -7,29 +7,29 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-26 02:10+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:28+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 msgid "Scrum Product backlog"
-msgstr "sc"
+msgstr "Scrum 的 Product backlog"
 
 #. module: scrum
 #: field:scrum.meeting,name:0
 msgid "Meeting Name"
-msgstr "会议主题"
+msgstr "会议名称"
 
 #. module: scrum
 #: model:process.transition,note:scrum.process_transition_backlogtask0
 msgid "From backlog create task."
-msgstr ""
+msgstr "从Backlog创建任务"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task4
@@ -41,49 +41,49 @@ msgstr "我的任务"
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
 msgid "My opened sprints (Product Owner)"
-msgstr "我进行中的冲刺（项目负责人）"
+msgstr "我待处理的sprints(产品负责人)"
 
 #. module: scrum
 #: model:process.node,note:scrum.process_node_productbacklog0
 msgid "Create task from backlogs"
-msgstr ""
+msgstr "从backlogs创建任务"
 
 #. module: scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中无效的模块名"
 
 #. module: scrum
 #: model:ir.module.module,shortdesc:scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr "Scrum，敏捷开发方法"
+msgstr "Scrum敏捷开发方法"
 
 #. module: scrum
 #: field:scrum.project,progress_rate:0
 msgid "Progress"
-msgstr "进度"
+msgstr "进行"
 
 #. module: scrum
 #: help:scrum.task,remaining_hours:0
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
-msgstr ""
+msgstr "总剩余时间,能重新估计任务接受者的周期"
 
 #. module: scrum
 #: field:scrum.project,child_id:0
 msgid "Subproject"
-msgstr "子项目"
+msgstr "子计划"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "What have you accomplished since yesterday ?"
-msgstr ""
+msgstr "昨天你干出什么成绩?"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Are your Sprint Backlog estimate accurate ?"
-msgstr ""
+msgstr "你的Sprint Backlob是否估计准确?"
 
 #. module: scrum
 #: field:scrum.project,members:0
@@ -93,40 +93,40 @@ msgstr "项目成员"
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Projects"
-msgstr "Scrum 项目列表"
+msgstr "Scrum项目"
 
 #. module: scrum
 #: field:scrum.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "已委托的任务列表"
+msgstr "委任任务"
 
 #. module: scrum
 #: help:scrum.project,warn_header:0
 msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr "任务关闭时通知客户的消息邮件的头"
+msgstr "在任务结束时发送给客户的电子邮件开头增加的头"
 
 #. module: scrum
 #: field:scrum.task,priority:0
 msgid "Importance"
-msgstr "优先级"
+msgstr "重要"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_task
 msgid "Scrum Task"
-msgstr "Scrum 任务"
+msgstr "Scrum任务"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.dblc_proj
 msgid "View project's backlog"
-msgstr ""
+msgstr "项目Backlog视图"
 
 #. module: scrum
 #: help:scrum.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
-msgstr "项目成员没有被任何统计计算所使用，而是仅仅为了记录信息。"
+msgstr "项目成员不使用任何计算只是为了显示"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
@@ -137,19 +137,19 @@ msgstr "非常紧急"
 #. module: scrum
 #: field:scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "Sprint回顾"
 
 #. module: scrum
 #: field:scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr "冲刺主题"
+msgstr "Sprint名称"
 
 #. module: scrum
 #: help:scrum.task,planned_hours:0
 msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
-msgstr ""
+msgstr "任务估计时间通常由项目管理者在任务草稿状态下设定."
 
 #. module: scrum
 #: field:scrum.project,notes:0
@@ -174,23 +174,23 @@ msgstr "项目"
 msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
-msgstr "如果选中此字段，项目经理当他的团队完成每一个任务的时候将收到一个请求。"
+msgstr "如果选这项,团队将收到项目管理者对每个任务完成时间的要求"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 #: selection:scrum.task,state:0
 msgid "Cancelled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: scrum
 #: field:scrum.team,name:0
 msgid "Team Name"
-msgstr ""
+msgstr "团队名称"
 
 #. module: scrum
 #: field:scrum.project,warn_header:0
 msgid "Mail Header"
-msgstr "邮件头"
+msgstr "电子邮件头"
 
 #. module: scrum
 #: field:scrum.project,sprint_size:0
@@ -200,29 +200,29 @@ msgstr ""
 #. module: scrum
 #: field:scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr "结束时间"
+msgstr "终止日期"
 
 #. module: scrum
 #: help:scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr "任务完成的工作时间合计"
+msgstr "任务工作完成的合计"
 
 #. module: scrum
 #: help:scrum.project,warn_customer:0
 msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
-msgstr ""
+msgstr "如果选中,用户将在任务结束时向客户发送一建议信息的电子邮件"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr "查看冲刺任务列表"
+msgstr "Sprint任务视图"
 
 #. module: scrum
 #: field:scrum.project,category_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task
@@ -233,7 +233,7 @@ msgstr "所有任务"
 #. module: scrum
 #: field:scrum.task,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "截止期限"
 
 #. module: scrum
 #: field:scrum.project,partner_id:0
@@ -246,17 +246,17 @@ msgstr "业务伙伴"
 #: field:scrum.sprint,planned_hours:0
 #: field:scrum.task,planned_hours:0
 msgid "Planned Hours"
-msgstr "计划小时数"
+msgstr "计划时间"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Template"
-msgstr "模版"
+msgstr "模板"
 
 #. module: scrum
 #: field:scrum.product.backlog,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "优先"
 
 #. module: scrum
 #: field:scrum.project,state:0
@@ -267,43 +267,43 @@ msgstr "状态"
 #. module: scrum
 #: help:scrum.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
+msgstr "关闭任务和所有任务的百分比"
 
 #. module: scrum
 #: help:scrum.project,notes:0
 msgid "Internal description of the project."
-msgstr "项目的内部说明"
+msgstr "项目内部说明"
 
 #. module: scrum
 #: field:scrum.sprint,meetings_id:0
 msgid "Daily Scrum"
-msgstr ""
+msgstr "每日Scrum"
 
 #. module: scrum
 #: help:scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "计算方法：花费时间－剩余时间"
+msgstr "计算:花费的时间 + 剩余的时间"
 
 #. module: scrum
 #: field:scrum.task,type:0
 msgid "Type"
-msgstr ""
+msgstr "类型"
 
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Data"
-msgstr ""
+msgstr "Scrum数据"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "中"
 
 #. module: scrum
 #: field:scrum.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "总时间"
 
 #. module: scrum
 #: model:ir.ui.menu,name:scrum.next_id_67
@@ -313,40 +313,40 @@ msgstr ""
 #. module: scrum
 #: field:scrum.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "计划时间"
 
 #. module: scrum
 #: field:scrum.meeting,question_today:0
 msgid "Tasks for today"
-msgstr ""
+msgstr "今天任务"
 
 #. module: scrum
 #: field:scrum.meeting,question_yesterday:0
 msgid "Tasks since yesterday"
-msgstr ""
+msgstr "昨天到现在的任务"
 
 #. module: scrum
 #: field:scrum.project,date_start:0
 #: field:scrum.sprint,date_start:0
 #: field:scrum.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_scrum_project_tree
 #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_tree
 msgid "Projects"
-msgstr ""
+msgstr "项目"
 
 #. module: scrum
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: scrum
 #: field:scrum.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "任务详情"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.dblc_proj2
@@ -356,32 +356,32 @@ msgstr "项目任务视图"
 #. module: scrum
 #: field:scrum.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "延迟时间"
 
 #. module: scrum
 #: field:scrum.project,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "联系"
 
 #. module: scrum
 #: field:scrum.project,tasks:0
 msgid "Scrum Tasks"
-msgstr ""
+msgstr "Scrum任务"
 
 #. module: scrum
 #: field:scrum.meeting,date:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "会议日期"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Retrospective"
-msgstr ""
+msgstr "回顾"
 
 #. module: scrum
 #: wizard_view:scrum.product.backlog.task.create,init:0
@@ -392,24 +392,24 @@ msgstr "创建任务"
 #. module: scrum
 #: field:scrum.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "进度(%)"
 
 #. module: scrum
 #: help:scrum.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "计算:花费的时间/总时间"
 
 #. module: scrum
 #: field:scrum.project,scrum:0
 #: field:scrum.task,scrum:0
 msgid "Is Scrum"
-msgstr ""
+msgstr "是Scrum"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
 #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_draft
 msgid "Draft Backlogs"
-msgstr ""
+msgstr "Backlogs草稿"
 
 #. module: scrum
 #: field:scrum.sprint,backlog_ids:0
@@ -420,7 +420,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:scrum.action_view_task6
 #: model:ir.ui.menu,name:scrum.menu_action_view_task6
 msgid "Opened tasks"
-msgstr ""
+msgstr "待处理任务"
 
 #. module: scrum
 #: field:scrum.meeting,question_blocks:0
@@ -430,12 +430,12 @@ msgstr ""
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Optionnal Info"
-msgstr ""
+msgstr "选项信息"
 
 #. module: scrum
 #: help:scrum.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
+msgstr "这项目所有相关任务的总时间合计"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_sprint
@@ -447,89 +447,89 @@ msgstr ""
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Review"
-msgstr ""
+msgstr "复审"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree7
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree7
 msgid "My opened sprints (Scrum Master)"
-msgstr ""
+msgstr "我待处理的Sprint(团队主管)"
 
 #. module: scrum
 #: field:scrum.product.backlog,note:0
 msgid "Note"
-msgstr ""
+msgstr "备注"
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
 #: selection:scrum.sprint,state:0
 #: selection:scrum.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task5
 #: model:ir.ui.menu,name:scrum.menu_tasks_yours
 msgid "My opened tasks"
-msgstr ""
+msgstr "我待处理的任务"
 
 #. module: scrum
 #: field:scrum.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "项目主管"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 #: selection:scrum.task,state:0
 msgid "Pending"
-msgstr ""
+msgstr "未决"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "Is there anything blocking you ?"
-msgstr ""
+msgstr "有什么阻碍了你?"
 
 #. module: scrum
 #: field:scrum.product.backlog,state:0
 #: field:scrum.sprint,state:0
 #: field:scrum.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree
 msgid "Opened Sprints"
-msgstr ""
+msgstr "待处理的Sprints"
 
 #. module: scrum
 #: field:scrum.project,effective_hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "时间花费"
 
 #. module: scrum
 #: field:scrum.project,complete_name:0
 #: field:scrum.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "项目名称"
 
 #. module: scrum
 #: field:scrum.project,product_owner_id:0
 #: field:scrum.sprint,product_owner_id:0
 msgid "Product Owner"
-msgstr ""
+msgstr "产品负责人"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree5
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree5
 msgid "My Sprints (Scrum Master)"
-msgstr ""
+msgstr "我的Sprints(Scrum主管)"
 
 #. module: scrum
 #: model:process.node,name:scrum.process_node_productbacklog0
@@ -546,100 +546,100 @@ msgstr ""
 #. module: scrum
 #: field:scrum.product.backlog,user_id:0
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: scrum
 #: field:scrum.product.backlog,active:0
 #: field:scrum.project,active:0
 #: field:scrum.task,active:0
 msgid "Active"
-msgstr ""
+msgstr "有效"
 
 #. module: scrum
 #: help:scrum.task,delay_hours:0
 msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
-msgstr ""
+msgstr "计算:总时间 - 估计时间.它给项目管理者一个估计时间和实际时间的差异"
 
 #. module: scrum
 #: field:scrum.task,timebox_id:0
 msgid "Timebox"
-msgstr ""
+msgstr "时间箱"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree2
 msgid "Draft Sprints"
-msgstr ""
+msgstr "Sprints草稿"
 
 #. module: scrum
 #: field:scrum.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "工作时间"
 
 #. module: scrum
 #: field:scrum.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "工作完成"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
-msgstr ""
+msgstr "Sprint Backlog视图"
 
 #. module: scrum
 #: field:scrum.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "委托给"
 
 #. module: scrum
 #: field:scrum.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "关闭日期"
 
 #. module: scrum
 #: field:scrum.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "分配给"
 
 #. module: scrum
 #: field:scrum.meeting,question_backlog:0
 msgid "Backlog Accurate"
-msgstr ""
+msgstr "Blacklog正确"
 
 #. module: scrum
 #: help:scrum.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
+msgstr "这项目所有相关任务花费时间的合计"
 
 #. module: scrum
 #: help:scrum.task,project_id:0
 msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
-msgstr ""
+msgstr "如果项目名字有[?],这意味着项目没有链接的辅助核算项"
 
 #. module: scrum
 #: help:scrum.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
+msgstr "这项目所有相关任务计划时间的合计"
 
 #. module: scrum
 #: field:scrum.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "警告业务伙伴"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
 msgid "My Sprints (Product Owner)"
-msgstr ""
+msgstr "我的Sprints(产品负责人)"
 
 #. module: scrum
 #: field:scrum.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "任务摘要"
 
 #. module: scrum
 #: help:scrum.project,category_id:0
@@ -647,7 +647,7 @@ msgid ""
 "Link this project to an analytic account if you need financial management on "
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
-msgstr ""
+msgstr "如果你需要项目财务管理链接到项目辅助核算项.它能连接到项目的预算,计划,成本和收益分析,项目时间表等."
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
@@ -655,7 +655,7 @@ msgstr ""
 #: selection:scrum.sprint,state:0
 #: selection:scrum.task,state:0
 msgid "Done"
-msgstr ""
+msgstr "完成"
 
 #. module: scrum
 #: wizard_button:scrum.product.backlog.task.create,init,end:0
@@ -666,7 +666,7 @@ msgstr "取消"
 #: selection:scrum.product.backlog,state:0
 #: selection:scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "打开"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
@@ -675,78 +675,78 @@ msgstr ""
 #: view:scrum.sprint:0
 #: field:scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "有效时间"
 
 #. module: scrum
 #: field:scrum.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "警告消息"
 
 #. module: scrum
 #: selection:scrum.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "进展"
 
 #. module: scrum
 #: field:scrum.sprint,review:0
 msgid "Sprint Review"
-msgstr ""
+msgstr "Sprint复审"
 
 #. module: scrum
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须以x_开头并且不很含有特殊的字符"
 
 #. module: scrum
 #: field:scrum.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "剩余时间"
 
 #. module: scrum
 #: field:scrum.task,parent_id:0
 msgid "Parent Task"
-msgstr ""
+msgstr "上级任务"
 
 #. module: scrum
 #: field:scrum.product.backlog,name:0
 msgid "Feature"
-msgstr ""
+msgstr "特征"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "非常低"
 
 #. module: scrum
 #: help:scrum.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "时间表工作时间调整甘特图报表"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree3
 msgid "Sprints Done"
-msgstr ""
+msgstr "Sprints完成"
 
 #. module: scrum
 #: model:process.transition,name:scrum.process_transition_backlogtask0
 msgid "Backlog Task"
-msgstr ""
+msgstr "Backlog任务"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 #: view:scrum.project:0
 #: view:scrum.sprint:0
 msgid "Planned hours"
-msgstr ""
+msgstr "计划时间"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_scrum_project_form
 #: model:ir.ui.menu,name:scrum.menu_action_scrum_project_form
 msgid "Edit Projects"
-msgstr ""
+msgstr "编辑项目"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_meeting_form
@@ -754,120 +754,120 @@ msgstr ""
 #: model:ir.ui.menu,name:scrum.menu_action_meeting_form
 #: view:scrum.meeting:0
 msgid "Scrum Meeting"
-msgstr ""
+msgstr "Scrum会议"
 
 #. module: scrum
 #: field:scrum.task,description:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "紧急"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Daily Meetings"
-msgstr ""
+msgstr "每日会议"
 
 #. module: scrum
 #: view:scrum.meeting:0
 msgid "What are you working on today ?"
-msgstr ""
+msgstr "今天你要干什么工作?"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "运行"
 
 #. module: scrum
 #: field:scrum.product.backlog,progress:0
 #: field:scrum.sprint,progress:0
 msgid "Progress (0-100)"
-msgstr ""
+msgstr "进度(0 - 100)"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_team
 msgid "Scrum Team"
-msgstr ""
+msgstr "Scrum团队"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_project
 #: field:scrum.product.backlog,project_id:0
 msgid "Scrum Project"
-msgstr ""
+msgstr "Scrum项目"
 
 #. module: scrum
 #: field:scrum.project,parent_id:0
 msgid "Parent project"
-msgstr ""
+msgstr "上级项目"
 
 #. module: scrum
 #: view:scrum.sprint:0
 msgid "Sprint Info"
-msgstr ""
+msgstr "Sprint信息"
 
 #. module: scrum
 #: field:scrum.sprint,scrum_master_id:0
 msgid "Scrum Master"
-msgstr ""
+msgstr "Scrum主管"
 
 #. module: scrum
 #: field:scrum.product.backlog,tasks_id:0
 msgid "Tasks Details"
-msgstr ""
+msgstr "任务详情"
 
 #. module: scrum
 #: field:scrum.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "时间花费"
 
 #. module: scrum
 #: field:scrum.task,context_id:0
 msgid "Context"
-msgstr ""
+msgstr "上下文"
 
 #. module: scrum
 #: field:scrum.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "总时间"
 
 #. module: scrum
 #: field:scrum.team,users_id:0
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: scrum
 #: field:scrum.product.backlog,sequence:0
 #: field:scrum.project,priority:0
 #: field:scrum.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: scrum
 #: help:scrum.project,warn_footer:0
 msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
-msgstr ""
+msgstr "任务关闭时发送给客户警告电子邮件增加的页脚"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open
 #: model:ir.ui.menu,name:scrum.menu_action_product_backlog_form_open
 msgid "Opened Backlogs"
-msgstr ""
+msgstr "待处理的Backlogs"
 
 #. module: scrum
 #: model:ir.actions.wizard,name:scrum.wizard_scrum_backlog_task
 msgid "Created tasks"
-msgstr ""
+msgstr "创建任务"
 
 #. module: scrum
 #: constraint:scrum.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr ""
+msgstr "错误!你不能创建递归的项目"
 
 #. module: scrum
 #: wizard_field:scrum.product.backlog.task.create,init,user_id:0
@@ -885,9 +885,9 @@ msgstr ""
 #. module: scrum
 #: field:scrum.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "即将结束"
 
 #. module: scrum
 #: field:scrum.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "电子邮件页脚"
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 81ad9e5bb0b..d046f9c0519 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:56+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:28+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -24,27 +24,27 @@ msgstr "后进先出"
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "连接货位若固定连接"
+msgstr "如果固定连锁库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
-msgstr "STOCK_SAVE"
+msgstr "保存"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
 msgid "Sub Products"
-msgstr "副产品"
+msgstr "子产品"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-account"
-msgstr "terp-account"
+msgstr "会计"
 
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -55,27 +55,27 @@ msgstr "库存管理"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_ASCENDING"
-msgstr "STOCK_SORT_ASCENDING"
+msgstr "升序"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision"
-msgstr "修订版"
+msgstr "修改"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_FORWARD"
-msgstr "STOCK_MEDIA_FORWARD"
+msgstr "向前"
 
 #. module: stock
 #: rml:lot.location:0
 msgid "Total :"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_100"
-msgstr "STOCK_ZOOM_100"
+msgstr "放大100"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -86,24 +86,24 @@ msgstr "计量单位"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
 msgid "Return packing"
-msgstr "退回挑选"
+msgstr "退回包装"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
 msgid "Stock journal"
-msgstr "库存流水账"
+msgstr "库存分类帐"
 
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr "在特定位置填充库存"
+msgstr "填写具体库位盘存"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 #: field:stock.picking.move.wizard,picking_id:0
 msgid "Packing list"
-msgstr "装箱单"
+msgstr "包装单"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -114,13 +114,13 @@ msgstr "金额"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr "已收货品"
+msgstr "产品接收"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 msgid "Incoming Products"
-msgstr "进来的产品列表"
+msgstr "接收产品"
 
 #. module: stock
 #: field:stock.picking,name:0
@@ -141,7 +141,7 @@ msgstr "业务伙伴"
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr "收货时强制指定产品批号"
+msgstr "接收强制的生产批次"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -159,22 +159,22 @@ msgstr "生产批次"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NEW"
-msgstr "STOCK_NEW"
+msgstr "新"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CANCEL"
-msgstr "STOCK_CANCEL"
+msgstr "取消"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "内部地点"
+msgstr "内部库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT"
-msgstr "STOCK_PRINT"
+msgstr "打印"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -201,47 +201,47 @@ msgstr "可用"
 #. module: stock
 #: view:stock.move:0
 msgid "Make Parcel"
-msgstr "打包裹"
+msgstr "打小包"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr "创建分拣单结果"
+msgstr "包装结果"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
-msgstr "STOCK_QUIT"
+msgstr "退出"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "出库位置"
+msgstr "库位出"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
-msgstr "STOCK_GOTO_TOP"
+msgstr "顶"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ABOUT"
-msgstr "STOCK_ABOUT"
+msgstr "关于"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-hr"
-msgstr "terp-hr"
+msgstr "人力资源"
 
 #. module: stock
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr "货位类型"
+msgstr "库位类型"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-purchase"
-msgstr "terp-purchase"
+msgstr "采购"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -256,12 +256,12 @@ msgstr "["
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Sent"
-msgstr "已发出货品"
+msgstr "产品发出"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+msgstr "开始"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -272,7 +272,7 @@ msgstr "内部调拨"
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "装箱"
+msgstr "包装"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -284,7 +284,7 @@ msgstr "订单(来源)"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr "总计："
+msgstr "总计:"
 
 #. module: stock
 #: view:stock.location:0
@@ -295,33 +295,33 @@ msgstr "附加信息"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Customer Refund"
-msgstr "客户退款"
+msgstr "客户退货"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
-msgstr "STOCK_FLOPPY"
+msgstr "软驱"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "生产批次修订"
+msgstr "生产批次修改"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock location"
-msgstr "库存货位"
+msgstr "库存库位"
 
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr "货位名称"
+msgstr "库位名称"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
+msgstr "不缩进"
 
 #. module: stock
 #: view:stock.move:0
@@ -332,7 +332,7 @@ msgstr "调拨信息"
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr "未接收货品"
+msgstr "未接收产品"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -344,27 +344,27 @@ msgstr "状态"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
-msgstr "客户列表"
+msgstr "客户"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDERLINE"
-msgstr "STOCK_UNDERLINE"
+msgstr "下划线"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Move Lines"
-msgstr "调拨明细"
+msgstr "调拨线路"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
 msgid "Include all childs for the location"
-msgstr "包含所有货位子项"
+msgstr "包括所有库位子项"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "采购地点"
+msgstr "产品需求库位"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -375,7 +375,7 @@ msgstr "生产批次"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Recipient"
-msgstr "接收方"
+msgstr "接收"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.track_line
@@ -385,22 +385,22 @@ msgstr "跟踪明细"
 #. module: stock
 #: field:stock.location,child_ids:0
 msgid "Contains"
-msgstr "包含"
+msgstr "含"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
-msgstr "STOCK_BOLD"
+msgstr "粗体"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
-msgstr "terp-graph"
+msgstr "图像"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+msgstr "偏爱"
 
 #. module: stock
 #: rml:lot.location:0
@@ -419,12 +419,12 @@ msgstr "现在处理"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "货位地址"
+msgstr "库位地址"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr "生产批次是标记在产品上的序列号"
+msgstr "生产批次是生产的一个序列号"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_13
@@ -434,12 +434,12 @@ msgstr "库存层1"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
-msgstr "STOCK_MEDIA_REWIND"
+msgstr "倒回"
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "入库位置"
+msgstr "库位进"
 
 #. module: stock
 #: view:res.partner:0
@@ -449,12 +449,12 @@ msgstr "库存属性"
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr "进行挑选"
+msgstr "建立领料/提货"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr "采购"
+msgstr "产品需求"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
@@ -470,12 +470,12 @@ msgstr "调拨草稿"
 #. module: stock
 #: field:report.stock.lines.date,product_id:0
 msgid "Product Id"
-msgstr "产品标识符"
+msgstr "产品ID"
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "销售与采购"
+msgstr "销售&采购"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -485,17 +485,17 @@ msgstr "客户发票"
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "存货地点"
+msgstr "盘存库位"
 
 #. module: stock
 #: help:product.product,track_production:0
 msgid "Force to use a Production Lot during production order"
-msgstr "在生产订单中强制使用生产批次"
+msgstr "生产单强制的生产批次"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
+msgstr "剪贴"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -503,23 +503,23 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "when you do an inventory"
-msgstr "对于当前货品(模板)系统库存盘点时应用该库存货位作为调拨的源货位而不是默认的货位。"
+msgstr "对于当前产品(模板)该库存库位默认作为库存盘点时库存调拨的源库位."
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
 msgid "This account will be used to value the output stock"
-msgstr "用于评估出产库存的帐目"
+msgstr "用于记录出库价值科目"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_FIT"
-msgstr "STOCK_ZOOM_FIT"
+msgstr "放大到适合"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
 msgid ""
 "This journal will be used for the accounting move generated by stock move"
-msgstr "用于记录库存调拨产生的会计调拨的流水帐"
+msgstr "用于记录库存调拨产生的会计变动."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
@@ -530,17 +530,17 @@ msgstr "送货日程表"
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incomming Lots"
-msgstr "跟踪进来批次"
+msgstr "跟踪进入库批次"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "按货位库存"
+msgstr "库存库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE_AS"
-msgstr "STOCK_SAVE_AS"
+msgstr "另存到"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
@@ -560,7 +560,7 @@ msgstr "视图"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_ERROR"
-msgstr "STOCK_DIALOG_ERROR"
+msgstr "错误"
 
 #. module: stock
 #: field:stock.location,parent_left:0
@@ -575,18 +575,18 @@ msgstr "最近盘存日期"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDEX"
-msgstr "STOCK_INDEX"
+msgstr "索引"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_BOTTOM"
-msgstr "STOCK_GOTO_BOTTOM"
+msgstr "底"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_form
 #: model:ir.ui.menu,name:stock.menu_action_picking_form
 msgid "New Reception Packing"
-msgstr "新收货分拣单"
+msgstr "新接收的包装"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,quantity:0
@@ -604,7 +604,7 @@ msgstr "库存调拨"
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "生产地点"
+msgstr "生产库位"
 
 #. module: stock
 #: field:stock.move,tracking_id:0
@@ -614,27 +614,27 @@ msgstr "跟踪批次"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_FORWARD"
-msgstr "STOCK_GO_FORWARD"
+msgstr "向前"
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr "作者"
+msgstr "建立者"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDELETE"
-msgstr "未删除"
+msgstr "恢复"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EXECUTE"
-msgstr "STOCK_EXECUTE"
+msgstr "执行"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_QUESTION"
-msgstr "STOCK_DIALOG_QUESTION"
+msgstr "疑问"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -659,28 +659,28 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"
-msgstr "跟踪号（序列号）"
+msgstr "跟踪号/序号"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_FONT"
-msgstr "STOCK_SELECT_FONT"
+msgstr "选择字体"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PASTE"
-msgstr "STOCK_PASTE"
+msgstr "粘贴"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "业务伙伴货位"
+msgstr "业务伙伴库位"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr "跟踪批次是放在物流单位/托盘上的编码"
+msgstr "跟踪批次是代码将放入逻辑单位/托板"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -700,17 +700,17 @@ msgstr "库存"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr "分拣单:"
+msgstr "包装单:"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_RECORD"
-msgstr "STOCK_MEDIA_RECORD"
+msgstr "记录"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr "日历视图"
+msgstr "日程表视图"
 
 #. module: stock
 #: wizard_field:stock.location.products,init,from_date:0
@@ -725,22 +725,22 @@ msgstr "重量"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Non Assigned Products:"
-msgstr "未分配货品"
+msgstr "没指定产品"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr "发票管理"
+msgstr "发票控制"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr "生产批次修订"
+msgstr "生产批次次修订"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Packing Done"
-msgstr "创建分拣单完成"
+msgstr "打包装完成"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -754,7 +754,7 @@ msgstr "等待中"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr "可用分拣单"
+msgstr "可包装"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -765,7 +765,7 @@ msgstr "仓库"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-report"
-msgstr "terp-report"
+msgstr "报表"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,type:0
@@ -780,56 +780,56 @@ msgstr "一般IT供应商"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr "货位存量（包子项）"
+msgstr "货物内容(子库位)"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FILE"
-msgstr "STOCK_FILE"
+msgstr "文件"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr "盘存明细标识符"
+msgstr "盘存明细ID"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EDIT"
-msgstr "STOCK_EDIT"
+msgstr "编辑"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONNECT"
-msgstr "STOCK_CONNECT"
+msgstr "连接"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_all
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr "分拣单"
+msgstr "包装"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_DOWN"
-msgstr "STOCK_GO_DOWN"
+msgstr "向下"
 
 #. module: stock
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "客户地点"
+msgstr "客户库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OK"
-msgstr "STOCK_OK"
+msgstr "好"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr "新内部分拣单"
+msgstr "新的内部包装"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -856,7 +856,7 @@ msgstr "成品"
 #. module: stock
 #: field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr "上级地址"
+msgstr "业务伙伴库位"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -866,7 +866,7 @@ msgstr "创建日期"
 #. module: stock
 #: wizard_button:inventory.merge.stock.zero,init,merge:0
 msgid "Set to Zero"
-msgstr "设为零"
+msgstr "设为0"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -876,18 +876,18 @@ msgstr "所有库存调拨"
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: stock
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "供货商地点"
+msgstr "供货商库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HELP"
-msgstr "STOCK_HELP"
+msgstr "帮助"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -897,12 +897,12 @@ msgstr "紧急"
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
 msgid "This account will be used to value the input stock"
-msgstr "用于估价入库的帐目"
+msgstr "用于记录入库的价值科目"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
+msgstr "信息"
 
 #. module: stock
 #: field:stock.move,date:0
@@ -928,23 +928,23 @@ msgstr "已创建存货调拨"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_BACK"
-msgstr "STOCK_GO_BACK"
+msgstr "后退"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "将开票"
+msgstr "要开票"
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr "对方货位属性"
+msgstr "对应库位属性"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_FILL"
-msgstr "STOCK_JUSTIFY_FILL"
+msgstr "两端对齐"
 
 #. module: stock
 #: view:stock.move:0
@@ -965,22 +965,22 @@ msgstr "分配方法"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-administration"
-msgstr "管理"
+msgstr "管理员"
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "位置库存"
+msgstr "库位库存"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_APPLY"
-msgstr "STOCK_APPLY"
+msgstr "应用"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr "这分挑选创建成功!"
+msgstr "这包装创建成功!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -997,23 +997,23 @@ msgstr "定期盘存"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-crm"
-msgstr "terp-crm"
+msgstr "客户关系管理"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STRIKETHROUGH"
-msgstr "STOCK_STRIKETHROUGH"
+msgstr "加删除线"
 
 #. module: stock
 #: rml:lot.stock.overview_all:0
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr "编码"
+msgstr "代码"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-partner"
-msgstr "terp-partner"
+msgstr "业务伙伴"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
@@ -1060,12 +1060,12 @@ msgstr "信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MISSING_IMAGE"
-msgstr "STOCK_MISSING_IMAGE"
+msgstr "图像"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
+msgstr "检查"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
@@ -1082,19 +1082,19 @@ msgstr "单价"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Later"
-msgstr "稍后处理"
+msgstr "最后处理"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
-msgstr "该货位将作为您接收业务伙伴货品的来源而不是默认的货位"
+msgstr "默认作为你接收业务伙伴产品的来源库位"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr "所有者地址"
+msgstr "拥有者地址"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -1104,23 +1104,23 @@ msgstr "右父项"
 #. module: stock
 #: field:stock.picking,origin:0
 msgid "Origin Reference"
-msgstr "来源引用"
+msgstr "来源参考"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form4
 #: model:ir.ui.menu,name:stock.menu_action_move_form4
 msgid "Available Moves"
-msgstr "可移动"
+msgstr "可调拨"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HARDDISK"
-msgstr "STOCK_HARDDISK"
+msgstr "硬盘"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "相关运货清单"
+msgstr "相关领料/提货"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1128,7 +1128,7 @@ msgstr "相关运货清单"
 #: field:stock.picking.move.wizard,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr "名称"
+msgstr "3"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -1138,7 +1138,7 @@ msgstr "库存盘存明细"
 #. module: stock
 #: wizard_button:stock.location.products,init,open:0
 msgid "Open Products"
-msgstr "打开货品"
+msgstr "待处理产品"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -1148,23 +1148,23 @@ msgstr "]"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Packing List"
-msgstr "输入分拣单"
+msgstr "接收包装单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr "分拣单"
+msgstr "包装单"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
+msgstr "复制"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr "供应商退款"
+msgstr "供应商退货"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1175,32 +1175,32 @@ msgstr "库存调拨"
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 msgid "Stock Output Account"
-msgstr "出库帐目"
+msgstr "出库科目"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "自动无步骤增加"
+msgstr "自动没步骤增加"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "Stock Location Analysis"
-msgstr "库存货位分析"
+msgstr "库存库位分析"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
+msgstr "光驱"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not from Packing"
-msgstr "不是根据分拣单"
+msgstr "不是来自包装"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr "连锁货位"
+msgstr "连锁库位"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
@@ -1210,71 +1210,71 @@ msgstr "盘存损失"
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Ref"
-msgstr "内部引用"
+msgstr "内部参考"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REFRESH"
-msgstr "刷新"
+msgstr "恢复"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
+msgstr "停止"
 
 #. module: stock
 #: wizard_view:stock.move.track,init:0
 msgid "Tracking a move"
-msgstr "跟踪货品移动"
+msgstr "跟踪调拨"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
+msgstr "替换"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
+msgstr "警告"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
+msgstr "缩小"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
+msgstr "修改"
 
 #. module: stock
 #: field:stock.move,note:0
 #: view:stock.picking:0
 #: field:stock.picking,note:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: stock
 #: field:stock.picking,move_lines:0
 #: field:stock.picking.move.wizard,move_ids:0
 msgid "Move lines"
-msgstr "货运明细"
+msgstr "调拨明细"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr "价值"
+msgstr "值"
 
 #. module: stock
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr "货运类型"
+msgstr "运送类型"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -1289,27 +1289,27 @@ msgstr "交货方式"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr "分批出货分拣"
+msgstr "部分包装"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-calendar"
-msgstr "terp-calendar"
+msgstr "日程表"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
+msgstr "斜体"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_YES"
-msgstr "STOCK_YES"
+msgstr "是"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
 msgid "Fill From Unreceived Products"
-msgstr "由未接收的货品填充"
+msgstr "填充未接收的产品"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -1320,12 +1320,12 @@ msgstr "调拨目的点"
 #: model:ir.actions.act_window,name:stock.action_inventory_form_new
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
 msgid "New Periodical Inventory"
-msgstr "新定期盘存"
+msgstr "新的定期盘存"
 
 #. module: stock
 #: field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr "修订记录"
+msgstr "修改"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1336,7 +1336,7 @@ msgstr "先进先出"
 #: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
 #: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
 msgid "Delivery Orders to Process"
-msgstr "未处理送货单"
+msgstr "处理送货单"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -1355,7 +1355,7 @@ msgstr "优先级"
 #: rml:stock.picking.list:0
 #: field:stock.report.prodlots,location_id:0
 msgid "Location"
-msgstr "货位"
+msgstr "库位"
 
 #. module: stock
 #: field:stock.picking,invoice_state:0
@@ -1370,12 +1370,12 @@ msgstr "单位"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
+msgstr "左对齐"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr "取消盘点"
+msgstr "取消盘存"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -1414,13 +1414,13 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr "固定货位"
+msgstr "固定库位"
 
 #. module: stock
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: stock
 #: field:stock.picking,min_date:0
@@ -1431,32 +1431,32 @@ msgstr "计划日期"
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr "发出货品"
+msgstr "发出的产品"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COLOR_PICKER"
-msgstr "STOCK_COLOR_PICKER"
+msgstr "颜色包"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_lot_location
 msgid "Lots by location"
-msgstr "按货位批次"
+msgstr "库位批次"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
+msgstr "删除"
 
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr "库存日记帐"
+msgstr "库存分类帐"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLEAR"
-msgstr "STOCK_CLEAR"
+msgstr "清空"
 
 #. module: stock
 #: field:stock.production.lot,date:0
@@ -1466,12 +1466,12 @@ msgstr "创建日期"
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "需求单"
+msgstr "产品需求"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr "Maxtor 供应商"
+msgstr "Maxtor供应商"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1481,28 +1481,28 @@ msgstr "强制可用"
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr "视察货品库存"
+msgstr "产品库存视图"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mrp"
-msgstr "terp-mrp"
+msgstr "生产资源计划"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
 msgid "Future Delivery Orders"
-msgstr "计划送货单"
+msgstr "未来的送货单"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_UP"
-msgstr "STOCK_GO_UP"
+msgstr "向上"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
+msgstr "降序"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
@@ -1513,27 +1513,27 @@ msgstr "跟踪批次"
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
 msgid "Yes"
-msgstr "确定"
+msgstr "是"
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr "库存"
+msgstr "库存清单"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
+msgstr "首页"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
-msgstr "STOCK_PROPERTIES"
+msgstr "属性"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr "实际库存"
+msgstr "实时库存"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_fill_inventory
@@ -1550,7 +1550,7 @@ msgstr "创建发票"
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr "修订日期"
+msgstr "修改日期"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -1560,23 +1560,23 @@ msgstr "批次"
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stock to Zero"
-msgstr "设库存为零"
+msgstr "设库存为0"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr "数量（销售计量单位）"
+msgstr "数量(销售单位)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr "未处理分拣单"
+msgstr "包装处理"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
-msgstr "STOCK_MEDIA_STOP"
+msgstr "停止"
 
 #. module: stock
 #: view:stock.move:0
@@ -1597,7 +1597,7 @@ msgstr "拖欠订单"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND_MULTIPLE"
-msgstr "STOCK_DND_MULTIPLE"
+msgstr "倍数"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1610,7 +1610,7 @@ msgstr "移除"
 #: field:stock.picking,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
-msgstr "有效"
+msgstr "生效"
 
 #. module: stock
 #: view:product.template:0
@@ -1629,17 +1629,17 @@ msgstr "贸易术语"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr "总计："
+msgstr "合计:"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
+msgstr "确定"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_OUT"
-msgstr "STOCK_ZOOM_OUT"
+msgstr "放大"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,tracking_prefix:0
@@ -1654,22 +1654,22 @@ msgstr "最近"
 #. module: stock
 #: wizard_field:stock.location.products,init,to_date:0
 msgid "To"
-msgstr "至"
+msgstr "到"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr "修订名称"
+msgstr "修改名称"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
-msgstr "STOCK_SELECT_COLOR"
+msgstr "选择颜色"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr "盘点审核"
+msgstr "库存确定"
 
 #. module: stock
 #: view:product.category:0
@@ -1679,12 +1679,12 @@ msgstr "会计库存属性"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NO"
-msgstr "STOCK_NO"
+msgstr "否"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_workshop
 msgid "Workshop"
-msgstr "车间"
+msgstr "工厂"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -1696,12 +1696,12 @@ msgstr "完成"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr "虚拟货位"
+msgstr "虚拟库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
+msgstr "重做"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -1721,7 +1721,7 @@ msgstr "不紧急"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
-msgstr "STOCK_CLOSE"
+msgstr "关闭"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -1732,7 +1732,7 @@ msgstr "仓库"
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr "交货时强制用生产批次"
+msgstr "送货强制的生产批次"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1742,7 +1742,7 @@ msgstr "把调拨明细线分为两部分"
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,journal_id:0
 msgid "Destination Journal"
-msgstr "目标日记帐"
+msgstr "目标分类帐"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
@@ -1764,7 +1764,7 @@ msgstr "产品"
 #. module: stock
 #: wizard_button:stock.return.picking,init,return:0
 msgid "Return"
-msgstr "返回"
+msgstr "退回"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
@@ -1774,7 +1774,7 @@ msgstr "自动创建分拣单"
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "产品销售计量单位"
+msgstr "产品销售单位"
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -1791,7 +1791,7 @@ msgstr "产品计量单位"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Variants"
-msgstr "变体"
+msgstr "系列型号"
 
 #. module: stock
 #: field:stock.location,posx:0
@@ -1806,27 +1806,27 @@ msgstr "供应商"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUMP_TO"
-msgstr "STOCK_JUMP_TO"
+msgstr "跳到"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
-msgstr "terp-tools"
+msgstr "工具"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 msgid "Location Overview"
-msgstr "货位概述"
+msgstr "库位概述"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.location_product
 msgid "Products by Location"
-msgstr "按货位产品"
+msgstr "产品库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
+msgstr "取消"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.move_split
@@ -1836,7 +1836,7 @@ msgstr "分割调拨明细"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-sale"
-msgstr "terp-sale"
+msgstr "销售"
 
 #. module: stock
 #: field:stock.production.lot,name:0
@@ -1846,7 +1846,7 @@ msgstr "序号"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ADD"
-msgstr "STOCK_ADD"
+msgstr "增加"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1861,12 +1861,12 @@ msgstr "源货位"
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr "会计分录"
+msgstr "凭证"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
-msgstr "STOCK_MEDIA_PAUSE"
+msgstr "暂停"
 
 #. module: stock
 #: view:product.product:0
@@ -1876,7 +1876,7 @@ msgstr "批次"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
-msgstr "一次全部"
+msgstr "所有一起"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -1894,17 +1894,17 @@ msgstr "盘存日期"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
-msgstr "STOCK_PRINT_PREVIEW"
+msgstr "打印预览"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
+msgstr "查找"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "批次盘库"
+msgstr "盘存明细"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1915,8 +1915,7 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"这仅用于如果您选择连锁货位类型\n"
-"'自动调拨'将在现有的以后创建一个新自动被审核的库存调拨。'手动操作'库存调拨需要人为审核。'自动无增加步骤'货位是取代原始调拨用的货位。"
+"如果你选择链式库位这是唯一的.'自动调拨'将创建一个库存调拨后当前这个将自动确认.'手动操作'库存调拨需要人手确认.'自动不增加'库位式取代调拨来源."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -1938,7 +1937,7 @@ msgstr "确定"
 #: help:product.template,property_stock_account_input:0
 msgid ""
 "This account will be used, instead of the default one, to value input stock"
-msgstr "这帐目将取代默认帐目使用，以评估入库库存"
+msgstr "默认作为记录入库值科目"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -1948,12 +1947,12 @@ msgstr "非欧洲客户"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Components"
-msgstr "组件"
+msgstr "零部件"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 msgid "Do you want to merge theses inventories ?"
-msgstr "您是否想合并盘存？"
+msgstr "你真的要合并库存?"
 
 #. module: stock
 #: field:stock.picking,max_date:0
@@ -1973,12 +1972,12 @@ msgstr "收货"
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "库存货位"
+msgstr "库存库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr "STOCK_MEDIA_PLAY"
+msgstr "播放"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -1989,25 +1988,25 @@ msgstr "送货单"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr "STOCK_OPEN"
+msgstr "打开"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
 msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
-msgstr "发送货物到这个业务伙伴时，该货位将代替默认货位使用。"
+msgstr "默认作为你发送货物到业务伙伴的目标库位."
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr "已审核"
+msgstr "确定"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
+msgstr "前一个"
 
 #. module: stock
 #: view:stock.move:0
@@ -2017,7 +2016,7 @@ msgstr "确认"
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr "检查有效"
+msgstr "检查可用"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
@@ -2029,23 +2028,23 @@ msgstr "合并盘存"
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Stock Locations Structure"
-msgstr "库存货位结构"
+msgstr "库存库位结构"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr "未连接"
+msgstr "分拆"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
 msgid ""
 "This account will be used, instead of the default one, to value output stock"
-msgstr "该帐目将会取代默认帐目使用，用来评估出库库存"
+msgstr "默认作为记录出库值科目"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr "确认（现在无进程）"
+msgstr "确认(现在没处理进程)"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
@@ -2055,7 +2054,7 @@ msgstr "调拨跟踪"
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
@@ -2066,7 +2065,7 @@ msgstr "创建发票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr "STOCK_NETWORK"
+msgstr "网络"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -2076,7 +2075,7 @@ msgstr "设置"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr "terp-project"
+msgstr "项目"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2085,12 +2084,12 @@ msgstr "terp-project"
 #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
 #: view:stock.report.prodlots:0
 msgid "Stock by Lots"
-msgstr "按批次库存"
+msgstr "库存批次"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "自动审核"
+msgstr "自动验证"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -2107,12 +2106,12 @@ msgstr "虚拟库存值"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr "已取消"
+msgstr "取消"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr "STOCK_GOTO_LAST"
+msgstr "最后"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2122,7 +2121,7 @@ msgstr "已开票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr "STOCK_DIRECTORY"
+msgstr "目录"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2130,12 +2129,12 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "by production orders"
-msgstr "对于现有货品(模板)，该库存货位取代默认货位作为生产时库存调拨的源货位。"
+msgstr "对于当前产品(模板)该库存库位默认作为你生产时库存调拨的源库位."
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
 msgid "Add"
-msgstr "添加"
+msgstr "增加"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -2152,7 +2151,7 @@ msgstr "草稿"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr "STOCK_JUSTIFY_CENTER"
+msgstr "居中"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2160,7 +2159,7 @@ msgstr "STOCK_JUSTIFY_CENTER"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr "确认分拣单等待可用"
+msgstr "确认包装等待可用"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -2170,27 +2169,27 @@ msgstr "架子（Y）"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
 msgid "Set Stock to 0"
-msgstr "设置库存为零"
+msgstr "设库存为0"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localisation"
-msgstr "本地化"
+msgstr "本地"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Do you want to set stocks to zero ?"
-msgstr "您是否想设库存为零？"
+msgstr "你真的设库存为0?"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Direct Delivery"
-msgstr "直接交货"
+msgstr "直接送货"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr "STOCK_REVERT_TO_SAVED"
+msgstr "恢复到保存"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -2200,12 +2199,12 @@ msgstr "跟踪生产批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Split in Two"
-msgstr "分为两部分"
+msgstr "分割两个"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr "计划库存调拨"
+msgstr "未来库存调拨"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -2213,12 +2212,12 @@ msgid ""
 "For the current product (template), this stock location will be used, "
 "instead of the default one, as the source location for stock moves generated "
 "by procurements"
-msgstr "对于现有货品(模板)，该库存货将位取代默认货位作为由采购产生库存调拨的源货位"
+msgstr "对于当前产品(模板)该库存库位默认作为产品需求的库存调拨源库位."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr "stock.picking.move.wizard"
+msgstr "库存.领料/提货.调拨.向导"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -2236,7 +2235,7 @@ msgstr "可追踪"
 #. module: stock
 #: field:stock.picking,date:0
 msgid "Date Order"
-msgstr "订单日期"
+msgstr "订购日期"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -2247,14 +2246,14 @@ msgstr "供应商发票"
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
 msgid "Locations"
-msgstr "货位"
+msgstr "库位"
 
 #. module: stock
 #: help:stock.move,date_planned:0
 msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
-msgstr "产品移动预定日期或者实际日期如已经完成"
+msgstr "如果调拨完成.产品调拨的预定日期或实际日期"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2264,7 +2263,7 @@ msgstr "一般信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr "terp-product"
+msgstr "产品"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
@@ -2274,18 +2273,18 @@ msgstr "关闭"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Print Item Labels"
-msgstr "打印货品标签"
+msgstr "打印产品标签"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
-msgstr "调拨列表"
+msgstr "调拨"
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr "目标地点"
+msgstr "目标库位"
 
 #. module: stock
 #: wizard_button:stock.move.split,init,split:0
@@ -2295,12 +2294,12 @@ msgstr "分割"
 #. module: stock
 #: field:stock.location,account_id:0
 msgid "Inventory Account"
-msgstr "库存账号"
+msgstr "盘存科目"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stocks to Zero"
-msgstr "设库存为零"
+msgstr "设库存为0"
 
 #. module: stock
 #: model:stock.location,name:stock.location_production
@@ -2311,7 +2310,7 @@ msgstr "生产"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability_low
 msgid "Low Level"
-msgstr "低层"
+msgstr "底层"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -2327,7 +2326,7 @@ msgstr "缩进"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Delivery"
-msgstr "交货"
+msgstr "送货"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
@@ -2345,7 +2344,7 @@ msgstr "入库科目"
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr "连锁货位类型"
+msgstr "连锁库位类型"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2356,17 +2355,17 @@ msgstr "客户"
 #: model:ir.actions.act_window,name:stock.action_location_tree_3
 #: model:ir.ui.menu,name:stock.menu_action_location_tree_3
 msgid "Locations' Values"
-msgstr "货位值"
+msgstr "库位值"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr "输出"
+msgstr "发出"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "STOCK_JUSTIFY_RIGHT"
+msgstr "右对齐"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -2376,12 +2375,12 @@ msgstr "盘存明细"
 #. module: stock
 #: view:stock.picking:0
 msgid "Others info"
-msgstr "其他信息"
+msgstr "其它信息"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr "STOCK_MEDIA_NEXT"
+msgstr "下一个"
 
 #. module: stock
 #: view:stock.move:0
@@ -2392,4 +2391,34 @@ msgstr "调拨状态"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr "实体货位"
+msgstr "物理库位"
+
+#~ msgid "Stock Management"
+#~ msgstr "库存管理"
+
+#~ msgid ""
+#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
+#~ "structured stock locations.\n"
+#~ "Thanks to the double entry management, the inventory controlling is powerful "
+#~ "and flexible:\n"
+#~ "* Moves history and planning,\n"
+#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
+#~ "* Stock valuation (standard or average price, ...)\n"
+#~ "* Robustness faced with Inventory differences\n"
+#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
+#~ "* Bar code supported\n"
+#~ "* Rapid detection of mistakes through double entry system\n"
+#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+#~ "    "
+#~ msgstr ""
+#~ "系统库存管理模块能管理多仓库多和结构化仓库库位\n"
+#~ "\t使用复式记录管理提供灵活和强大库存控制:\n"
+#~ "\t*调拨历史和计划\n"
+#~ "\t*不同的库存管理方法(FIFO, LIFO, ...)\n"
+#~ "\t*存货估计(标准和平均估价)\n"
+#~ "\t*自动重开单规则(库存级别,jit)\n"
+#~ "\t*存货清单不同的鲁棒性\n"
+#~ "\t*条码支持\n"
+#~ "\t*通过复式录入系统实现快速检测错误\n"
+#~ "\t*跟踪能力(上游,下游,产品批号,序列号)\n"
+#~ "    "
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 36300abd89d..d3f7e18983c 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr "直接为分拣单开票"
+msgstr "发票直接分包"
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index 3c30cf1f6d7..3a1bb69caa8 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -4,59 +4,59 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
 msgid "Number of days to do this transition"
-msgstr "可过渡天数"
+msgstr "转换要的天数"
 
 #. module: stock_location
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效XML视图结构!"
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Stock Location Paths"
-msgstr "库存位置路径"
+msgstr "库存库位路径"
 
 #. module: stock_location
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr "自动无步骤增加"
+msgstr "自动没步骤增加"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
-msgstr "这些规则确定整个区域中正确的货品路径"
+msgstr "这些规则确定了库位树正确的产品路径"
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr "源货位"
+msgstr "源库位"
 
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
-msgstr "目标货位"
+msgstr "目标库位"
 
 #. module: stock_location
 #: field:stock.location.path,auto:0
@@ -67,7 +67,7 @@ msgstr "自动调拨"
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
-msgstr "货品"
+msgstr "产品"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -77,7 +77,7 @@ msgstr "手动操作"
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
 msgid "stock.location.path"
-msgstr "stock.location.path"
+msgstr "库存.库位.路径"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
@@ -89,8 +89,7 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"这些规则确定了货位树的货品路径。\n"
-"‘自动调拨’值将在现有库存调拨后创建一个新自动验证的库存调拨。‘手动操作’这库存调拨要工人验证。采用‘自动无步骤增加’则原调拨的货位被取代。"
+"这些规则确定了库位树正确的产品路径.‘自动调拨’将创建库存调拨后当前将自动验证.‘手动操作’这库存调拨要工人验证.‘自动没增加步骤’库位是取代原来的"
 
 #. module: stock_location
 #: field:stock.location.path,name:0
@@ -102,14 +101,40 @@ msgstr "操作"
 #: field:product.product,path_ids:0
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr "货位路径"
+msgstr "库位路径"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr "延期（天）"
+msgstr "延期(天)"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Procurement & Locations"
-msgstr "需求与货位"
+msgstr "产品需求&库位"
+
+#~ msgid ""
+#~ "\n"
+#~ "Manages product's path in locations.\n"
+#~ "\n"
+#~ "This module may be useful for different purposes:\n"
+#~ "* Manages the product in his whole manufacturing chain\n"
+#~ "* Manages different default locations by products\n"
+#~ "* Define paths within the warehouse to route products based on operations:\n"
+#~ "   - Quality Control\n"
+#~ "   - After Sales Services\n"
+#~ "   - Supplier Return\n"
+#~ "* Manage products to be rent.\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "管理产品的库位路径\n"
+#~ "\n"
+#~ " 这模块可能有不同的目的:\n"
+#~ "\t*在整个工业链管理产品\n"
+#~ "\t*基于运营为产品定义仓库的路径\n"
+#~ "\t- 质量控制\n"
+#~ "\t- 售后服务\n"
+#~ "\t- 供应退货\n"
+#~ "\t*管理产品免租\n"
+#~ "    "
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 8d3c5085e79..ab9cc438978 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:58+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:30+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构！"
+msgstr "无效的视图结构xml文件"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "自动分拣"
+msgstr "自动分包"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr "为生产单的原始物料自动分拣"
+msgstr "为生产原料单自动分包"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr ""
+msgstr "库存没自动分包"
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index 2b436638e7f..bbd55f3a8d5 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -4,23 +4,23 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-18 11:01+0000\n"
-"Last-Translator: 冯超 <rainofchaos@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
 #: field:subscription.subscription.history,document_id:0
 msgid "Source Document"
-msgstr "源单据"
+msgstr "源文档"
 
 #. module: subscription
 #: field:subscription.document,model:0
@@ -31,7 +31,7 @@ msgstr "对象"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须以x_开头并且不能包含特殊字符"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -41,12 +41,12 @@ msgstr "首次日期"
 #. module: subscription
 #: field:subscription.document.fields,field:0
 msgid "Field"
-msgstr "字段名称"
+msgstr "字段"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
 msgid "Subscription history"
-msgstr "订阅历史记录"
+msgstr "预订历史"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
@@ -61,7 +61,7 @@ msgstr "当前日期"
 #. module: subscription
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "这动作定义中无效的模块名"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
@@ -76,12 +76,12 @@ msgstr "状态"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 msgid "Subscription document fields"
-msgstr "订阅单据字段"
+msgstr "预订文档字段"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
 msgid "Interval Qty"
-msgstr "号码间隔"
+msgstr "间隔数量"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -91,23 +91,23 @@ msgstr "停止"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Set to Draft"
-msgstr "报送单据"
+msgstr "设为草稿"
 
 #. module: subscription
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
-msgstr ""
+msgstr "模块允许创建新的文档和在文档增加预订"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Running"
-msgstr "正在运行"
+msgstr "运行"
 
 #. module: subscription
 #: view:subscription.subscription.history:0
 msgid "Subscription History"
-msgstr "多次订货历史"
+msgstr "预订历史"
 
 #. module: subscription
 #: field:subscription.subscription,user_id:0
@@ -117,7 +117,7 @@ msgstr "用户"
 #. module: subscription
 #: field:subscription.subscription,interval_type:0
 msgid "Interval Unit"
-msgstr "单位间隔"
+msgstr "间隔单位"
 
 #. module: subscription
 #: field:subscription.subscription.history,date:0
@@ -132,12 +132,12 @@ msgstr "设置"
 #. module: subscription
 #: field:subscription.subscription,exec_init:0
 msgid "Number of documents"
-msgstr "呼入号码"
+msgstr "文档号码"
 
 #. module: subscription
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构xml文件"
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -158,32 +158,32 @@ msgstr "字段"
 #. module: subscription
 #: field:subscription.subscription,notes:0
 msgid "Notes"
-msgstr "注解"
+msgstr "备注"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Months"
-msgstr ""
+msgstr "月"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Days"
-msgstr ""
+msgstr "日"
 
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr ""
+msgstr "预定和经常性操作"
 
 #. module: subscription
 #: field:subscription.subscription,active:0
 msgid "Active"
-msgstr "活动的"
+msgstr "有效"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 msgid "Subscription document"
-msgstr "订阅单据"
+msgstr "预订文档"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -194,28 +194,28 @@ msgstr "定时作业"
 #: model:ir.model,name:subscription.model_subscription_subscription
 #: field:subscription.subscription.history,subscription_id:0
 msgid "Subscription"
-msgstr "订阅"
+msgstr "预订"
 
 #. module: subscription
 #: field:subscription.subscription,partner_id:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "业务伙伴"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Subsription Data"
-msgstr "多次订货数据"
+msgstr "预订数据"
 
 #. module: subscription
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr "多次订货文档"
+msgstr "预订文档"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "False"
-msgstr ""
+msgstr "假"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -226,24 +226,24 @@ msgstr "处理"
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
 #: model:ir.ui.menu,name:subscription.menu_action_subscription_form
 msgid "All Subscriptions"
-msgstr "所有订阅"
+msgstr "所有预订"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.next_id_45
 #: view:subscription.subscription:0
 msgid "Subscriptions"
-msgstr "多次订货"
+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 "单据类型"
+msgstr "文档类型"
 
 #. module: subscription
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr "多次订货文档字段"
+msgstr "预订文档字段"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index 58649a99590..b2853fed7a7 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-29 07:33+0000\n"
-"Last-Translator: Jeroen Vet <Unknown>\n"
+"PO-Revision-Date: 2010-03-20 10:31+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -29,7 +29,7 @@ msgstr "销售订单明细信息"
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
-msgstr "销售订单明细信息"
+msgstr "采购订单明细信息"
 
 #. module: warning
 #: field:product.product,sale_line_warn:0
@@ -39,7 +39,7 @@ msgstr "销售订单明细"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr "采购该货品时的警示"
+msgstr "采购订单产品警告"
 
 #. module: warning
 #: view:product.product:0
@@ -54,12 +54,12 @@ msgstr "警告"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr "封锁消息"
+msgstr "消息"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Invoice"
-msgstr "发票警示"
+msgstr "发票警告"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -69,12 +69,12 @@ msgstr "发票警示"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "No Message"
-msgstr "无消息"
+msgstr "没信息"
 
 #. module: warning
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构"
+msgstr "无效XML视图结构!"
 
 #. module: warning
 #: field:res.partner,invoice_warn:0
@@ -84,12 +84,12 @@ msgstr "发票"
 #. module: warning
 #: model:ir.module.module,shortdesc:warning.module_meta_information
 msgid "Module for Warnings form onchange Event"
-msgstr "变更事件警示模块"
+msgstr "变更事件警告模块"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr "销售这货品时警示"
+msgstr "销售这产品时警告"
 
 #. module: warning
 #: field:res.partner,sale_warn:0
@@ -99,7 +99,7 @@ msgstr "销售订单"
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
-msgstr "存货分拣"
+msgstr "仓库领料/提货"
 
 #. module: warning
 #: field:res.partner,purchase_warn:0
@@ -137,17 +137,17 @@ msgstr "发票信息"
 #. module: warning
 #: model:ir.module.module,description:warning.module_meta_information
 msgid "Module for Warnings form onchange Event."
-msgstr "变更事件警示模块"
+msgstr "变更事件警告模块"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "分拣单警示"
+msgstr "领料/提货警告"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Purchase Order"
-msgstr "采购订单警示"
+msgstr "采购订单警告"
 
 #. module: warning
 #: view:res.partner:0
@@ -162,9 +162,9 @@ msgstr "销售订单警告"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Warning"
-msgstr "警示"
+msgstr "警告"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
 msgid "Message for Stock Picking"
-msgstr "存货分拣单信息"
+msgstr "仓库领料/提货信息"
diff --git a/addons/wiki/i18n/zh_CN.po b/addons/wiki/i18n/zh_CN.po
index b5a52badaee..f2008ce2649 100644
--- a/addons/wiki/i18n/zh_CN.po
+++ b/addons/wiki/i18n/zh_CN.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-03-20 10:32+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-21 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -25,12 +25,12 @@ msgstr "wizard.wiki.history.show_diff"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符！"
+msgstr "对象名必须是以x_开头并且不能含有特殊字符"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_groups_link
 msgid "Wiki Groups Links"
-msgstr "维基组链接"
+msgstr "Wiki组链接"
 
 #. module: wiki
 #: field:wiki.wiki,create_uid:0
@@ -40,7 +40,7 @@ msgstr "作者"
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_open_page
 msgid "Open Page"
-msgstr "打开维基页"
+msgstr "打开页"
 
 #. module: wiki
 #: field:wiki.groups.link,action_id:0
@@ -50,30 +50,30 @@ msgstr "菜单"
 #. module: wiki
 #: field:wiki.groups,child_ids:0
 msgid "Child Groups"
-msgstr "下级维基组"
+msgstr "子组"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 #: model:ir.actions.act_window,name:wiki.action_wiki
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
 msgid "Wiki Pages"
-msgstr "维基页"
+msgstr "Wiki页"
 
 #. module: wiki
 #: field:wiki.groups,section:0
 msgid "Make Section ?"
-msgstr "生成章节？"
+msgstr "生成分段?"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
 #: view:wiki.wiki.history:0
 msgid "Wiki History"
-msgstr "维基修改历史"
+msgstr "Wiki日志"
 
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr "小改动"
+msgstr "小编辑"
 
 #. module: wiki
 #: field:wiki.wiki,text_area:0
@@ -83,18 +83,18 @@ msgstr "内容"
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document_configuration
 msgid "Wiki Configuration"
-msgstr "维基设置"
+msgstr "Wiki设置"
 
 #. module: wiki
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在动作定义中无效的模块名"
 
 #. module: wiki
 #: field:wiki.groups,name:0
 #: field:wiki.wiki,group_id:0
 msgid "Wiki Group"
-msgstr "维基组"
+msgstr "Wiki组"
 
 #. module: wiki
 #: field:wiki.wiki,name:0
@@ -104,22 +104,22 @@ msgstr "标题"
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr "历史线"
+msgstr "日志明细"
 
 #. module: wiki
 #: field:wiki.groups,template:0
 msgid "Wiki Template"
-msgstr "维基模板"
+msgstr "Wiki模板"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
 msgid "Document Management - Wiki"
-msgstr "文档管理——维基"
+msgstr "文档管理 - Wiki"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Create a Menu"
-msgstr "创建菜单"
+msgstr "创建一菜单"
 
 #. module: wiki
 #: field:wiki.groups,notes:0
@@ -129,37 +129,37 @@ msgstr "描述"
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr "章节"
+msgstr "分段"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "History Differance"
-msgstr "历史差异"
+msgstr "历史递延"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,page:0
 msgid "Group Home Page"
-msgstr "维基组首页"
+msgstr "组首页"
 
 #. module: wiki
 #: field:wiki.wiki,write_uid:0
 msgid "Last Author"
-msgstr "最近的作者"
+msgstr "最后作者"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_view_diff
 msgid "Differences"
-msgstr "差异"
+msgstr "分歧"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr "使用页章节代码如 1.2.1"
+msgstr "用户页段代码如1.2.1"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Page Template"
-msgstr "页面模板"
+msgstr "页模板"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document2
@@ -174,7 +174,7 @@ msgstr "日期"
 #. module: wiki
 #: wizard_view:wiki.make.index,init:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr "想要为选定的页面创建索引吗？ "
+msgstr "想在选择的页创建一索引? "
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -185,17 +185,17 @@ msgstr "设置"
 #: field:wiki.groups,home:0
 #: field:wiki.groups,page_ids:0
 msgid "Pages"
-msgstr "页面"
+msgstr "页"
 
 #. module: wiki
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件"
 
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr "文本框"
+msgstr "文本区"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_parent_id:0
@@ -205,7 +205,7 @@ msgstr "上级菜单"
 #. module: wiki
 #: field:wiki.wiki,create_date:0
 msgid "Created on"
-msgstr "创建于"
+msgstr "创建在"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -222,7 +222,7 @@ msgstr "菜单信息"
 #: field:wiki.groups,parent_id:0
 #: field:wiki.groups.link,group_id:0
 msgid "Parent Group"
-msgstr "上级维基组"
+msgstr "父组"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -233,13 +233,13 @@ msgstr "摘要"
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr "创建时间"
+msgstr "创建日期"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
 #: model:ir.ui.menu,name:wiki.menu_action_history
 msgid "All Page Histories"
-msgstr "全部页面历史记录"
+msgstr "所有页的历史"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki
@@ -249,7 +249,7 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Wiki Differance"
-msgstr "维基页差异"
+msgstr "Wiki分歧"
 
 #. module: wiki
 #: field:wiki.wiki.history,wiki_id:0
@@ -259,7 +259,7 @@ msgstr "维基页标识符"
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_name:0
 msgid "Menu Name"
-msgstr "菜单名称"
+msgstr "菜单名"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -269,7 +269,7 @@ msgstr "修改"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "History"
-msgstr "历史记录"
+msgstr "历史"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_document
@@ -291,7 +291,7 @@ msgstr "创建索引"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr "这是重要修改吗？"
+msgstr "这是一项重大修改?"
 
 #. module: wiki
 #: model:ir.actions.wizard,name:wiki.wizard_group_menu_create
@@ -304,7 +304,7 @@ msgstr "创建菜单"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Tags"
-msgstr "标记"
+msgstr "标签"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -314,12 +314,12 @@ msgstr "标记"
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_groups_browse
 #: view:wiki.groups:0
 msgid "Wiki Groups"
-msgstr "维基组"
+msgstr "Wiki组"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
 msgid "Modify By"
-msgstr "修改由"
+msgstr "修改之"
 
 #. module: wiki
 #: field:wiki.wiki,toc:0
@@ -340,4 +340,4 @@ msgstr "差异"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Need Review"
-msgstr "需要复审"
+msgstr "需要预览"

From 3c2cd6a12a802f1d27c6bedffcd368e0175d424c Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 22 Mar 2010 10:42:40 +0530
Subject: [PATCH 09/15] [FIX] hr: company id on hr department

bzr revid: mra@tinyerp.com-20100322051240-byensh9ui94azs3k
---
 addons/hr/hr_department.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 72bd9fd4ce0..ef1160132a5 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -44,7 +44,7 @@ class hr_department(osv.osv):
     _columns = {
         'name': fields.char('Department Name', size=64, required=True),
         'complete_name': fields.function(_dept_name_get_fnc, method=True, type="char", string='Name'),
-        'company_id': fields.many2one('res.company', 'Company', select=True, required=True),
+        'company_id': fields.many2one('res.company', 'Company', select=True, required=False),
         'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
         'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
         'note': fields.text('Note'),

From 161d2ca3a6078864a301294a4abacf3c1cdae125 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 22 Mar 2010 11:45:27 +0530
Subject: [PATCH 10/15] [IMP] project_long_term: Occupation rate on task
 visible on phases

bzr revid: mra@tinyerp.com-20100322061527-9yea0o41fucq9tvy
---
 addons/project_long_term/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml
index 0af1e09c422..bf138bf58bc 100644
--- a/addons/project_long_term/project_view.xml
+++ b/addons/project_long_term/project_view.xml
@@ -101,7 +101,7 @@
 									<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
 									<field name="effective_hours" invisible="1"/>
 									<field name="state"/>
-									<field name="occupation_rate" invisible="1"/>
+									<field name="occupation_rate"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                   	<notebook colspan="4">
@@ -115,7 +115,7 @@
 		                                  		<separator string="Dates" colspan="2"/>
 		                                  		<field name="date_start"/>
 		                                  		<field name="date_deadline"/>
-		                                  		<field name="occupation_rate" invisible="1"/>
+		                                  		<field name="occupation_rate"/>
 		                                    </group>
 		                                    <group colspan="2" col="2">
 		                                  		<separator string="Planning" colspan="2"/>

From 91619c0150ccddcfe6d6a9d5a3c0178c2130975a Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 22 Mar 2010 15:40:36 +0530
Subject: [PATCH 11/15] [FIX] project_issue: Demo data of project issue with
 analytic id

bzr revid: mra@tinyerp.com-20100322101036-tb6n2uhicf1an2do
---
 addons/project_issue/project_issue_demo.xml | 40 ++++++++++++++-------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 1134e57afce..8794992b440 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-	<!-- 
-		((((((((((( Demo Cases ))))))))))) 
+	<!--
+		((((((((((( Demo Cases )))))))))))
 	-->
 <!--For Issue Tracking-->
 	<record id="crm_case_buginaccountsmodule0" model="project.issue">
@@ -18,6 +18,7 @@
 		<field name="categ_id" ref="bug_categ"/>
 		<field name="stage_id" ref="stage1"/>
 		<field name="project_id" ref="project.project_project_22"/>
+		<field name="analytic_account_id" ref="account.analytic_agrolait"/>
 		<field eval="15.0" name="duration"/>
 		<field eval="&quot;Bug in Accounts module&quot;" name="name"/>
 		<field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
@@ -37,6 +38,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
 		<field eval="&quot;done&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -53,7 +55,8 @@
 		<field name="type_id" ref="type1"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
-		<field name="partner_id" ref="base.res_partner_2"/>
+		<field name="partner_id" ref="account.analytic_project_1"/>
+		<field name="analytic_account_id" ref="account.analytic_asustek"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -71,6 +74,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_14"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -87,6 +91,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+		<field name="analytic_account_id" ref="account.analytic_desertic_hispafuentes"/>
 		<field eval="&quot;draft&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -104,6 +109,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -121,6 +127,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -138,6 +145,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -147,7 +155,7 @@
 		<field name="project_id" ref="project.project_project_9"/>
 		<field eval="&quot;Constraint Error&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_errorinprogram0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_10"/>
 		<field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
@@ -155,6 +163,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field eval="1" name="active"/>
 		<field eval="1.3" name="duration"/>
@@ -163,7 +172,7 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Error in Program&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_patcheserrorinprogram0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_9"/>
 		<field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
@@ -171,6 +180,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_2"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -180,7 +190,7 @@
 		<field name="project_id" ref="project.project_project_9"/>
 		<field eval="&quot;Patches Error in Program&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_newfeaturestobeadded0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_wong"/>
 		<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
@@ -188,6 +198,7 @@
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_maxtor"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;open&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -197,7 +208,7 @@
 		<field name="project_id" ref="project.project_project_21"/>
 		<field eval="&quot;New Features To Be Added&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_addmenustothemodule0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_1"/>
 		<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
@@ -205,6 +216,7 @@
 		<field eval="&quot;1&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_9"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;done&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -215,7 +227,7 @@
 		<field eval="&quot;Add menus to the module&quot;" name="name"/>
 		<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 	</record>
-	
+
 	<record id="crm_case_includeattendancesheetinproject0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_2"/>
 		<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
@@ -223,6 +235,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_10"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;cancel&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -233,7 +246,7 @@
 		<field eval="&quot;Include Attendance sheet in Project&quot;" name="name"/>
 		<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 	</record>
-	
+
 	<record id="crm_case_createnewobject0" model="project.issue">
 		<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
 		<field name="partner_address_id" ref="base.res_partner_address_6"/>
@@ -243,6 +256,7 @@
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_6"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;draft&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -252,7 +266,7 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Create new object&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_improvereportsinhrms0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
@@ -260,6 +274,7 @@
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -269,7 +284,7 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
 	</record>
-	
+
 	<record id="crm_case_improvereportsinpms0" model="project.issue">
 		<field name="partner_address_id" ref="base.res_partner_address_15"/>
 		<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
@@ -277,6 +292,7 @@
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
+		<field name="analytic_account_id" ref="account.analytic_project_1"/>
 		<field eval="&quot;pending&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
@@ -286,6 +302,6 @@
 		<field name="project_id" ref="project.project_project_22"/>
 		<field eval="&quot;Improve Reports in PMS&quot;" name="name"/>
 	</record>
-	
+
 </data>
 </openerp>

From 426074796c401e718344fe74ef8c17ce377d688a Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 22 Mar 2010 16:03:41 +0530
Subject: [PATCH 12/15] [IMP] crm: send mail wizard

bzr revid: hmo@tinyerp.com-20100322103341-eyn3c15vaz90hms2
---
 addons/crm/__terp__.py                        |   1 +
 addons/crm/crm.py                             |   3 +
 addons/crm/crm_claims_view.xml                |  39 +--
 addons/crm/crm_fund_view.xml                  |  37 +--
 addons/crm/crm_helpdesk_view.xml              |  37 +--
 addons/crm/crm_lead_view.xml                  |  40 ++--
 addons/crm/crm_opportunity_view.xml           |  37 +--
 addons/crm/crm_view.xml                       |  17 +-
 .../openerp_mailgate/openerp_mailgate.py      |  20 +-
 addons/crm/wizard/__init__.py                 |   3 +-
 addons/crm/wizard/crm_send_email.py           | 226 ++++++++++++++++++
 addons/crm/wizard/crm_send_email_view.xml     |  83 +++++++
 .../crm/wizard/wizard_crm_new_send_email.py   | 135 -----------
 addons/crm/wizard/wizard_crm_send_email.py    | 103 --------
 addons/hr_recruitment/hr_hr_view.xml          |  37 +--
 addons/project_issue/project_issue_view.xml   |  37 +--
 16 files changed, 489 insertions(+), 366 deletions(-)
 create mode 100644 addons/crm/wizard/crm_send_email.py
 create mode 100644 addons/crm/wizard/crm_send_email_view.xml
 delete mode 100644 addons/crm/wizard/wizard_crm_new_send_email.py
 delete mode 100644 addons/crm/wizard/wizard_crm_send_email.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 72222a00668..b2a40c822a6 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -61,6 +61,7 @@ between mails and Open ERP.""",
     ],
 
     'update_xml': [
+        'wizard/crm_send_email_view.xml', 
         'crm_wizard.xml',
         'crm_view.xml',
         'crm_action_rule_view.xml',
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index ebaa437ff41..d070009481f 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -363,6 +363,8 @@ class crm_case(osv.osv):
                 data['email'] = email or \
                         (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or False
+                data['email_from'] = (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from',False)
             res = obj.create(cr, uid, data, context)            
         return True
     _history = __history
@@ -549,6 +551,7 @@ class crm_case_history(osv.osv):
         'description': fields.text('Description'),
         'note': fields.function(_note_get, method=True, string="Description", type="text"),
         'email': fields.char('Email', size=84),
+        'email_from' : fields.char('From Email', size=84),
         'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'),
     }
 crm_case_history()
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index f51f6890d0c..50c061121a1 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -150,22 +150,29 @@
                                 <field name="date"/>
                                 <field name="email"/>
                                 <field name="canal_id"/>
-                                <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                               <button
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.claim'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.claim'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
                 </group>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index a78d5e3eeb6..6babca13272 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -149,21 +149,28 @@
                                 <field name="email"/>
                                 <field name="canal_id"/>
                                 <button
-								   string="Add a CC"
-								    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-								    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.fundraising'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.fundraising'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index ec662885a04..42bb1e0c47c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -97,21 +97,28 @@
                                    <field name="email"/>
                                    <field name="canal_id"/>
                                    <button
-									   string="Add a CC"
-									    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-									    icon="gtk-add" type="action"/>
-                               </group>
-                               <newline/>
-                               <field name="description" colspan="4" nolabel="1"/>
-                               <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                           </form>
-                           <tree string="Communication history">
-                               <field name="description"/>
-                               <field name="email"/>
-                               <field name="date"/>
-                           </tree>
-                       </field>
-                       <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.helpdesk'}"
+                           	icon="gtk-go-forward" type="action" />
                     </page>
                 </notebook>
             </form>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 40998528ff5..11ae3c89087 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -119,24 +119,28 @@
                                 <field name="email"/>
                                 <field name="canal_id"/>
                                 <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email"
-                        name="%(crm.wizard_crm_new_send_mail)d"
-                        context="{'mail':'new'}" icon="gtk-go-forward"
-                        type="action" />
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.lead'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.lead'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4ce8c647c13..956cba3e2f3 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -139,21 +139,28 @@
                                 <field name="email"/>
                                 <field name="canal_id"/>
                                 <button
-                                   string="Add a CC"
-                                    name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                    icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                            <field name="description"/>
-                            <field name="email"/>
-                            <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.opportunity'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.opportunity'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 908cdd6fa91..ffbe9efcc7a 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,11 +2,7 @@
 <openerp>
     <data>
 <!--        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>-->
-        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
-
-        <wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/>
-        <wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/>
-
+        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>        
         <!-- Case Sections -->
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
@@ -351,7 +347,11 @@
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4" string="Reply to Last Email" name="%(wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.case'}"
+                                   	icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -359,7 +359,10 @@
                                    <field name="date"/>
                                </tree>
                            </field>
-                           <button colspan="4" string="Send New Email" name="%(wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.case'}"
+                           	icon="gtk-go-forward" type="action" />
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index fb73bafdbe4..9db7e24acee 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -206,7 +206,7 @@ class email_parser(object):
 #                       'file_name':'file data',
 #                   }
 #   }
-#   #
+
     def msg_body_get(self, msg):
         message = {};
         message['body'] = '';
@@ -215,7 +215,7 @@ class email_parser(object):
         counter = 1;
         def replace(match):
             return ''
-            
+
         for part in msg.walk():
             if part.get_content_maintype() == 'multipart':
                 continue
@@ -264,7 +264,7 @@ class email_parser(object):
         body['body'] = body_data
 
         data = {
-            'description': body['body'], 
+#            'description': body['body'],
         }
         act = 'case_pending'
         if 'state' in actions:
@@ -291,7 +291,7 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], body['body'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -318,11 +318,11 @@ class email_parser(object):
         body = message['body']
         act = 'case_open'
         self.rpc(self.model, act, [id])
-        body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
-        data = {
-            'description':body, 
-        }
-        self.rpc(self.model, 'write', [id], data)
+        #body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
+        #data = {
+        #    'description':body, 
+        #}
+        #self.rpc(self.model, 'write', [id], data)
         self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
         return id
 
@@ -375,7 +375,7 @@ class email_parser(object):
 
 if __name__ == '__main__':
     import sys, optparse
-    parser = optparse.OptionParser( usage='usage: %prog [options]', version='%prog v1.0')
+    parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
     group = optparse.OptionGroup(parser, "Note", 
         "This program parse a mail from standard input and communicate "
         "with the Open ERP server for case management in the CRM module.")
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 62be2041d98..405bd46076b 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -23,8 +23,7 @@ import crm_opportunity_wizard
 import crm_lead_wizard
 import crm_phonecall_wizard
 
-import wizard_crm_send_email
-import wizard_crm_new_send_email
+import crm_send_email
 import wizard_history_event
 
 
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
new file mode 100644
index 00000000000..da0a7d5e9d3
--- /dev/null
+++ b/addons/crm/wizard/crm_send_email.py
@@ -0,0 +1,226 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+import base64
+import tools
+
+class crm_send_new_email(osv.osv_memory):
+    """ Sends new email for the case"""
+    _name = "crm.send.mail"
+    _description = "Case Send new email"
+
+    _columns = {
+                'to' : fields.char('To', size=64, required=True),
+                'cc' : fields.char('CC', size=128),
+                'subject': fields.char('Subject', size=128, required=True),
+                'text': fields.text('Message', required=True),
+                'state': fields.selection([('done', 'Done'), ('pending', 'Pending'), ('unchanged', 'Unchanged')], string='State', required=True),
+                'doc1': fields.binary("Attachment1"),
+                'doc2': fields.binary("Attachment2"),
+                'doc3': fields.binary("Attachment3"),
+                }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Phonecall to Opportunity form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Opportunity's IDs
+        @param context: A standard dictionary for contextual values
+        """
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_send(self, cr, uid, ids, context=None):
+        """ This sends an email to ALL the addresses of the selected partners.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Opportunity's IDs
+        @param context: A standard dictionary for contextual values
+        """
+        if not context:
+            context = {}
+
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+
+        model = context.get('model')
+        case_pool = self.pool.get(model)
+        res_id = context and context.get('active_id', False) or False
+
+        for data in self.read(cr, uid, ids, context=context):
+            attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']])
+            attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
+
+            if context.get('mail', 'new') == 'new':
+                case = case_pool.browse(cr, uid, res_id)
+            else:
+                hist_obj = self.pool.get('crm.case.history')
+                hist = hist_obj.browse(cr, uid, res_id)
+                model = hist.log_id.model_id.model
+                model_pool = self.pool.get(model)
+                case = model_pool.browse(cr, uid, hist.log_id.res_id)
+            emails = [data['to']] + (data['cc'] or '').split(',')
+            emails = filter(None, emails)
+            body = data['text']
+
+            if case.user_id.signature:
+                body += '\n\n%s' % (case.user_id.signature)
+
+            case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['to'], details=body)
+            email_from = (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from',False)
+            flag = tools.email_send(
+                email_from,
+                emails,
+                data['subject'],
+                case_pool.format_body(body),
+                attach=attach,
+                reply_to=case.section_id.reply_to,
+                openobject_id=str(case.id),                
+            )           
+            if flag:
+                if data['state'] == 'unchanged':
+                    pass
+                elif data['state'] == 'done':
+                    case_pool.case_close(cr, uid, [case.id])
+                elif data['state'] == 'pending':
+                    case_pool.case_pending(cr, uid, [case.id])
+                cr.commit()
+
+#            Commented because form does not close due to raise
+#                raise osv.except_osv(_('Email!'), ("Email Successfully Sent"))
+#            else:
+#                raise osv.except_osv(_('Warning!'), _("Email not sent !"))
+        return {}
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        if not context:
+            context = {}
+
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+
+        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
+
+        if context.get('mail') == 'reply':
+            res.update(self.get_reply_defaults(cr, uid, fields, context=context))
+            return res
+
+        model = context.get('model')
+        mod_obj = self.pool.get(model)
+        res_id = context and context.get('active_ids', []) or []
+
+        for case in mod_obj.browse(cr, uid, res_id):
+            if 'to' in fields:
+                res.update({'to': case.email_from})
+            if 'subject' in fields:
+                res.update({'subject': case.name})
+            if 'cc' in fields:
+                res.update({'cc': case.email_cc or ''})
+            if 'text' in fields:
+                res.update({'text': case.description or ''})
+            if 'state' in fields:
+                res.update({'state': 'pending'})
+        return res
+
+    def get_reply_defaults(self, cr, uid, fields, context=None):
+        """
+        This function gets default values for reply mail
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        hist_obj = self.pool.get('crm.case.history')
+        res_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for hist in hist_obj.browse(cr, uid, res_ids):
+            model = hist.log_id.model_id.model
+            model_pool = self.pool.get(model)
+            case = model_pool.browse(cr, uid, hist.log_id.res_id)
+            if 'to' in fields and hist.email:
+                res.update({'to': hist.email})
+            if 'text' in fields:
+                header = '-------- Original Message --------'                
+                sender = 'From: %s' %(hist.email_from or tools.config.get('email_from',False))                
+                to = 'To: %s' % (hist.email)
+                sentdate = 'Sent: %s' % (hist.date)
+                desc = '\n%s'%(hist.description)
+                original = [header, sender, to, sentdate, desc]
+                original = '\n'.join(original)
+                res.update({'text': '\n\n%s'%(original)})
+            if 'subject' in fields:
+                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) 
+            #if 'state' in fields:
+            #    res.update({'state': 'pending'})       
+        return res
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        if not context:
+            context = {}
+
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+        model = context.get('model')
+        mod_obj = self.pool.get(model)
+        if context.get('mail') == 'reply':
+            return True
+        if tools.config.get('email_from'):
+            return True
+
+        for case in mod_obj.browse(cr, uid, context.get('active_ids', [])):
+            if not case.user_id:
+                raise osv.except_osv(_('Error'), _('You must define a responsible user for this case in order to use this action!'))
+            if not case.user_id.address_id.email:
+                raise osv.except_osv(_('Warning!'), _("Please specify user's email address !"))
+
+        return True
+
+crm_send_new_email()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
new file mode 100644
index 00000000000..ece20c89efd
--- /dev/null
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+<!-- Send New Mail view -->
+    
+        <record model="ir.ui.view" id="crm_send_new_mail_view">
+            <field name="name">crm.new.send.mail.form</field>
+            <field name="model">crm.send.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send New Mail" col="2">
+                	<field name="to" />
+                	<field name="cc" />
+                	<field name="subject" />                	
+                	<field name="doc1" />
+                	<field name="doc2" />
+                	<field name="doc3" />
+                    <separator string="" colspan="4"/>
+                    <field name="text" nolabel="1" colspan="4"/>
+                	<separator colspan="4" string="Set case state to" />
+                	<field name="state" />
+                	<separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                    	<label string=" " />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Send New Mail action -->
+
+        <record model="ir.actions.act_window" id="action_crm_send_mail">
+            <field name="name">Send New Mail</field>
+            <field name="res_model">crm.send.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_send_new_mail_view"/>
+            <field name="target">new</field>
+        </record>
+	
+	
+	<!-- Reply to Mail view -->
+    
+        <record model="ir.ui.view" id="crm_reply_mail_view">
+            <field name="name">crm.mail.reply.form</field>
+            <field name="model">crm.send.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reply to last Mail" col="2">
+                	<field name="to" />
+                	<field name="cc" />
+                	<field name="subject" />                	
+                	<field name="doc1" />
+                	<field name="doc2" />
+                	<field name="doc3" />
+                    <separator string="" colspan="4"/>
+                    <field name="text" nolabel="1" colspan="4"/>
+                	<separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                    	<label string=" " />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_send" type="object" string="_Send Reply" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Reply to Mail action -->
+
+        <record model="ir.actions.act_window" id="action_crm_reply_mail">
+            <field name="name">Reply to last Mail</field>
+            <field name="res_model">crm.send.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_reply_mail_view"/>
+            <field name="target">new</field>
+        </record>
+	
+    </data>
+</openerp>   
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
deleted file mode 100644
index ef878f3249f..00000000000
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import tools
-import base64
-from tools.translate import _
-
-
-email_send_form = '''<?xml version="1.0"?>
-<form string="Mass Mailing">
-    <field name="to"/>
-    <newline/>
-    <field name="cc"/>
-    <newline/>
-    <field name="subject"/>
-    <newline/>
-    <field name="text" />
-    <newline/>
-    <field name="doc1" />
-    <newline/>
-    <field name="doc2" />
-    <newline/>
-    <field name="doc3" />
-    <separator colspan="4" string="Set case state to"/>
-    <newline/>
-    <field name="state" />
-</form>'''
-
-email_send_fields = {
-    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
-    'cc': {'string':"CC", 'type':'char', 'size':128,},
-    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True},
-    'state':{'string':'State', 'type':'selection', 'selection':[('done','Done'),('pending','Pending'),('unchanged','Unchanged')]},
-    'doc1' :  {'string':"Attachment1", 'type':'binary'},
-    'doc2' :  {'string':"Attachment2", 'type':'binary'},
-    'doc3' :  {'string':"Attachment3", 'type':'binary'},
-    'state' :  {'string':"Set State to", 'type':'selection', 'required' : True, 'default' :'done',\
-                    'selection': [('unchanged','Unchanged'),('done','Done'),('pending','Pending')]},
-}
-
-# this sends an email to ALL the addresses of the selected partners.
-def _mass_mail_send(self, cr, uid, data, context):
-    attach = filter(lambda x: x, [data['form']['doc1'],  data['form']['doc2'],  data['form']['doc3']])
-    attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
-
-    pool = pooler.get_pool(cr.dbname)
-    case_pool=pool.get(data.get('model'))
-
-    case = case_pool.browse(cr,uid,data['ids'])[0]    
-    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
-    emails = filter(None, emails)
-    body = data['form']['text']
-    if case.user_id.signature:
-        body += '\n\n%s' % (case.user_id.signature)
-    case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['form']['to'], details=body)
-    flag = tools.email_send(
-        case.user_id.address_id.email,
-        emails,
-        data['form']['subject'],
-        case_pool.format_body(body),
-        attach=attach,
-        reply_to=case.section_id.reply_to,
-        openobject_id=str(case.id), 
-        subtype="html"
-    )
-    if flag:
-        if data['form']['state'] == 'unchanged':
-            pass
-        elif data['form']['state'] == 'done':
-            case_pool.case_close(cr, uid, data['ids'])
-        elif data['form']['state'] == 'pending':
-            case_pool.case_pending(cr, uid, data['ids'])
-        cr.commit()
-        raise wizard.except_wizard(_('Email!'),("Email Successfully Sent"))
-    else:
-        raise wizard.except_wizard(_('Warning!'),_("Email not sent !"))
-    return {}
-
-def _get_info(self, cr, uid, data, context):
-    if not data['id']:
-        return {}
-        
-    pool = pooler.get_pool(cr.dbname)
-    case = pool.get(data.get('model')).browse(cr, uid, data['id'])
-    if not case.user_id:
-        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    if not case.user_id.address_id.email:
-        raise wizard.except_wizard(_('Warning!'),_("Please specify user's email address !"))
-        
-    return {
-        'to': case.email_from, 
-        'subject': case.name, 
-        'cc': case.email_cc or ''
-    }
-    
-class wizard_send_mail(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_info],
-            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
-        },
-        'send': {
-            'actions': [_mass_mail_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wizard_send_mail('crm.new.send.mail')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm/wizard/wizard_crm_send_email.py b/addons/crm/wizard/wizard_crm_send_email.py
deleted file mode 100644
index 6501bf841ac..00000000000
--- a/addons/crm/wizard/wizard_crm_send_email.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import tools
-from tools.translate import _
-
-
-email_send_form = '''<?xml version="1.0"?>
-<form string="Mass Mailing">
-    <field name="to"/>
-    <newline/>
-    <field name="cc"/>
-    <newline/>
-    <field name="subject"/>
-    <newline/>
-    <field name="text" />
-</form>'''
-
-email_send_fields = {
-    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
-    'cc': {'string':"CC", 'type':'char', 'size':128,},
-    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True}
-}
-
-# this sends an email to ALL the addresses of the selected partners.
-def _mass_mail_send(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-
-    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
-    model = hist_obj.log_id.model_id.model
-    model_pool = pool.get(model)
-    case = model_pool.browse(cr, uid, hist_obj.log_id.res_id)
-    model_pool._history(cr, uid, [case], _('Send'), history=True, email=False)    
-    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
-    emails = filter(None, emails)
-    body = data['form']['text']
-    if case.user_id.signature:
-        body += '\n\n%s' % (case.user_id.signature)
-    tools.email_send(
-        case.user_id.address_id.email,
-        emails,
-        data['form']['subject'],
-        model_pool.format_body(body),
-        reply_to=case.section_id.reply_to,
-        openobject_id=str(case.id), 
-        subtype="html"
-    )
-    return {}
-
-def _get_info(self, cr, uid, data, context):
-    if not data['id']:
-        raise wizard.except_wizard(_('Error'),_('There is no mail to reply!'))
-    pool = pooler.get_pool(cr.dbname)
-    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
-    model = hist_obj.log_id.model_id.model
-    model_pool = pool.get(model)
-    case = model_pool.browse(cr, uid, hist_obj.log_id.res_id)
-    if not case.email_from:
-        raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
-    if not case.user_id:
-        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    return {'to': case.email_from,'subject': '['+str(case.id)+'] '+case.name,'cc': case.email_cc or '', 'text': '> ' + hist_obj.description.replace('\n','\n> ')}
-    
-class wizard_send_mail(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_info],
-            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
-        },
-        'send': {
-            'actions': [_mass_mail_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wizard_send_mail('crm.send.mail')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_recruitment/hr_hr_view.xml b/addons/hr_recruitment/hr_hr_view.xml
index c86de0f9737..d07afd43e42 100644
--- a/addons/hr_recruitment/hr_hr_view.xml
+++ b/addons/hr_recruitment/hr_hr_view.xml
@@ -150,21 +150,28 @@
                                 <field name="date"/>
                                 <field name="email"/>
                                 <button
-                                   string="Add a CC"
-                                   name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                   icon="gtk-add" type="action"/>
-                            </group>
-                            <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
-                        <tree string="Communication history">
-                           <field name="description"/>
-                           <field name="email"/>
-                           <field name="date"/>
-                        </tree>
-                    </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(crm.action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'hr.applicant'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(crm.action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'hr.applicant'}"
+                           	icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b74e73efc8d..be1fe6a6644 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -104,21 +104,28 @@
                                         <field name="email"/>
                                         <field name="canal_id"/>
                                         <button
-                                            string="Add a CC"
-                                            name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                            icon="gtk-add" type="action"/>
-                                    </group>
-                                    <newline/>
-                                    <field name="description" colspan="4" nolabel="1"/>
-                                    <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                                </form>
-                                <tree string="Communication history">
-                                    <field name="description"/>
-                                    <field name="email"/>
-                                    <field name="date"/>
-                                </tree>
-                            </field>
-                            <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(crm.action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'project.issue'}"
+                                   	icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(crm.action_crm_send_mail)d"
+                           	context="{'mail':'new', 'model': 'project.issue'}"
+                           	icon="gtk-go-forward" type="action" />
                         </page>
                         <page string="Worklogs">
                             <separator string="Timesheets" colspan="4" />

From 3c7480d3ace6f6dd724b789733c0355597700fdd Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 22 Mar 2010 16:07:22 +0530
Subject: [PATCH 13/15] [IMP] crm: set Id in subject on sending new email from
 history

bzr revid: hmo@tinyerp.com-20100322103722-brno0kjhpejcgwtg
---
 addons/crm/wizard/crm_send_email.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index da0a7d5e9d3..3adf7694527 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -147,7 +147,7 @@ class crm_send_new_email(osv.osv_memory):
             if 'to' in fields:
                 res.update({'to': case.email_from})
             if 'subject' in fields:
-                res.update({'subject': case.name})
+                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) 
             if 'cc' in fields:
                 res.update({'cc': case.email_cc or ''})
             if 'text' in fields:

From 5cf9147c648297afcff6c8c60e8152b32cac1205 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 22 Mar 2010 12:24:34 +0100
Subject: [PATCH 14/15] [IMP] hr_holidays: small improvements misc.

bzr revid: qdp-launchpad@tinyerp.com-20100322112434-a9azuim3ms3xy0ii
---
 addons/hr_holidays/hr.py                  | 4 ++--
 addons/hr_holidays/hr_holidays_wizard.xml | 2 +-
 addons/hr_holidays/hr_view.xml            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 12cb02f659f..efd0e8438a0 100755
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -69,8 +69,8 @@ class hr_holidays_status(osv.osv):
     _columns = {
         'name' : fields.char('Name', size=64, required=True, translate=True),
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
-        'color_name' : fields.selection([('red', 'Red'), ('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 of the status', required=True, help='This color will be used in the leaves summary located in Reporting\Print Summary of Leaves'),
-        'limit' : fields.boolean('Allow to override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        'color_name' : fields.selection([('red', 'Red'), ('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 thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         '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, method=True, string='Maximum Leaves 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, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index fc433a181e7..a747571c943 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -14,7 +14,7 @@
 	<wizard string="Holidays by Departement"
 		  name="hr.holidays.summary"
 		  id="holidays_summary"/>
-	<menuitem name="Holidays by Departement" parent="menu_hr_reporting_holidays"
+	<menuitem name="Leaves by Departement" parent="menu_hr_reporting_holidays"
                   icon="STOCK_PRINT"
 		 action="holidays_summary"
 		 type="wizard"
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index d46898bd6bb..b5de7ee3f4b 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -255,10 +255,10 @@
             <field name="arch" type="xml">
                 <form string="Leave Type">
                     <field colspan="4" name="name" select="1"/>
-                    <field name="color_name" select="2"/>
-                    <field name="categ_id"  select="1" widget="selection"/>
                     <field name="limit" select="2"/>
                     <field name="active" select="2"/>
+                    <field name="categ_id"  select="1" widget="selection"/>
+                    <field name="color_name" select="2"/>
                 </form>
             </field>
         </record>

From b6f5ae027ded23098bc9d0ce1a6a1db229718597 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 29 Mar 2010 04:45:36 +0100
Subject: [PATCH 15/15] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100320044237-0n8t8gp0nl0fuyqt
bzr revid: codehost@crowberry-20100321044153-s0y7eivx43ck859g
bzr revid: codehost@crowberry-20100322044637-xjp4wdw10wpwv601
bzr revid: codehost@crowberry-20100324045250-iszzaukziu6uxznx
bzr revid: codehost@crowberry-20100326044819-vku920nqvrb2lufb
bzr revid: codehost@crowberry-20100327045920-fqolv2unkpzt63um
bzr revid: codehost@crowberry-20100328034636-ni30n5szoo5f8z8w
bzr revid: codehost@crowberry-20100329034536-bo8n0hhw3btepsh8
---
 bin/addons/base/i18n/bg.po    |  54 ++++---
 bin/addons/base/i18n/et.po    |   6 +-
 bin/addons/base/i18n/fi.po    |  16 +-
 bin/addons/base/i18n/hr.po    |   4 +-
 bin/addons/base/i18n/ja.po    |   4 +-
 bin/addons/base/i18n/pl.po    |  14 +-
 bin/addons/base/i18n/pt_BR.po | 289 ++++++++++++++++++----------------
 bin/addons/base/i18n/sv.po    |   4 +-
 bin/addons/base/i18n/uk.po    |   4 +-
 bin/addons/base/i18n/zh_CN.po |   4 +-
 10 files changed, 211 insertions(+), 188 deletions(-)

diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 1e17e3f0311..54f38a8d16e 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-18 05:29+0000\n"
+"PO-Revision-Date: 2010-03-26 05:19+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-19 04:36+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -582,7 +582,7 @@ msgstr "Папуа Нова Гвинея"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "Обикновен партньор"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -1883,7 +1883,7 @@ msgstr "Рождена дата"
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 #: model:ir.ui.menu,name:base.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr ""
+msgstr "Обръщение"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_som
@@ -2587,7 +2587,7 @@ msgstr "Лиценз"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Invalid operation"
-msgstr ""
+msgstr "Невалидна операция"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3375,7 +3375,7 @@ msgstr "Собственик на банковата сметка"
 #: model:ir.actions.act_window,name:base.act_values_form
 #: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Връзки на действията на клиента"
 
 #. module: base
 #: field:ir.ui.view_sc,resource:0
@@ -3395,7 +3395,7 @@ msgstr "Гваделупа (Франция)"
 #. module: base
 #: field:ir.report.custom.fields,cumulate:0
 msgid "Accumulate"
-msgstr ""
+msgstr "Акумулирай"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
@@ -4340,7 +4340,7 @@ msgstr "E-mail на изпращащия"
 #. module: base
 #: field:ir.default,field_name:0
 msgid "Object Field"
-msgstr ""
+msgstr "Поле на Обекта"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5011,7 +5011,7 @@ msgstr "Откажи"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr ""
+msgstr "Моля укажете опцията на сървъра --smtp-from !"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -5337,6 +5337,8 @@ msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
 msgstr ""
+"Изберете действие което да бъде изпълнено. Циклични действия няма да бъдат "
+"допустими в цикъла."
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5409,7 +5411,7 @@ msgstr "Активни събития на партньора"
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Функции на контакта"
 
 #. module: base
 #: view:multi_company.default:0
@@ -5553,7 +5555,7 @@ msgstr "GPL-3 или по-късна версия"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML(Mako)"
-msgstr ""
+msgstr "HTML от HTML(Mako)"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -5739,19 +5741,19 @@ msgstr "Самоа"
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
-msgstr ""
+msgstr "Подчинени идентификатори"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr ""
+msgstr "Проблем в конфигурацията 'Record Id' в Действия на Сървъра!"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "This error occurs on database %s"
-msgstr ""
+msgstr "Тази грешка възниква в база данни %s"
 
 #. module: base
 #: wizard_button:base.module.import,init,import:0
@@ -5794,7 +5796,7 @@ msgstr "Спиране на всички"
 #. module: base
 #: view:res.lang:0
 msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
-msgstr ""
+msgstr "3. %x ,%X ==> 12/05/08, 18:25:20"
 
 #. module: base
 #: selection:ir.model.fields,on_delete:0
@@ -5805,7 +5807,7 @@ msgstr "Каскадно"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Поле %d трябва да бъде изображение"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
@@ -5986,7 +5988,7 @@ msgstr "Сомалия"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_simple_view_form
 msgid "Configure Simple View"
-msgstr ""
+msgstr "Настрой прост изглед"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
@@ -6055,7 +6057,7 @@ msgstr "Час 00->24: %(h24)"
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr ""
+msgstr "Изберете свойство на полето"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -6146,7 +6148,7 @@ msgstr "Родител"
 #. module: base
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Възвращаемо"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -6306,7 +6308,7 @@ msgstr "Норвегия"
 #. module: base
 #: view:res.lang:0
 msgid "4.  %b, %B         ==> Dec, December"
-msgstr ""
+msgstr "4. %b, %B ==> Дек, Декември"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_lang_install
@@ -6472,7 +6474,7 @@ msgstr "workflow.instance"
 #. module: base
 #: view:res.lang:0
 msgid "10. %S              ==> 20"
-msgstr ""
+msgstr "10. %S ==> 20"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -6563,6 +6565,8 @@ msgid ""
 "Important when you deal with multiple actions, the execution order will be "
 "decided based on this, low number is higher priority."
 msgstr ""
+"Важно! Когато работите с множество действия, реда на изпълнение ще се "
+"определя от това, че по-малкия номер има по-висок приоритет."
 
 #. module: base
 #: field:ir.actions.report.xml,header:0
@@ -6602,7 +6606,7 @@ msgstr "Неинсталируем"
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Категория на партньора"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -6761,7 +6765,7 @@ msgstr "От"
 #. module: base
 #: wizard_button:server.action.create,init,step_1:0
 msgid "Next"
-msgstr ""
+msgstr "Напред"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -6861,7 +6865,7 @@ msgstr "Име на канала"
 #. module: base
 #: view:res.lang:0
 msgid "5.  %y, %Y         ==> 08, 2008"
-msgstr ""
+msgstr "5. %y, %Y ==> 08, 2008"
 
 #. module: base
 #: field:ir.model.fields,model_id:0
@@ -6948,7 +6952,7 @@ msgstr "CSV Файл"
 #: selection:ir.model,state:0
 #: selection:ir.model.grid,state:0
 msgid "Base Object"
-msgstr ""
+msgstr "Базов обект"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index e799c7d2187..309dca1a8ff 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 11:18+0000\n"
-"Last-Translator: Tanel Kurvits <Unknown>\n"
+"PO-Revision-Date: 2010-03-19 08:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-20 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index d76791b3541..aabfe2c1ca5 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-13 05:29+0000\n"
+"PO-Revision-Date: 2010-03-24 05:45+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-26 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -938,7 +938,7 @@ msgstr ""
 #. module: base
 #: field:res.roles,name:0
 msgid "Role Name"
-msgstr "Roolinimi"
+msgstr "Työtehtävän nimi"
 
 #. module: base
 #: field:res.partner,user_id:0
@@ -2173,7 +2173,7 @@ msgstr "Yrityksen nimi"
 #: view:res.users:0
 #: field:res.users,roles_id:0
 msgid "Roles"
-msgstr "Roolit"
+msgstr "Työtehtävät"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country
@@ -3240,7 +3240,7 @@ msgstr "%H - Tunnit (24:n tunnin kello) desimaalilukuna [00,23]."
 #. module: base
 #: view:res.roles:0
 msgid "Role"
-msgstr "Rooli"
+msgstr "Työtehtävä"
 
 #. module: base
 #: help:res.country.state,code:0
@@ -3485,7 +3485,7 @@ msgstr "Tapahtumat"
 #: model:ir.actions.act_window,name:base.action_res_roles
 #: model:ir.ui.menu,name:base.menu_action_res_roles
 msgid "Roles Structure"
-msgstr "Roolien rakenne"
+msgstr "Työtehtävien rakenne"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_url
@@ -3517,7 +3517,7 @@ msgstr "Lisättyjen moduulien määrä"
 #. module: base
 #: field:workflow.transition,role_id:0
 msgid "Role Required"
-msgstr "Vaadittu rooli"
+msgstr "Vaadittu työtehtävä"
 
 #. module: base
 #: view:ir.module.module:0
@@ -5060,7 +5060,7 @@ msgstr "Islanti"
 #: view:res.users:0
 msgid "Roles are used to defined available actions, provided by workflows."
 msgstr ""
-"Roolit määrittelevät käytettävissä olevat toiminnot, joita työnkulut "
+"Työtehtävät määrittelevät käytettävissä olevat toiminnot, joita työnkulut "
 "edellyttävät."
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index cbd967f6bf0..9796ae7dd6c 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:57+0000\n"
+"PO-Revision-Date: 2010-03-28 04:33+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 09a712e6589..75f564da990 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:55+0000\n"
+"PO-Revision-Date: 2010-03-28 04:35+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\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: 2010-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 8fbd25231e0..63fd07334ec 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-21 06:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-03-22 05:21+0000\n"
+"Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-24 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -1592,7 +1592,7 @@ msgstr "Akcja serwera"
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr "Trinidad i Tobago"
+msgstr "Trynidad i Tobago"
 
 #. module: base
 #: model:res.country,name:base.lv
@@ -2687,7 +2687,7 @@ msgstr "Boliwia"
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
-msgstr "Gana"
+msgstr "Ghana"
 
 #. module: base
 #: field:res.lang,direction:0
@@ -6817,7 +6817,7 @@ msgstr "Puste hasło !"
 #. module: base
 #: model:res.country,name:base.eh
 msgid "Western Sahara"
-msgstr "Zachodnia Sahara"
+msgstr "Sahara Zachodnia"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow
@@ -7218,7 +7218,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cx
 msgid "Christmas Island"
-msgstr "Wyspy Bożego Narodzenia"
+msgstr "Wyspa Bożego Narodzenia"
 
 #. module: base
 #: view:ir.actions.server:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 11e0be4a1c1..2be3d5f5ac0 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-12 06:01+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-24 05:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-26 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -746,7 +746,7 @@ msgstr "Irã"
 #: model:ir.actions.act_window,name:base.res_request-act
 #: model:ir.ui.menu,name:base.menu_res_request_act
 msgid "My Requests"
-msgstr "Minhas Solicitações"
+msgstr "Minhas mensagens"
 
 #. module: base
 #: field:ir.sequence,name:0
@@ -955,7 +955,7 @@ msgstr "-"
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
-msgstr ""
+msgstr "Condições de pagamento(abreviado)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
@@ -999,7 +999,7 @@ msgstr "Login"
 #: view:maintenance.contract:0
 #: field:maintenance.contract,module_ids:0
 msgid "Covered Modules"
-msgstr ""
+msgstr "Módulos cobertos"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1047,7 +1047,7 @@ msgstr "Ações do Servidor"
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr ""
+msgstr "Timor Leste"
 
 #. module: base
 #: view:ir.rule:0
@@ -1062,7 +1062,7 @@ msgstr "Precisão computacional"
 #. module: base
 #: model:res.country,name:base.kg
 msgid "Kyrgyz Republic (Kyrgyzstan)"
-msgstr ""
+msgstr "República do Quirguizistão"
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
@@ -1231,7 +1231,7 @@ msgstr "Automático"
 #. module: base
 #: view:res.request:0
 msgid "End of Request"
-msgstr "Fim da requisição"
+msgstr "Fim da mensagem"
 
 #. module: base
 #: view:res.request:0
@@ -1522,13 +1522,13 @@ msgstr ""
 #. module: base
 #: field:ir.model.config,password_check:0
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmação"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Enter at least one field !"
-msgstr ""
+msgstr "Digite pelo menos um campo !"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -1546,11 +1546,13 @@ msgid ""
 "Provide the field name that the record id refers to for the write operation. "
 "If it is empty it will refer to the active id of the object."
 msgstr ""
+"Forneça o nome do campo que o id do registro refere para a operação de "
+"gravação(write). Se vazio, se refere ao id do objeto ativo."
 
 #. module: base
 #: model:res.country,name:base.zw
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbábue"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
@@ -1571,29 +1573,29 @@ msgstr "Endereço de E-mail"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr ""
+msgstr "Frances(BE) / Frances(BE)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not write in this document! (%s)"
-msgstr ""
+msgstr "Voce não pode atualizar este documento! (%s)"
 
 #. module: base
 #: view:ir.actions.server:0
 #: field:workflow.activity,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Ação de servidor"
 
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "Trinidade e Tobago"
 
 #. module: base
 #: model:res.country,name:base.lv
 msgid "Latvia"
-msgstr ""
+msgstr "Letônia"
 
 #. module: base
 #: view:ir.values:0
@@ -1609,7 +1611,7 @@ msgstr "Mapeando campos"
 #: model:ir.actions.act_window,name:base.res_request-closed
 #: model:ir.ui.menu,name:base.next_id_12_close
 msgid "My Closed Requests"
-msgstr "Minhas Requisições Encerradas"
+msgstr "Minhas mensagens encerradas"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1619,7 +1621,7 @@ msgstr "Customização"
 #. module: base
 #: model:res.country,name:base.py
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguai"
 
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
@@ -1639,7 +1641,7 @@ msgstr "Destino"
 #. module: base
 #: model:res.country,name:base.lt
 msgid "Lithuania"
-msgstr ""
+msgstr "Lituânia"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1649,7 +1651,7 @@ msgstr "STOCK_PRINT_PREVIEW"
 #. module: base
 #: model:res.country,name:base.si
 msgid "Slovenia"
-msgstr ""
+msgstr "Eslovênia"
 
 #. module: base
 #: view:res.partner.canal:0
@@ -1665,7 +1667,7 @@ msgstr "%p - Equivalente de cada uma das AM ou PM."
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Actions"
-msgstr ""
+msgstr "Ações de repetição"
 
 #. module: base
 #: field:maintenance.contract,date_stop:0
@@ -1675,7 +1677,7 @@ msgstr "Data final"
 #. module: base
 #: model:res.country,name:base.nz
 msgid "New Zealand"
-msgstr ""
+msgstr "Nova Zelândia"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -1685,7 +1687,7 @@ msgstr "Openstuff.net"
 #. module: base
 #: model:res.country,name:base.nf
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Ilhas Norfolk"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1700,7 +1702,7 @@ msgstr "Operador"
 #. module: base
 #: wizard_view:module.lang.install,start:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Instalação concluída"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1711,7 +1713,7 @@ msgstr "STOCK_OPEN"
 #: field:ir.actions.server,action_id:0
 #: selection:ir.actions.server,state:0
 msgid "Client Action"
-msgstr ""
+msgstr "Ação de cliente"
 
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
@@ -1721,7 +1723,7 @@ msgstr "direita"
 #. module: base
 #: model:res.country,name:base.bd
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #. module: base
 #: constraint:res.company:0
@@ -1737,7 +1739,7 @@ msgstr "Válido"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not delete this document! (%s)"
-msgstr ""
+msgstr "Você não pode excluir este documento! (%s)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1753,7 +1755,7 @@ msgstr "Impossível atualizar o módulo '%s'. Ele não está instalado."
 #. module: base
 #: model:res.country,name:base.cu
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #. module: base
 #: view:res.lang:0
@@ -2133,7 +2135,7 @@ msgstr "terp-account"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Recursion error in modules dependencies !"
-msgstr ""
+msgstr "Erro de recursão nas dependências dos módulos !"
 
 #. module: base
 #: view:ir.model:0
@@ -2146,6 +2148,8 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
+"Valor do imposto adicionado. Marque a caixa se o parceiro está sujeito ao "
+"imposto. Usado para impostos oficiais."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_category_tree
@@ -2156,7 +2160,7 @@ msgstr "Categorias de Módulos"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Ukrainian / украї́нська мо́ва"
-msgstr ""
+msgstr "Ucrânia"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
@@ -2166,7 +2170,7 @@ msgstr "Não Iniciado"
 #. module: base
 #: model:res.country,name:base.ru
 msgid "Russian Federation"
-msgstr ""
+msgstr "Rússia"
 
 #. module: base
 #: field:res.company,name:0
@@ -2234,7 +2238,7 @@ msgstr "%M - Minuto com dois decimais [00,59]."
 #. module: base
 #: model:res.country,name:base.tj
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tajiquistão"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
@@ -2250,7 +2254,7 @@ msgstr "GPL-2 ou versão superior"
 #. module: base
 #: selection:res.partner.event,type:0
 msgid "Prospect Contact"
-msgstr ""
+msgstr "Contato"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -2261,7 +2265,7 @@ msgstr "ir.actions.wizard"
 #. module: base
 #: model:res.country,name:base.nr
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -2279,7 +2283,7 @@ msgstr "Form."
 #. module: base
 #: model:res.country,name:base.me
 msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2289,7 +2293,7 @@ msgstr "STOCK_QUIT"
 #. module: base
 #: view:ir.cron:0
 msgid "Technical Data"
-msgstr ""
+msgstr "Dados Técnicos"
 
 #. module: base
 #: view:res.partner:0
@@ -2312,7 +2316,7 @@ msgstr "A ser atualizado"
 #. module: base
 #: model:res.country,name:base.ly
 msgid "Libya"
-msgstr ""
+msgstr "Líbia"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2327,12 +2331,12 @@ msgstr "Repositórios"
 #. module: base
 #: model:res.country,name:base.cf
 msgid "Central African Republic"
-msgstr ""
+msgstr "República Centro-Africana"
 
 #. module: base
 #: model:res.country,name:base.li
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Suíça"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -2347,7 +2351,7 @@ msgstr "EAN13"
 #. module: base
 #: model:res.country,name:base.pt
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #. module: base
 #: selection:maintenance.contract,state:0
@@ -2357,7 +2361,7 @@ msgstr "Inválido"
 #. module: base
 #: field:ir.module.module,certificate:0
 msgid "Quality Certificate"
-msgstr ""
+msgstr "Certificado de qualidade"
 
 #. module: base
 #: view:res.lang:0
@@ -2380,12 +2384,12 @@ msgstr "Idiomas"
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. module: base
 #: model:res.country,name:base.ec
 msgid "Ecuador"
-msgstr ""
+msgstr "Equador"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -2403,12 +2407,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Clientes"
 
 #. module: base
 #: model:res.country,name:base.au
 msgid "Australia"
-msgstr ""
+msgstr "Austrália"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -2443,7 +2447,7 @@ msgstr "Conteúdo SXW"
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr ""
+msgstr "Ação a Disparar"
 
 #. module: base
 #: field:ir.report.custom.fields,fc0_operande:0
@@ -2493,7 +2497,7 @@ msgstr "Cabeçalho/Rodapé"
 #. module: base
 #: model:res.country,name:base.lb
 msgid "Lebanon"
-msgstr ""
+msgstr "Líbano"
 
 #. module: base
 #: wizard_field:module.lang.import,init,name:0
@@ -2503,7 +2507,7 @@ msgstr "Idioma"
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Santa Sé (Vaticano)"
 
 #. module: base
 #: help:ir.actions.server,condition:0
@@ -2511,6 +2515,8 @@ msgid ""
 "Condition that is to be tested before action is executed, e.g. "
 "object.list_price > object.cost_price"
 msgstr ""
+"Condição a ser testada antes da ação ser executada. Ex.: object.list_price > "
+"object.cost_price"
 
 #. module: base
 #: wizard_field:base.module.import,init,module_file:0
@@ -2520,7 +2526,7 @@ msgstr "Arquivo de módulo .ZIP"
 #. module: base
 #: field:res.roles,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Filhos"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
@@ -2546,7 +2552,7 @@ msgstr "Transações de Entrada"
 #. module: base
 #: model:res.country,name:base.sr
 msgid "Suriname"
-msgstr ""
+msgstr "Suriname"
 
 #. module: base
 #: field:ir.values,key2:0
@@ -2590,7 +2596,7 @@ msgstr "Licença"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Invalid operation"
-msgstr ""
+msgstr "Operação inválida"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2600,7 +2606,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "Restrição de SQL"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -2623,18 +2629,18 @@ msgstr "Abrir uma janela"
 #. module: base
 #: model:res.country,name:base.gq
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guiné Equatorial"
 
 #. module: base
 #: wizard_view:base.module.import,init:0
 msgid "Module Import"
-msgstr ""
+msgstr "Importar módulo"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the field '%s' !"
-msgstr ""
+msgstr "Voce não pode remover o campo '%s' !"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -2666,17 +2672,17 @@ msgstr "%c - representação adequada para Data e hora."
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Finland / Suomi"
-msgstr ""
+msgstr "Finlândia"
 
 #. module: base
 #: model:res.country,name:base.bo
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolívia"
 
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
-msgstr ""
+msgstr "Gana"
 
 #. module: base
 #: field:res.lang,direction:0
@@ -2713,12 +2719,13 @@ msgstr "Regras"
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
+"Voce tentou remover um módulo que esta instalado ou poderá ser instalado"
 
 #. module: base
 #: help:ir.values,key2:0
 msgid ""
 "The kind of action or button in the client side that will trigger the action."
-msgstr ""
+msgstr "O tipo de ação ou butão no lado cliente que irá disparar a ação."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2728,7 +2735,7 @@ msgstr "STOCK_PASTE"
 #. module: base
 #: model:res.country,name:base.gt
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_form
@@ -2765,17 +2772,17 @@ msgstr "Saltar"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Accepted Links in Requests"
-msgstr "Ligações aceitas nas mensagens"
+msgstr "Links aceitos nas mensagens"
 
 #. module: base
 #: model:res.country,name:base.ls
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesoto"
 
 #. module: base
 #: model:res.country,name:base.ke
 msgid "Kenya"
-msgstr ""
+msgstr "Quênia"
 
 #. module: base
 #: view:res.config.view:0
@@ -2791,22 +2798,22 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sm
 msgid "San Marino"
-msgstr ""
+msgstr "São Marinho"
 
 #. module: base
 #: model:res.country,name:base.bm
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudas"
 
 #. module: base
 #: model:res.country,name:base.pe
 msgid "Peru"
-msgstr ""
+msgstr "Perú"
 
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr ""
+msgstr "Definir como NULL"
 
 #. module: base
 #: field:res.partner.event,som:0
@@ -2842,7 +2849,7 @@ msgstr "Chave"
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Call Date"
-msgstr ""
+msgstr "Data da próxima chamada"
 
 #. module: base
 #: field:res.company,rml_header:0
@@ -2852,7 +2859,7 @@ msgstr "Cabeçalho RML"
 #. module: base
 #: wizard_field:res.partner.sms_send,init,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -2874,12 +2881,12 @@ msgstr "Segurança"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Using a relation field which uses an unknown object"
-msgstr ""
+msgstr "Usando uma relação que usa um objeto desconhecido"
 
 #. module: base
 #: model:res.country,name:base.za
 msgid "South Africa"
-msgstr ""
+msgstr "África do Sul"
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_module_lang_export
@@ -2895,12 +2902,12 @@ msgstr "Instalado"
 #. module: base
 #: model:res.country,name:base.sn
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #. module: base
 #: model:res.country,name:base.hu
 msgid "Hungary"
-msgstr ""
+msgstr "Hungria"
 
 #. module: base
 #: model:ir.model,name:base.model_res_groups
@@ -2926,12 +2933,12 @@ msgstr "Preços"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Albanian / Shqipëri"
-msgstr ""
+msgstr "Albânia"
 
 #. module: base
 #: model:res.country,name:base.sy
 msgid "Syria"
-msgstr ""
+msgstr "Síria"
 
 #. module: base
 #: view:res.lang:0
@@ -2941,22 +2948,22 @@ msgstr "======================================================"
 #. module: base
 #: field:ir.report.custom.fields,field_child2:0
 msgid "Field child2"
-msgstr ""
+msgstr "Campo filho2"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child3:0
 msgid "Field child3"
-msgstr ""
+msgstr "Campo filho3"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child0:0
 msgid "Field child0"
-msgstr ""
+msgstr "Campo filho0"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child1:0
 msgid "Field child1"
-msgstr ""
+msgstr "Campo filho 1"
 
 #. module: base
 #: field:ir.model.fields,selection:0
@@ -2966,7 +2973,7 @@ msgstr ": Seleção de Campo"
 #. module: base
 #: selection:res.request,state:0
 msgid "draft"
-msgstr ""
+msgstr "esboço"
 
 #. module: base
 #: field:res.currency,date:0
@@ -2980,7 +2987,7 @@ msgstr "Data"
 #. module: base
 #: field:ir.actions.report.xml,report_sxw:0
 msgid "SXW path"
-msgstr ""
+msgstr "endereço do SXW"
 
 #. module: base
 #: view:ir.attachment:0
@@ -3008,6 +3015,8 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Se definido como verdadeiro, a ação não será exibida na barra de ferramentas "
+"a direita."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
@@ -3039,7 +3048,7 @@ msgstr "Criador"
 #. module: base
 #: model:res.country,name:base.mx
 msgid "Mexico"
-msgstr ""
+msgstr "México"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -3059,7 +3068,7 @@ msgstr "res.users"
 #. module: base
 #: model:res.country,name:base.ni
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicarágua"
 
 #. module: base
 #: view:res.partner.event:0
@@ -3086,7 +3095,7 @@ msgstr "Campo"
 #. module: base
 #: model:res.country,name:base.ve
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. module: base
 #: view:res.lang:0
@@ -3096,7 +3105,7 @@ msgstr "9.  %j              ==> 340"
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
-msgstr ""
+msgstr "Zâmbia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -3116,7 +3125,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr ""
+msgstr "Parceiro Pai"
 
 #. module: base
 #: view:ir.module.module:0
@@ -3126,12 +3135,12 @@ msgstr "Cancelar Atualização"
 #. module: base
 #: model:res.country,name:base.ci
 msgid "Ivory Coast (Cote D'Ivoire)"
-msgstr ""
+msgstr "Costa do Marfim"
 
 #. module: base
 #: model:res.country,name:base.kz
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Cazaquistão"
 
 #. module: base
 #: field:ir.actions.report.xml,name:0
@@ -3164,7 +3173,7 @@ msgstr "Nome"
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -3326,7 +3335,7 @@ msgstr "Lista de controles de acesso"
 #. module: base
 #: model:res.country,name:base.um
 msgid "USA Minor Outlying Islands"
-msgstr ""
+msgstr "USA Minor Outlying Islands"
 
 #. module: base
 #: field:res.partner.bank,state:0
@@ -3377,7 +3386,7 @@ msgstr "Titular da conta bancária"
 #: model:ir.actions.act_window,name:base.act_values_form
 #: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Conexões de ações de cliente"
 
 #. module: base
 #: field:ir.ui.view_sc,resource:0
@@ -3601,7 +3610,7 @@ msgstr "Micronésia"
 #. module: base
 #: view:res.request.history:0
 msgid "Request History"
-msgstr "Pedir Histórico"
+msgstr "Histórico das mensagens"
 
 #. module: base
 #: field:ir.actions.act_window,menus:0
@@ -4340,7 +4349,7 @@ msgstr ""
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "Frances (CH)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4559,7 +4568,7 @@ msgstr "%a - Nome da semana abreviado."
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Introspection report on objects"
-msgstr ""
+msgstr "Relatório de instrospecção nos objetos"
 
 #. module: base
 #: model:res.country,name:base.pf
@@ -4569,7 +4578,7 @@ msgstr "Polinésia (França)"
 #. module: base
 #: model:res.country,name:base.dm
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
@@ -4737,12 +4746,12 @@ msgstr "Objetos"
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Selecionável"
 
 #. module: base
 #: view:res.request.link:0
 msgid "Request Link"
-msgstr ""
+msgstr "Link"
 
 #. module: base
 #: field:ir.module.module,url:0
@@ -4815,7 +4824,7 @@ msgstr "Traduções"
 #. module: base
 #: field:ir.sequence,padding:0
 msgid "Number padding"
-msgstr ""
+msgstr "Preencher número"
 
 #. module: base
 #: model:res.country,name:base.ua
@@ -4876,7 +4885,7 @@ msgstr "XSL path"
 #. module: base
 #: model:res.country,name:base.bn
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #. module: base
 #: field:ir.actions.act_window,view_type:0
@@ -5445,7 +5454,7 @@ msgstr "Seleção"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "Visão de Pesquisa"
 
 #. module: base
 #: field:ir.rule,domain_force:0
@@ -5546,7 +5555,7 @@ msgstr "GPL-3 ou versão posterior"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML(Mako)"
-msgstr ""
+msgstr "HTML from HTML(Mako)"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -5646,7 +5655,7 @@ msgstr "Ações da janela"
 #. module: base
 #: model:res.country,name:base.kn
 msgid "Saint Kitts & Nevis Anguilla"
-msgstr ""
+msgstr "Saint Kitts & Nevis Anguilla"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5667,6 +5676,7 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
+"Objeto no qual você deseja gravar/criar. Se vazio, veja o campo \"Objeto\"."
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5700,7 +5710,7 @@ msgstr "Martinica(França)"
 #: model:ir.ui.menu,name:base.next_id_12
 #: view:res.request:0
 msgid "Requests"
-msgstr "Requisições"
+msgstr "Mensagens"
 
 #. module: base
 #: model:res.country,name:base.ye
@@ -5730,13 +5740,13 @@ msgstr "Samoa"
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
-msgstr ""
+msgstr "IDs filhos"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr ""
+msgstr "Prbolemas na configuracao do 'id do registro' na ação do servidor!"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
@@ -5770,7 +5780,7 @@ msgstr "E-mail"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Resynchronise Terms"
-msgstr ""
+msgstr "Re-sincroniar termos"
 
 #. module: base
 #: model:res.country,name:base.tg
@@ -5796,7 +5806,7 @@ msgstr "Cascata"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Campo %d pode ser uma imagem"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
@@ -5832,7 +5842,7 @@ msgstr "Nome do Estado"
 #. module: base
 #: field:workflow.activity,join_mode:0
 msgid "Join Mode"
-msgstr ""
+msgstr "Modo de junção"
 
 #. module: base
 #: field:res.users,context_tz:0
@@ -5871,6 +5881,7 @@ msgstr "Iniciar instalação"
 #: help:res.lang,code:0
 msgid "This field is used to set/get locales for user"
 msgstr ""
+"Este campo é utilizado para gravar/obter localização (locale) do usuário"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
@@ -5952,7 +5963,7 @@ msgstr "Granada"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Trigger Configuration"
-msgstr ""
+msgstr "Configuração de Gatilhos"
 
 #. module: base
 #: selection:server.action.create,init,type:0
@@ -6052,7 +6063,7 @@ msgstr "Hora 00->24: %(h24)s"
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr ""
+msgstr "Selecionar propriedade do campo"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -6133,7 +6144,7 @@ msgstr "Regras de Acesso"
 #. module: base
 #: field:ir.default,ref_table:0
 msgid "Table Ref."
-msgstr ""
+msgstr "Ref. Tabela"
 
 #. module: base
 #: field:res.roles,parent_id:0
@@ -6143,7 +6154,7 @@ msgstr "Superior"
 #. module: base
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Retornando"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -6197,7 +6208,7 @@ msgstr "Exportar arquivo de tradução"
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
-msgstr ""
+msgstr "Ref. Usuário"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -6209,7 +6220,7 @@ msgstr "Configuração"
 #. module: base
 #: field:ir.actions.server,expression:0
 msgid "Loop Expression"
-msgstr ""
+msgstr "Expressão de repetição"
 
 #. module: base
 #: selection:res.partner.event,partner_type:0
@@ -6347,6 +6358,7 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Se marcado, o ajudante não mostrará a barra de ferramenta no formulário"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -6361,7 +6373,7 @@ msgstr "Ilhas Heard e McDonald"
 #. module: base
 #: field:ir.actions.act_window,view_id:0
 msgid "View Ref."
-msgstr ""
+msgstr "Ref. de visão"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -6522,7 +6534,7 @@ msgstr "República Democrática do Congo"
 #: field:res.request,body:0
 #: field:res.request.history,req_id:0
 msgid "Request"
-msgstr "Requisitar"
+msgstr "Mensagem"
 
 #. module: base
 #: model:res.country,name:base.jp
@@ -6532,7 +6544,7 @@ msgstr "Japão"
 #. module: base
 #: field:ir.cron,numbercall:0
 msgid "Number of Calls"
-msgstr ""
+msgstr "Numero de chamadas"
 
 #. module: base
 #: wizard_view:module.lang.install,start:0
@@ -6821,7 +6833,7 @@ msgstr "só uma vez"
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Write Object"
-msgstr ""
+msgstr "Objeto de gravação"
 
 #. module: base
 #: model:res.country,name:base.bg
@@ -6844,6 +6856,8 @@ msgid ""
 "Only one client action will be execute, last                                 "
 "clinent action will be consider in case of multiples clients actions"
 msgstr ""
+"Somente uma ação do cliente será executada, a ultima ação do cliente será "
+"considerada no caso de múltiplas ações."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7111,13 +7125,13 @@ msgstr "="
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Second field should be figures"
-msgstr ""
+msgstr "O segundo campo deve ser uma imagem"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_grid_security
 #: model:ir.ui.menu,name:base.menu_ir_access_grid
 msgid "Access Controls Grid"
-msgstr ""
+msgstr "Grid dos controles de acesso"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_actions
@@ -7200,7 +7214,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cx
 msgid "Christmas Island"
-msgstr ""
+msgstr "Ilhas Natal"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7314,7 +7328,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.fields,relation_field:0
 msgid "Relation Field"
-msgstr ""
+msgstr "Campo de relação"
 
 #. module: base
 #: field:workflow.triggers,instance_id:0
@@ -7388,7 +7402,7 @@ msgstr "Telefone"
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
-msgstr ""
+msgstr "Menu de Acesso"
 
 #. module: base
 #: model:res.country,name:base.th
@@ -7479,7 +7493,7 @@ msgstr "Campo inferior(filho)"
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
 msgid "Action Usage"
-msgstr ""
+msgstr "Uso de ação"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -7499,7 +7513,7 @@ msgstr "View :"
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "Auto-carregar Visão"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
@@ -7542,7 +7556,7 @@ msgstr "Estados"
 #. module: base
 #: view:multi_company.default:0
 msgid "Matching"
-msgstr ""
+msgstr "Correspondendo a"
 
 #. module: base
 #: field:ir.actions.configuration.wizard,name:0
@@ -7606,7 +7620,7 @@ msgstr "Incluir contrato de manutenção"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
-msgstr ""
+msgstr "Vietnam"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -7617,7 +7631,7 @@ msgstr "Limite"
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid "Workflow to be executed on this model."
-msgstr ""
+msgstr "Fluxo de trabalho a ser executado nesse modelo"
 
 #. module: base
 #: model:res.country,name:base.jm
@@ -7724,7 +7738,7 @@ msgstr "Janela Atual"
 #. module: base
 #: view:ir.values:0
 msgid "Action Source"
-msgstr ""
+msgstr "Fonte de ação"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7751,7 +7765,7 @@ msgstr "Nome Completo"
 #. module: base
 #: view:ir.report.custom:0
 msgid "Subscribe Report"
-msgstr ""
+msgstr "Subscreva relatório"
 
 #. module: base
 #: field:ir.values,object:0
@@ -7791,6 +7805,11 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"O Formato de Separador deveria ser como [, n] onde 0 < n: a partir de dígito "
+"de Unidade.-1 terminará a separação. por exemplo. [3,2, -1] representará "
+"106500 para ser 1,06,500; [1,2, -1] representará isto para ser 106,50,0; [3] "
+"representará isto como 106500. Sendo ',' como o separador de milhar em cada "
+"caso."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form_new
@@ -7851,7 +7870,7 @@ msgstr "Código de País/Língua"
 #. module: base
 #: field:workflow.activity,split_mode:0
 msgid "Split Mode"
-msgstr ""
+msgstr "Modo de separação"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
@@ -8019,7 +8038,7 @@ msgstr "Coréia do Norte"
 #. module: base
 #: view:ir.report.custom:0
 msgid "Unsubscribe Report"
-msgstr ""
+msgstr "Cancelar relatorio"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -8034,7 +8053,7 @@ msgstr "Código BIC/Swift"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "Prospecto"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -8044,7 +8063,7 @@ msgstr "Polish / Język polski"
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr ""
+msgstr "Nome de exportação"
 
 #. module: base
 #: help:res.partner.address,type:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 3415c7fd6b4..0b550763688 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:58+0000\n"
+"PO-Revision-Date: 2010-03-28 04:27+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 97f5c876733..6b492ef857f 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:58+0000\n"
+"PO-Revision-Date: 2010-03-28 04:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 76d3525e164..17a98775903 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-18 04:59+0000\n"
+"PO-Revision-Date: 2010-03-28 04:32+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base