diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index e02375d42aa..596fb40c53e 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/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: 2010-03-29 00:51+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-17 09:25+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-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -30,7 +30,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: base_contact
 #: field:res.partner.job,function_id:0
@@ -45,7 +45,7 @@ msgstr "业务伙伴职能"
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "联系人列表"
+msgstr "联系"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -60,7 +60,7 @@ msgstr "当前"
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr "名"
+msgstr "名字"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
@@ -80,7 +80,7 @@ msgstr "联系人到职能"
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
@@ -90,7 +90,7 @@ msgstr "业务伙伴到地址"
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr "个联系人"
+msgstr "# 联系人"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
@@ -142,7 +142,7 @@ msgstr "基本联系人管理模块"
 msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
-msgstr ""
+msgstr "链接业务伙伴按职称按重要性排序的列表"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -153,19 +153,19 @@ msgstr "电子邮件"
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr "停止时间"
+msgstr "停止日期"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr "地址:"
+msgstr "地址"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr "联系人工作"
+msgstr "联系人职务"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
@@ -177,7 +177,7 @@ msgstr "国籍"
 msgid ""
 "Order of importance of this address in the list of addresses of the linked "
 "contact"
-msgstr ""
+msgstr "链接联系人按地址重要性排序的地址列表"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
@@ -203,7 +203,7 @@ msgstr "定义业务伙伴和地址"
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
@@ -218,7 +218,7 @@ msgstr "序号"
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr ""
+msgstr "扩展"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
@@ -311,7 +311,7 @@ msgstr "省/ 州"
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr "常规"
+msgstr "一般"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
@@ -321,7 +321,7 @@ msgstr "过去"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr "通用信息"
+msgstr "一般信息"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
@@ -336,7 +336,7 @@ msgstr "业务伙伴"
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr "开始时间"
+msgstr "开始日期"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index 4c67136d9b1..23f888ddd7d 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/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: 2010-03-20 07:35+0000\n"
+"PO-Revision-Date: 2010-07-17 09: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-06-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -34,7 +34,7 @@ msgstr "银行帐号"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr "国家 - ID"
+msgstr "country_id"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
@@ -60,7 +60,7 @@ msgstr "IBAN帐号"
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr "账号"
+msgstr "acc_number"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po
index 0785b5cd099..7d903c36812 100644
--- a/addons/base_module_quality/i18n/zh_CN.po
+++ b/addons/base_module_quality/i18n/zh_CN.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-06-09 16:41+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-07-17 09:42+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -61,14 +61,14 @@ msgstr "详细信息"
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "考虑"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
 msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
-msgstr ""
+msgstr "一些测试比其他更重要, 所以它们在计算最终等级时占更大分量."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -86,12 +86,12 @@ msgstr "已跳过"
 msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
-msgstr "只有模块已经安装或测试能在已卸载的模块上运行的情况下测试才能完成。"
+msgstr "只有模块已安装或如果测试能在已卸载的模块上运行, 测试才能完成."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图结构"
+msgstr "无效的视图结构xml文件!"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
@@ -116,7 +116,7 @@ msgstr "文件名"
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "评分(%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
@@ -137,7 +137,7 @@ msgstr "保存报告"
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "普通记录"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
index 420512d5ee6..5afcbbf29f3 100644
--- a/addons/base_module_record/i18n/zh_CN.po
+++ b/addons/base_module_record/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: 2010-03-20 07:36+0000\n"
+"PO-Revision-Date: 2010-07-17 09:51+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-06-22 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -66,7 +66,7 @@ msgstr "只记录"
 #: 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
@@ -173,7 +173,7 @@ msgstr "记录信息"
 #: 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
@@ -183,7 +183,7 @@ 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
@@ -210,7 +210,7 @@ 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
@@ -275,7 +275,7 @@ msgstr "模块创建"
 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
