[merge] from new config wizards

bzr revid: xmo@tinyerp.com-20100108150310-90afnk7rr2c0gln3

diff --cc bin/addons/base/i18n/zh_CN.po
index 56f88a3,56f88a3..1f1f144
--- 1/bin/addons/base/i18n/zh_CN.po
--- 2/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@@ -7,13 -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-10 09:34+0000\n"
++"PO-Revision-Date: 2010-01-07 13:00+0000\n"
  "Last-Translator: Wei \"oldrev\" Li <oldrev@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-01-11 04:55+0000\n"
++"X-Launchpad-Export-Date: 2010-01-08 04:37+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base
@@@ -383,7 -383,7 +383,7 @@@ msgstr "å¦\82æ\9e\9cæ\82¨é\80\89中此å¤\84ï¼\8cå½\93ä¸\8bæ
  #. module: base
  #: help:res.lang,iso_code:0
  msgid "This ISO code is the name of po files to use for translations"
--msgstr ".PO 文件翻译使用的 ISO 国家代码"
++msgstr ""
  
  #. module: base
  #: selection:ir.ui.menu,icon:0
@@@ -974,7 -974,7 +974,7 @@@ msgstr "默认价值
  #: wizard_field:res.partner.sms_send,init,user:0
  #: field:res.users,login:0
  msgid "Login"
--msgstr "用户名"
++msgstr "登录"
  
  #. module: base
  #: view:maintenance.contract:0
@@@ -2039,7 -2039,7 +2039,7 @@@ msgstr "STOCK_JUSTIFY_RIGHT
  #. module: base
  #: model:ir.model,name:base.model_res_partner_function
  msgid "Function of the contact"
--msgstr "联系人职能"
++msgstr "联系人自定义功能"
  
  #. module: base
  #: model:ir.actions.act_window,name:base.open_module_tree_upgrade
@@@ -3399,7 -3399,7 +3399,7 @@@ msgstr "客户端动作设置
  #: model:ir.ui.menu,name:base.menu_partner_address_form
  #: view:res.partner.address:0
  msgid "Partner Addresses"
--msgstr "业务伙伴地址列表"
++msgstr "业务伙伴地址"
  
  #. module: base
  #: selection:module.lang.install,init,lang:0
@@@ -5476,7 -5476,7 +5476,7 @@@ msgstr "GPL-3 或更新版本
  #. module: base
  #: selection:ir.actions.report.xml,report_type:0
  msgid "HTML from HTML(Mako)"
--msgstr "HTML 到 HTML 报表（使用 Mako 模板）"
++msgstr ""
  
  #. module: base
  #: field:workflow.activity,action:0
@@@ -5732,7 -5732,7 +5732,7 @@@ msgstr "字段 %d 应该是数字
  #: model:ir.actions.act_window,name:base.action_inventory_form
  #: model:ir.ui.menu,name:base.menu_action_inventory_form
  msgid "Default Company per Object"
--msgstr "每对象的默认公司"
++msgstr ""
  
  #. module: base
  #: view:ir.actions.configuration.wizard:0
@@@ -5798,7 -5798,7 +5798,7 @@@ msgstr "开始安装
  #. module: base
  #: help:res.lang,code:0
  msgid "This field is used to set/get locales for user"
--msgstr "此字段用于设定或获取地区设置"
++msgstr ""
  
  #. module: base
  #: model:res.partner.category,name:base.res_partner_category_2
@@@ -5980,7 -5980,7 +5980,7 @@@ msgstr "小时 00->24: %(h24)s
  #. module: base
  #: help:multi_company.default,field_id:0
  msgid "Select field property"
--msgstr "选择字段属性"
++msgstr ""
  
  #. module: base
  #: field:res.request.history,date_sent:0
@@@ -7318,7 -7318,7 +7318,7 @@@ msgstr "删除权限
  #. module: base
  #: model:ir.model,name:base.model_multi_company_default
  msgid "multi_company.default"
--msgstr "multi_company.default"
++msgstr ""
  
  #. module: base
  #: selection:workflow.activity,join_mode:0
@@@ -7844,7 -7844,7 +7844,7 @@@ msgstr "塞舌尔
  #: code:addons/base/res/res_user.py:0
  #, python-format
  msgid "You can not have two users with the same login !"
--msgstr "用户名必须唯一！"
++msgstr ""
  
  #. module: base
  #: model:res.country,name:base.sl
@@@ -7884,7 -7884,7 +7884,7 @@@ msgstr "资源对象
  #: field:res.partner.address,function:0
  #: selection:workflow.activity,kind:0
  msgid "Function"
--msgstr "职能"
++msgstr "功能"
  
  #. module: base
  #: selection:res.partner.address,type:0