[MERGE]merge with trunk

bzr revid: kbh@tinyerp.com-20121130044635-pbn846pwspti4khw

1 files changed, 17 insertions, 17 deletions

diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index dd650aa85e5..b102f8279d3 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -7,28 +7,28 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-12-31 10:31+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 09:53+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr "处理节点"
+msgstr "流程节点"
 
 #. module: process
 #: help:process.process,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
-msgstr "此字段设为 False 将隐藏流程而不是删除它。"
+msgstr "如果活动字段设为 False 将隐藏流程而无需删除。"
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -38,7 +38,7 @@ msgstr "相关菜单"
 #. module: process
 #: selection:process.node,kind:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -72,7 +72,7 @@ msgstr "启动流程"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr "处理节点"
+msgstr "流程节点"
 
 #. module: process
 #: view:process.process:0
@@ -136,7 +136,7 @@ msgstr "工作流迁移"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "Last modified by:"
-msgstr ""
+msgstr "最后修改者:"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -148,7 +148,7 @@ msgstr "动作ID"
 #: code:addons/process/static/src/xml/process.xml:7
 #, python-format
 msgid "Process View"
-msgstr ""
+msgstr "业务流程视图"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition
@@ -196,7 +196,7 @@ msgstr "启动迁移"
 #: code:addons/process/static/src/xml/process.xml:54
 #, python-format
 msgid "Related:"
-msgstr ""
+msgstr "相关的："
 
 #. module: process
 #: view:process.node:0
@@ -212,14 +212,14 @@ msgstr "备注"
 #: code:addons/process/static/src/xml/process.xml:88
 #, python-format
 msgid "Edit Process"
-msgstr ""
+msgstr "编辑业务流程"
 
 #. module: process
 #. openerp-web
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "N/A"
-msgstr ""
+msgstr "无"
 
 #. module: process
 #: view:process.process:0
@@ -251,7 +251,7 @@ msgstr "动作"
 #: code:addons/process/static/src/xml/process.xml:67
 #, python-format
 msgid "Select Process"
-msgstr ""
+msgstr "选择业务流程"
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -338,7 +338,7 @@ msgstr "节点类型"
 #: code:addons/process/static/src/xml/process.xml:42
 #, python-format
 msgid "Subflows:"
-msgstr ""
+msgstr "子工作流："
 
 #. module: process
 #: view:process.node:0
@@ -351,7 +351,7 @@ msgstr "迁移出口"
 #: code:addons/process/static/src/xml/process.xml:36
 #, python-format
 msgid "Notes:"
-msgstr ""
+msgstr "备注："
 
 #. module: process
 #: selection:process.node,kind:0
@@ -375,7 +375,7 @@ msgstr "对象方法"
 #: code:addons/process/static/src/xml/process.xml:77
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "选择"
 
 #~ msgid "State"
 #~ msgstr "状态"