[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130627073758-fqjrshbu1zn35v1r
This commit is contained in:
Thibault Delavallée 2013-06-27 09:37:58 +02:00
commit eccdc062ce
1 changed files with 21 additions and 21 deletions

View File

@ -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:04+0000\n"
"PO-Revision-Date: 2012-12-14 14:12+0000\n"
"Last-Translator: sum1201 <Unknown>\n"
"PO-Revision-Date: 2013-06-27 03:25+0000\n"
"Last-Translator: Alan <shuchuan.wu@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: 2013-03-16 04:57+0000\n"
"X-Generator: Launchpad (build 16532)\n"
"X-Launchpad-Export-Date: 2013-06-27 05:36+0000\n"
"X-Generator: Launchpad (build 16681)\n"
#. module: project
#: view:project.project:0
@ -82,7 +82,7 @@ msgid "Start Task"
msgstr "开始任务"
#. module: project
#: code:addons/project/project.py:932
#: code:addons/project/project.py:944
#, python-format
msgid "Warning !"
msgstr "警告!"
@ -132,8 +132,8 @@ msgid ""
msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图这一摘要直接是是HTML格式。"
#. module: project
#: code:addons/project/project.py:432
#: code:addons/project/project.py:1318
#: code:addons/project/project.py:444
#: code:addons/project/project.py:1332
#, python-format
msgid "Warning!"
msgstr "警告!"
@ -383,7 +383,7 @@ msgid "Assigned to"
msgstr "指派到"
#. module: project
#: code:addons/project/project.py:1021
#: code:addons/project/project.py:1033
#, python-format
msgid "Delegated User should be specified"
msgstr "应该制定委派用户"
@ -433,7 +433,7 @@ msgstr "使用集成的协作记事簿任务"
#: model:mail.message.subtype,name:project.mt_project_task_blocked
#: model:mail.message.subtype,name:project.mt_task_blocked
msgid "Task Blocked"
msgstr ""
msgstr "延期的任务"
#. module: project
#: model:process.node,note:project.process_node_opentask0
@ -453,7 +453,7 @@ msgstr "oe_kanban_text_red"
#. module: project
#: model:mail.message.subtype,description:project.mt_task_blocked
msgid "Task blocked"
msgstr ""
msgstr "延期的任务"
#. module: project
#: view:project.task:0
@ -866,7 +866,7 @@ msgstr "公司"
#. module: project
#: field:project.task.type,fold:0
msgid "Folded by Default"
msgstr ""
msgstr "默认折叠"
#. module: project
#: field:project.task.history,date:0
@ -1195,9 +1195,9 @@ msgid "Computed as: Time Spent + Remaining Time."
msgstr "计算:花费的时间 + 剩余的时间"
#. module: project
#: code:addons/project/project.py:356
#: code:addons/project/project.py:377
#: code:addons/project/project.py:709
#: code:addons/project/project.py:368
#: code:addons/project/project.py:389
#: code:addons/project/project.py:721
#, python-format
msgid "%s (copy)"
msgstr "%s (副本)"
@ -1397,7 +1397,7 @@ msgid ""
msgstr "做任务的估计时间.通常由项目经理在任务草稿阶段设定"
#. module: project
#: code:addons/project/project.py:220
#: code:addons/project/project.py:230
#, python-format
msgid "Attachments"
msgstr "附件"
@ -1447,7 +1447,7 @@ msgstr "剩余的小时数"
#. module: project
#: model:mail.message.subtype,description:project.mt_task_stage
msgid "Stage changed"
msgstr ""
msgstr "任务阶段已改变"
#. module: project
#: constraint:project.task:0
@ -1524,7 +1524,7 @@ msgid "Overpassed Tasks"
msgstr "拖期任务"
#. module: project
#: code:addons/project/project.py:932
#: code:addons/project/project.py:944
#, python-format
msgid ""
"Child task still open.\n"
@ -1556,7 +1556,7 @@ msgstr "委派你的任务给其它用户"
#. module: project
#: model:mail.message.subtype,description:project.mt_task_started
msgid "Task started"
msgstr ""
msgstr "已开始的任务"
#. module: project
#: help:project.task.reevaluate,remaining_hours:0
@ -1585,7 +1585,7 @@ msgid "CHECK: "
msgstr "CHECK: "
#. module: project
#: code:addons/project/project.py:432
#: code:addons/project/project.py:444
#, python-format
msgid "You must assign members on the project '%s' !"
msgstr "您必须为项目“%s”指定成员"
@ -1811,7 +1811,7 @@ msgid "Starting Date"
msgstr "开始日期"
#. module: project
#: code:addons/project/project.py:398
#: code:addons/project/project.py:410
#: model:ir.actions.act_window,name:project.open_view_project_all
#: model:ir.ui.menu,name:project.menu_projects
#: view:project.project:0
@ -1972,7 +1972,7 @@ msgid "Reevaluation Task"
msgstr "任务重估"
#. module: project
#: code:addons/project/project.py:1318
#: code:addons/project/project.py:1332
#, python-format
msgid "Please delete the project linked with this account first."
msgstr "请删除与此科目关联的项目"