@@ -293,7 +293,7 @@ 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
@@ -314,7 +314,7 @@ 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
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index 89b36c8fd8e..fe875402b41 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/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: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 10:17+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-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -22,7 +22,7 @@ msgid ""
 "Provide an expression for the field based on which you want to filter the "
 "records.\n"
 " e.g. res_partner.id=3"
-msgstr "提供一个基于字段的表达式必须过滤记录 .例如res_partner.id=3"
+msgstr "提供一个基于字段过滤记录的表达式. 例如: res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -47,7 +47,7 @@ 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
@@ -182,7 +182,7 @@ 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
@@ -209,7 +209,7 @@ 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
@@ -242,7 +242,7 @@ msgstr "y轴"
 #: 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
@@ -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
@@ -299,12 +299,12 @@ 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
@@ -345,7 +345,7 @@ 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
@@ -407,11 +407,9 @@ msgid ""
 "the \"Dashboard\" menu.\n"
 msgstr ""
 "这模块允许你创建任何统计\n"
-"报告几个对象,它是一SQL查询生成器和浏览器\n"
-"和用户\n"
+"报告几个对象, 它是一SQL查询生成器和浏览器\n"
 "\n"
-"安装模块后,它在控制台菜单增加一个自定义的报表菜单在\n"
-"控制台 的 菜单\n"
+"安装模块后, 它在控制台菜单增加一个自定义的报表菜单\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
@@ -456,7 +454,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
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 38acf261b19..59e25bd1d36 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -7,19 +7,19 @@ 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: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 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-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+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
@@ -98,7 +98,7 @@ 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打开和修改.修改后使用这个向导重新上传"
+msgstr "这是你要求报表的模板. 保存为一个.SXW文件和用openoffice打开和修改. 修改后使用这个向导重新上传"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 26a834bf11f..d75f76c57c3 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/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: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 10: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-06-22 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -84,12 +84,12 @@ msgstr "电子邮件"
 #: 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
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index a31d0df0901..fddab65c08d 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -7,20 +7,20 @@ 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: 2010-03-20 07:37+0000\n"
+"PO-Revision-Date: 2010-07-17 14:45+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-06-22 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+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
@@ -30,12 +30,12 @@ msgstr "控制台"
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr "建立者"
+msgstr "作者"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr "控制台主要模块"
+msgstr "控制面板主要模块"
 
 #. module: board
 #: view:board.note:0
@@ -51,7 +51,7 @@ msgstr "宽度"
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义中使用了无效的模快名。"
+msgstr "在这动作定义中有无效的模块名"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -62,7 +62,7 @@ msgstr "标题"
 #: 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 "控制台定义"
+msgstr "控制面板定义"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -103,12 +103,12 @@ msgstr "备注类型"
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Create Menu For Dashboard"
-msgstr "创建控制台菜单"
+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
@@ -130,12 +130,12 @@ msgstr "备注类型"
 #: field:board.board,name:0
 #: field:board.board.line,board_id:0
 msgid "Dashboard"
-msgstr "控制台"
+msgstr "控制面板"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr "所有控制台的基础模块"
+msgstr "所有控制面板的基础模块"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -145,7 +145,7 @@ msgstr "位置"
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr "打开控制台"
+msgstr "打开控制面板"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_name:0
@@ -186,7 +186,7 @@ msgstr "创建菜单"
 #. module: board
 #: model:ir.ui.menu,name:board.dashboard_menu
 msgid "Dashboards"
-msgstr "控制台"
+msgstr "控制面板"
 
 #. module: board
 #: field:board.board.line,height:0
@@ -206,7 +206,7 @@ msgstr "取消"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr "控制台视图"
+msgstr "控制面板视图"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -218,5 +218,13 @@ msgstr "控制台明细"
 msgid "Subject"
 msgstr "主题"
 
