From 9b02aed518a1fe65ff49679ee915f55cdcc6c319 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 14 Jan 2012 05:10:38 +0000
Subject: [PATCH] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120114051038-jxxvburcw1gihii5
---
 openerp/addons/base/i18n/ja.po    |  2 +-
 openerp/addons/base/i18n/zh_CN.po | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 2eab104f727..de7633ae7e9 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-13 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-01-14 05:10+0000\n"
 "X-Generator: Launchpad (build 14664)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 3eabd73e01f..c04d21659ae 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/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: 2011-12-22 20:22+0000\n"
-"PO-Revision-Date: 2012-01-12 09:39+0000\n"
+"PO-Revision-Date: 2012-01-13 16:46+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: 2012-01-13 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-01-14 05:10+0000\n"
 "X-Generator: Launchpad (build 14664)\n"
 
 #. module: base
@@ -186,7 +186,7 @@ msgstr "警告！"
 msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
-msgstr "基本字段的属性不能这样修改，请通过 Python 代码来修改它，最好是制作一个自定义模块。"
+msgstr "基本字段的属性不能这样修改，请通过 Python 代码来修改它们，更好的办法是通过自定义模块来修改。"
 
 #. module: base
 #: code:addons/osv.py:129
@@ -834,7 +834,7 @@ msgstr ""
 #. module: base
 #: view:res.users:0
 msgid "Email Preferences"
-msgstr "Email 首选项"
+msgstr "电子邮件选项"
 
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
@@ -4114,7 +4114,7 @@ msgstr "必填"
 #. module: base
 #: view:res.users:0
 msgid "Default Filters"
-msgstr "默认的过滤"
+msgstr "默认过滤器"
 
 #. module: base
 #: field:res.request.history,name:0
@@ -7212,6 +7212,8 @@ msgid ""
 "interface, which has less features but is easier to use. You can switch to "
 "the other interface from the User/Preferences menu at any time."
 msgstr ""
+"OpenERP 提供了简化与扩展的用户界面。如果您是第一次使用 OpenERP， "
+"我们强烈建议您选择简化界面，简化界面功能较少但更易用。您以后也可以在“用户”/“首选项”菜单中切换界面形式。"
 
 #. module: base
 #: model:res.country,name:base.cc