diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2010-07-29 18:51:04 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2010-07-29 18:51:04 +0530 |
| commit | f95c1f17df31878df148d714d143167870df232f (patch) | |
| tree | 14f028911a6fd6e5b799a2ba36fb0427d99c76d6 /addons/analytic_user_function | |
| parent | 1eea693ecadd3829fa729a727a154c23a1df6ab6 (diff) | |
| parent | d0f6b7dc0c6067c5a1b930fd55455667570b9842 (diff) | |
[MERGE]
bzr revid: hmo@tinyerp.com-20100729132104-m7ducnenq89u4rds
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/__openerp__.py | 6 | ||||
| -rw-r--r-- | addons/analytic_user_function/i18n/zh_CN.po | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index 072d6cfc4f9..8f6af6f84b7 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/addons/analytic_user_function/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## @@ -31,7 +31,7 @@ Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations. """, - 'author': 'Tiny', + 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['hr_timesheet_sheet'], 'init_xml': [], diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po index 034ad99e623..e20db0149f5 100644 --- a/addons/analytic_user_function/i18n/zh_CN.po +++ b/addons/analytic_user_function/i18n/zh_CN.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-20 07:31+0000\n" +"PO-Revision-Date: 2010-07-14 03:52+0000\n" "Last-Translator: Black Jack <onetimespeed@hotmail.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-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "无效的视图结构XML文件!" +msgstr "无效XML视图结构!" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid @@ -51,7 +51,7 @@ msgstr "用户" #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "对象名必须要以X_开头并且不能含有特殊字符!" +msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information @@ -63,6 +63,10 @@ msgstr "辅助核算用的函数" msgid "User's Product for this Analytic Account" msgstr "用户的产品辅助核算项" +#, python-format +#~ msgid "Error !" +#~ msgstr "错误！" + #~ msgid "" #~ "\n" #~ "\n" |