+#, python-format
+#~ msgid "User Error!"
+#~ msgstr "用户错误！"
+
+#, python-format
+#~ msgid "Please Insert Dashboard View(s) !"
+#~ msgstr "请插入看板视图！"
+
 #~ msgid "Action"
 #~ msgstr "动作"
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index a7827c05dc8..4661652740e 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-03-29 13:14+0000\n"
-"Last-Translator: darkblue <darkblue086@yahoo.com.cn>\n"
+"PO-Revision-Date: 2010-07-18 03:06+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-06-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -26,23 +26,23 @@ msgstr "发送到"
 msgid ""
 "This property defines the list                 of date/time exceptions for "
 "arecurring calendar component."
-msgstr ""
+msgstr "这属性定义了一个循环的日历组件的例外日期/ 时间列表"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_user:0
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
-msgstr ""
+msgstr "如果你想定规则发送电子邮件给负责人选这个"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Title"
-msgstr ""
+msgstr "标题"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "分类2和部分业务个案"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
@@ -60,27 +60,27 @@ msgstr "    7天    "
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr "管理求助台服务"
+msgstr "管理求助服务"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "等待的工作"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
 msgid "Button Pressed"
-msgstr "紧迫"
+msgstr "按下按钮"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Planned costs"
-msgstr "计划成本"
+msgstr "已计划成本"
 
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "关闭工作需求"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -90,9 +90,7 @@ msgstr "阶段名称"
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.history:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
 #: model:ir.actions.act_window,name:crm.crm_case_section_open_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
 msgstr "业务个案"
@@ -124,7 +122,7 @@ msgstr "管理客户和供应商的索求，包括您的纠正或预防措施"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -139,9 +137,6 @@ msgstr "已解决"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -155,7 +150,7 @@ msgstr "请指定用户的电子邮件地址"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr "商战"
+msgstr "商业活动"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -166,13 +161,13 @@ msgstr "搜索商机"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr "按组和阶段排列案例"
+msgstr "部分业务个案和阶段"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr "期间(小时数)"
+msgstr "持续时间(小时数)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
@@ -184,40 +179,26 @@ msgstr ""
 msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
-msgstr ""
+msgstr "动作描述, 例如: 根据哪些条件哪些对象的哪些动作要起作用"
 
 #. module: crm
 #: help:crm.case,section_id:0
 msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
-msgstr ""
+msgstr "业务个案属于哪些部分. 定义责任用户和电子邮件帐号的邮件网关."
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,partner_id:0
-#: model:crm.case.categ,name:crm.categ_lead4
-#: model:crm.case.categ,name:crm.categ_oppor4
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
 #: field:crm.case.rule,trg_partner_id:0
-#: selection:crm.email.add.cc,name:0
-#: field:crm.email.add.cc,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
-#: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
-#: field:crm.case.category2,section_id:0
 #: view:crm.case.section:0
 #: field:crm.case.section,name:0
-#: field:crm.case.stage,section_id:0
+#: wizard_field:crm.case.section.menu,init,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
 msgstr "业务个案项"
@@ -243,7 +224,7 @@ msgstr "电话呼叫"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "业务个案项和阶段"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -268,17 +249,18 @@ msgstr "内容使用的特别关键字"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "发送新电子邮件"
 
 #. module: crm
-#: view:crm.case.history:0
+#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
 msgid "My Histories"
 msgstr "我的日志"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "条件"
+msgstr "标准"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
@@ -289,12 +271,12 @@ msgstr "项"
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr "为你的销售渠道跟踪已定义的商机"
+msgstr "从你的销售渠道跟踪出销售机会"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "例外日期"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -304,7 +286,7 @@ msgstr "最近动作日期"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "鉴识"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
@@ -314,7 +296,7 @@ msgstr "复试"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "预订一个遥远的日程"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -330,11 +312,6 @@ msgstr "警告!"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Dates"
 msgstr "日期"
 
