summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-12-27 16:35:17 +0100
committerThibault Delavallée <tde@openerp.com>2013-12-27 16:35:17 +0100
commit0bcd78116f29c369e702527d2a1187f3cb256db4 (patch)
treed0e7646d4a56349b1c6480fad92957cf740ec244 /addons/analytic_user_function
parente8beafdce3dbabb9e066d6c2422509c3b7a9162d (diff)
parent67e479e96e97be4d9aaba21a19ebf43511407ac8 (diff)
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131227153517-j278y3hrjj2nzw79
Diffstat (limited to 'addons/analytic_user_function')
-rw-r--r--addons/analytic_user_function/i18n/zh_CN.po13
1 files changed, 9 insertions, 4 deletions
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 710a1a8c414..a051a71ab89 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-11-29 14:18+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
+"PO-Revision-Date: 2013-11-19 09:19+0000\n"
+"Last-Translator: Guipo Hao <hrlpool@sohu.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: 2013-09-12 06:00+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-11-20 05:25+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_account_analytic_line
@@ -78,6 +78,8 @@ msgid ""
" of the default values when invoicing the "
"customer."
msgstr ""
+"定义为特定用户指定的服务(例如:高级咨询师)\n"
+" 以及价格,在为顾客开票时用来取代默认值。"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,uom_id:0
@@ -105,6 +107,9 @@ msgid ""
" specific user. This allows to set invoicing\n"
" conditions for a group of contracts."
msgstr ""
+"OpenERP 将循环搜索父帐 \n"
+" 来检查是否为特定用户定义特定条件。\n"
+" 这样做允许为一组合同设置账单条件。"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,user_id:0