[MERGE] from master

[odoo/odoo.git] / addons / base_action_rule / i18n / zh_CN.po

diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index f263d77..305ba21 100644 (file)
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-11-04 05:35+0000\n"
+"Last-Translator: 卓忆科技 <zhanghao@jointd.com>\n"
 "Language-Team: Chinese (Simplified) <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: 2014-08-15 06:55+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-11-05 07:41+0000\n"
+"X-Generator: Launchpad (build 17223)\n"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
@@ -33,6 +33,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击设置一个新的自动动作规则. \n"
+"              </p><p>\n"
+"                使用自动操作自动触发动作在各类画面中\n"
+"                . 例如: 一个线索被某特定用户创建可以自动设置到到某个销售组中,\n"
+"                或者一个商机在等待14天之后自动触发一个提醒邮件.\n"
+"               \n"
+"              </p>\n"
+"            "
 
 #. module: base_action_rule
 #: view:base.action.rule:base_action_rule.view_base_action_rule_form
@@ -75,12 +84,12 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,filter_pre_id:0
 msgid "Before Update Filter"
-msgstr ""
+msgstr "更新前过滤器"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
@@ -209,7 +218,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "最近动作"
 
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
@@ -236,7 +245,7 @@ msgstr "分"
 #. module: base_action_rule
 #: field:base.action.rule,model:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -276,7 +285,7 @@ msgstr "待处理"
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "相关的文档模型"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,user_id:0
@@ -303,12 +312,12 @@ msgstr "序号"
 #: view:base.action.rule:base_action_rule.view_base_action_rule_form
 #: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
-msgstr ""
+msgstr "服务器动作"
 
 #. module: base_action_rule
 #: view:base.action.rule:base_action_rule.view_base_action_rule_form
 msgid "Server actions to run"
-msgstr ""
+msgstr "要运行的服务器动作"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
@@ -323,12 +332,12 @@ msgstr "状态"
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,name:0
 msgid "Subject"
-msgstr ""
+msgstr "主题"
 
 #. module: base_action_rule
 #: view:base.action.rule:base_action_rule.view_base_action_rule_form
 msgid "The filter must therefore be available in this page."
-msgstr ""
+msgstr "过滤器必须是本页存在的。"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_id:0
@@ -362,4 +371,4 @@ msgstr ""
 #. module: base_action_rule
 #: help:base.action.rule,active:0
 msgid "When unchecked, the rule is hidden and will not be executed."
-msgstr ""
+msgstr "如果不选中，此规则被隐藏且不被执行"