@@ -346,7 +323,7 @@ msgstr "细分测试"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "潜在业务伙伴"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -363,7 +340,7 @@ msgstr "联系人姓名"
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr "链接到已存在的业务伙伴"
+msgstr "链接到现有的业务伙伴"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
@@ -378,12 +355,12 @@ msgstr "耽搁类型"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "联系"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr "下次面试"
+msgstr "下次会面"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -414,7 +391,6 @@ msgid "Exception Rules"
 msgstr ""
 
 #. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
 msgstr "商机"
@@ -465,12 +441,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,categ_id:0
 #: field:crm.case.rule,trg_categ_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
-#: view:crm.opportunity:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
 msgstr "分类"
 
@@ -500,11 +470,6 @@ msgstr "%(partner)s = 业务伙伴名称"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Action Information"
 msgstr "动作信息"
 
@@ -517,7 +482,7 @@ msgstr "%(case_user_phone)s = 负责人电话"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: crm
 #: constraint:ir.actions.act_window:0
@@ -531,15 +496,14 @@ msgstr "条件"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
 msgid "Open Cases"
 msgstr "待处理业务个案"
 
 #. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
+#: field:crm.case,state:0
 msgid "Status"
-msgstr "状态"
+msgstr ""
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -569,9 +533,6 @@ msgstr "会议树"
 #: view:crm.case:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
 msgstr "提升"
@@ -686,8 +647,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
@@ -731,13 +690,8 @@ msgstr "九月"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Communication history"
-msgstr "沟通日志"
+msgstr "交流记录"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1151,10 +1105,8 @@ msgid "Next Action"
 msgstr "下一动作"
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,date_deadline:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
 msgid "Deadline"
 msgstr "截止日期"
 
@@ -1173,7 +1125,7 @@ msgstr "分类名称"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "业务伙伴细分"
+msgstr "业务伙伴分类"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1317,12 +1269,6 @@ msgstr "%(partner_email)s = 业务伙伴电子邮箱"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 msgid "Reset to Draft"
 msgstr "重置为草稿"
 
@@ -1529,8 +1475,6 @@ msgstr ""
 #: field:crm.case,date:0
 #: field:crm.case.log,date:0
 #: selection:crm.case.rule,trg_date_type:0
-#: view:crm.claim:0
-#: view:crm.phonecall:0
 msgid "Date"
 msgstr "日期"
 
@@ -1577,13 +1521,8 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "History"
-msgstr "日志"
+msgstr "历史记录"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
@@ -1616,40 +1555,18 @@ msgstr "发送提醒"
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "References"
-msgstr "参考"
+msgstr "参照"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0
-#: view:crm.claim.assign_wizard:0
-#: view:crm.fundraising:0
-#: view:crm.helpdesk.assign_wizard:0
-#: wizard_button:crm.job.meeting_set,init,end:0
-#: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0
-#: view:crm.lead:0
-#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
-#: wizard_button:crm.lead.partner_create,init,end:0
-#: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0
-#: view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.assign_wizard:0
-#: wizard_button:crm.phonecall.meeting_set,init,end:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
+#: wizard_button:crm.case.section.menu,design_menu,end:0
+#: wizard_button:crm.case.section.menu,init,end:0
 #, python-format
 msgid "Cancel"
 msgstr "取消"
@@ -1762,9 +1679,6 @@ msgid "="
 msgstr "="
 
 #. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
 msgstr "名称"
@@ -1816,11 +1730,6 @@ msgstr ""
 #. module: crm
 #: view:crm.case:0
 #: view:crm.case.rule:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Actions"
 msgstr "动作"
 
@@ -2081,17 +1990,12 @@ msgstr "业务个案状态"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Send"
 msgstr "发送"
 
 #. module: crm
 #: field:crm.case,priority:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
 msgid "Priority"
 msgstr "优先级(0=紧急)"
 
@@ -2137,11 +2041,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -2385,14 +2284,6 @@ msgstr "低"
 
 #. module: crm
 #: field:crm.case,date_closed:0
-#: selection:crm.case,state:0
-#: selection:crm.case.rule,act_state:0
-#: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 msgid "Closed"
 msgstr "已关闭"
 
@@ -2572,10 +2463,9 @@ msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
 
 #. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: field:crm.case.log,name:0
 msgid "Action"
-msgstr "动作"
+msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -2621,7 +2511,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.phonecall:0
 msgid "General"
 msgstr "常规"
 
@@ -2668,16 +2557,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
 msgstr "待处理"
@@ -2713,16 +2592,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case,user_id:0
 #: field:crm.case.rule,trg_user_id:0
-#: view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0
-#: view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0
-#: field:crm.opportunity.assign_wizard,user_id:0
-#: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
 msgstr "负责人"
 
@@ -2953,6 +2822,8 @@ msgid "Jobs Hiring Process"
 msgstr ""
 
 #. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_52
 msgid "All Cases"
 msgstr "所有业务个案"
@@ -3072,7 +2943,6 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -3161,17 +3031,6 @@ msgstr "%(case_subject)s = 业务个案主题"
 #: field:crm.case,section_id:0
 #: field:crm.case.log,section_id:0
 #: field:crm.case.rule,trg_section_id:0
-#: field:crm.claim.assign_wizard,section_id:0
-#: field:crm.helpdesk.assign_wizard,section_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
 msgstr "项"
 
@@ -3202,10 +3061,7 @@ msgid "Your action"
 msgstr "你的动作"
 
 #. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
 #: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
 msgid "Email"
 msgstr "Email"
 
@@ -3262,16 +3118,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0
-#: view:crm.opportunity:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
 msgstr "未结的"
@@ -3414,11 +3260,25 @@ msgid "All Funds"
 msgstr ""
 
 #. module: crm
-#: field:crm.case.section,calendar:0
-#: view:crm.meeting:0
-#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
+#: selection:crm.case.section.menu,design_menu,menu10_option:0
+#: selection:crm.case.section.menu,design_menu,menu11_option:0
+#: selection:crm.case.section.menu,design_menu,menu12_option:0
+#: selection:crm.case.section.menu,design_menu,menu13_option:0
+#: selection:crm.case.section.menu,design_menu,menu14_option:0
+#: selection:crm.case.section.menu,design_menu,menu15_option:0
+#: selection:crm.case.section.menu,design_menu,menu16_option:0
+#: selection:crm.case.section.menu,design_menu,menu17_option:0
+#: selection:crm.case.section.menu,design_menu,menu1_option:0
+#: selection:crm.case.section.menu,design_menu,menu2_option:0
+#: selection:crm.case.section.menu,design_menu,menu3_option:0
+#: selection:crm.case.section.menu,design_menu,menu4_option:0
+#: selection:crm.case.section.menu,design_menu,menu5_option:0
+#: selection:crm.case.section.menu,design_menu,menu6_option:0
+#: selection:crm.case.section.menu,design_menu,menu7_option:0
+#: selection:crm.case.section.menu,design_menu,menu8_option:0
+#: selection:crm.case.section.menu,design_menu,menu9_option:0
 msgid "Calendar"
-msgstr "日程表"
+msgstr ""
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
@@ -3462,6 +3322,7 @@ msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
+#: view:crm.case:0
 #, python-format
 msgid "Historize"
 msgstr "日志"
@@ -3489,11 +3350,6 @@ msgstr ""
 #: selection:crm.case.rule,act_state:0
 #: selection:crm.case.rule,trg_state_from:0
 #: selection:crm.case.rule,trg_state_to:0
-#: view:crm.meeting:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Draft"
 msgstr "草稿"
@@ -3523,8 +3379,6 @@ msgstr "普通"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
 msgstr "此行动需要业务伙伴的电子邮件地址！"
@@ -3665,8 +3519,6 @@ msgstr ""
 
 #. module: crm
 #: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
 msgid "Estimates"
 msgstr "估计"
 
@@ -3678,6 +3530,10 @@ msgstr "负责用户"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: view:crm.case:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
 #, python-format
 msgid "Close"
 msgstr "关闭"
@@ -3735,14 +3591,9 @@ msgid "% = The '%' Character"
 msgstr ""
 
 #. module: crm
-#: view:crm.case:0
 #: field:crm.case,name:0
 #: field:crm.case.history,description:0
 #: field:crm.case.history,note:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
 #: field:crm.segmentation,description:0
 msgid "Description"
 msgstr "说明"
@@ -3791,14 +3642,6 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm.py:0
 #: field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0
-#: field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0
-#: field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0
-#: field:crm.meeting,inherit_case_id:0
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
 #: model:ir.model,name:crm.model_crm_case
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
@@ -3920,7 +3763,6 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,sequence:0
 #: field:crm.case.section,sequence:0
-#: field:crm.case.stage,sequence:0
 msgid "Sequence"
 msgstr "序号"
 
@@ -3988,9 +3830,6 @@ msgstr ""
 #~ msgid "Complete this if you use the mail gateway."
 #~ msgstr "如果使用此邮件网关请填写完整"
 
-#~ msgid "Add Last Mail for Replying"
-#~ msgstr "增加最近回复邮件"
-
 #~ msgid "this wizard will create all sub-menus, within the selected menu."
 #~ msgstr "这向导将在选择的菜单创建所有子菜单"
 
@@ -4070,9 +3909,6 @@ msgstr ""
 #~ msgid "All "
 #~ msgstr "所有 "
 
-#~ msgid "Send Partner & Historize"
-#~ msgstr "发送到业务伙伴和日志"
-
 #~ msgid "All Histories"
 #~ msgstr "所有日志"
 
@@ -4087,3 +3923,35 @@ msgstr ""
 
 #~ msgid "Included Answers :"
 #~ msgstr "包括回答:"
+
+#~ msgid "All Unclosed and Unassigned "
+#~ msgstr "所有未结束和未分配 "
+
+#~ msgid "Profiling"
+#~ msgstr "特征"
+
+#~ msgid "Profiling Options"
+#~ msgstr "特征选项"
+
+#~ msgid "My Pending "
+#~ msgstr "我未决 的 "
+
+#~ msgid ""
+#~ "These people will receive a copy of the futur communication between partner "
+#~ "and users by email"
+#~ msgstr "这些人将收到一份将来业务伙伴和用户之间沟通的电子邮件的拷贝"
+
+#~ msgid "Tree View"
+#~ msgstr "目录视图"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr "截止日期为自动计算：开始时间+持续时间"
+
+#~ msgid "Mail to watchers (Cc)"
+#~ msgstr "发送到关注者"
+
+#~ msgid "Add Last Mail for Replying"
+#~ msgstr "回复时增加最近的邮件"
+
+#~ msgid "Send Partner & Historize"
+#~ msgstr "发送到业务伙伴和记载"
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 8af821dadb5..cf6665ddd1e 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/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: 2010-07-17 03:44+0000\n"
+"PO-Revision-Date: 2010-07-17 05:42+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-07-17 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -305,7 +305,7 @@ msgstr "STOCK_FLOPPY"
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr ""
+msgstr "生产批次修订"
 
 #. module: stock
 #: view:stock.location:0
@@ -591,7 +591,7 @@ msgstr "新接收的装箱单"
 #. module: stock
 #: wizard_field:mrp.stock.move.track,init,quantity:0
 msgid "Quantity per lot"
-msgstr ""
+msgstr "每批次数量"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -730,7 +730,7 @@ msgstr "未分派的产品"
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr "发票控制"
+msgstr "发票管理"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
@@ -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
@@ -780,7 +780,7 @@ 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
@@ -807,7 +807,7 @@ msgstr "STOCK_CONNECT"
 #: 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
@@ -818,7 +818,7 @@ msgstr "STOCK_GO_DOWN"
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "客户存货地点"
+msgstr "客户库位"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -829,7 +829,7 @@ msgstr "STOCK_OK"
 #: 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
@@ -878,7 +878,7 @@ 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
@@ -899,7 +899,7 @@ 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
@@ -982,7 +982,7 @@ msgstr "STOCK_APPLY"
 #. 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
@@ -1091,7 +1091,7 @@ msgstr "稍候处理"
 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
@@ -1122,7 +1122,7 @@ msgstr "STOCK_HARDDISK"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "相关领料/提货"
+msgstr "相关的装箱单"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1150,13 +1150,13 @@ 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
@@ -1166,7 +1166,7 @@ msgstr "STOCK_COPY"
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr "供应商退货"
+msgstr "供应商退还"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1197,7 +1197,7 @@ msgstr "STOCK_CDROM"
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not from Packing"
-msgstr "不是来自包装"
+msgstr "不是来自装箱单"
 
 #. module: stock
 #: view:stock.location:0
@@ -1227,7 +1227,7 @@ msgstr "STOCK_STOP"
 #. module: stock
 #: wizard_view:mrp.stock.move.track,init:0
 msgid "Tracking a move"
-msgstr ""
+msgstr "跟踪调拨"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1237,7 +1237,7 @@ msgstr "STOCK_FIND_AND_REPLACE"
 #. module: stock
 #: view:stock.picking:0
 msgid "Validate"
-msgstr "审核"
+msgstr "确认"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1286,7 +1286,7 @@ msgstr "产品"
 #. module: stock
 #: field:stock.picking,move_type:0
 msgid "Delivery Method"
-msgstr "运输方式"
+msgstr "送货方式"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
@@ -1401,14 +1401,14 @@ msgid ""
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
 "    "
 msgstr ""
-"\"OpenERP库存管理模块可以管理多仓库，多样化结构的仓储地点.\\n\"\n"
-"\"感谢复式记帐管理，存货管理很强大并且灵活:\\n\"\n"
-"\"* 移动历史和规划,\\n\"\n"
-"\"* 不同的库存管理法 (FIFO, LIFO, ...)\\n\"\n"
+"\"库存管理模块可以管理多仓库, 多样化结构的仓储地点.\\n\"\n"
+"\"感谢复式记帐管理, 存货管理很强大并且灵活:\\n\"\n"
+"\"* 调拨历史和计划\\n\"\n"
+"\"* 不同的库存管理法 (先进先出, 先进后出, ...)\\n\"\n"
 "\"* 库存估价 (标准或平均价格, ...)\\n\"\n"
 "\"* 稳健面临盘存差错\\n\"\n"
 "\"* 自动重新订货规则 (库存水平, JIT, ...)\\n\"\n"
-"\"* 支持条形码\\n\"\n"
+"\"* 支持条码\\n\"\n"
 "\"* 通过复式记帐系统快速检测错误\\n\"\n"
 "\"* 可追溯性(向上追溯/向下追溯,产品批次,序列号, ...)\\n\"\n"
 "    "
@@ -1453,7 +1453,7 @@ msgstr "STOCK_DELETE"
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr "库存分类帐"
+msgstr "库存记录集合"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1483,7 +1483,7 @@ msgstr "强制可用"
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr "产品库存视图"
+msgstr "查看库存产品"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1573,7 +1573,7 @@ msgstr "数量(销售单位)"
 #: 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
@@ -1589,13 +1589,13 @@ msgstr "设为可用"
 #: model:ir.actions.wizard,name:stock.make_picking
 #: wizard_view:stock.picking.make,init:0
 msgid "Make packing"
-msgstr "装箱"
+msgstr "建立装箱单"
 
 #. module: stock
 #: wizard_field:stock.partial_picking,end2,back_order_notification:0
 #: field:stock.picking,backorder_id:0
 msgid "Back Order"
-msgstr "拖欠订单"
+msgstr "订单"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1632,7 +1632,7 @@ msgstr "贸易术语"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "合计:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1647,7 +1647,7 @@ msgstr "STOCK_ZOOM_OUT"
 #. module: stock
 #: wizard_field:mrp.stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr ""
+msgstr "跟踪前缀"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1735,7 +1735,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
@@ -1745,7 +1745,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
@@ -1772,7 +1772,7 @@ msgstr "退回"
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Packing"
-msgstr "自动创建分拣单"
+msgstr "自动装箱单"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -1918,7 +1918,8 @@ 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
@@ -1940,7 +1941,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
@@ -1970,7 +1971,7 @@ msgstr "已登入库存"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr "收货"
+msgstr "获得的货物"
 
 #. module: stock
 #: view:stock.location:0
@@ -1980,7 +1981,7 @@ msgstr "库存库位"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr "播放"
+msgstr "STOCK_MEDIA_PLAY"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -1991,7 +1992,7 @@ msgstr "送货单"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr "打开"
+msgstr "STOCK_OPEN"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -2009,7 +2010,7 @@ msgstr "确定"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "前一个"
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
 #: view:stock.move:0
@@ -2036,7 +2037,7 @@ msgstr "库存库位结构"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr "分拆"
+msgstr "STOCK_DISCONNECT"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -2047,7 +2048,7 @@ msgstr "默认作为记录出库值科目"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr "确认(现在没处理进程)"
+msgstr "确认(现在不处理)"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
@@ -2057,7 +2058,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
@@ -2068,7 +2069,7 @@ msgstr "创建发票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr "网络"
+msgstr "STOCK_NETWORK"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -2078,7 +2079,7 @@ msgstr "设置"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr "项目"
+msgstr "terp-project"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2092,7 +2093,7 @@ msgstr "库存批次"
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "自动验证"
+msgstr "自动确认"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -2109,12 +2110,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 "最后"
+msgstr "STOCK_GOTO_LAST"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2124,7 +2125,7 @@ msgstr "已开票"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr "目录"
+msgstr "STOCK_DIRECTORY"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2154,7 +2155,7 @@ msgstr "草稿"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr "居中"
+msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2162,12 +2163,12 @@ msgstr "居中"
 #: 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
 msgid "Shelves (Y)"
-msgstr "架子（Y）"
+msgstr "货架(Y)"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
@@ -2192,7 +2193,7 @@ msgstr "直接送货"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr "恢复到保存"
+msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -2220,7 +2221,7 @@ msgstr "对于当前产品(模板)该库存库位默认作为产品需求的库
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr "库存.领料/提货.调拨.向导"
+msgstr "库存.装箱单.调拨.向导"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -2256,7 +2257,7 @@ msgstr "库位"
 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
@@ -2266,7 +2267,7 @@ msgstr "一般信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr "产品"
+msgstr "terp-product"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
@@ -2324,7 +2325,7 @@ msgstr "说明"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDENT"
-msgstr "缩进"
+msgstr "STOCK_INDENT"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -2368,7 +2369,7 @@ msgstr "发出"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "右对齐"
+msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -2383,7 +2384,7 @@ msgstr "其它信息"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr "下一个"
+msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
 #: view:stock.move:0
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 162d29f1534..5c39d658cbb 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-03-20 10:29+0000\n"
+"PO-Revision-Date: 2010-07-17 05: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-06-22 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+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 03058100eb1..91d2c55e610 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/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: 2010-03-20 10:30+0000\n"
+"PO-Revision-Date: 2010-07-17 05:40+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-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -24,7 +24,7 @@ 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
@@ -35,18 +35,18 @@ msgstr "库存库位路径"
 #: 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
@@ -89,7 +89,8 @@ 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
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 2ea8b0b6394..1904cd5b605 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/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-03-20 10:30+0000\n"
+"PO-Revision-Date: 2010-07-17 05:44+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-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-07-18 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -24,14 +24,14 @@ 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 "库存没自动装箱单"