+ add zh-tw lang package.

* adjust en lang package code.
2010-07-19 03:58:33 +00:00
parent 93920b5c22
commit 8a844c80f8
57 changed files with 3446 additions and 380 deletions
--- a/trunk/config/config.php
+++ b/trunk/config/config.php
@@ -43,6 +43,7 @@ $config->themes      = 'default,blue';    // ֧

 /* ֧<>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD><D0B1><EFBFBD>*/
 $config->langs['zh-cn'] = 'Chinese Simplified';
+$config->langs['zh-tw'] = 'Chinese Traditional';

 /* Ĭ<>ϲ<EFBFBD><CFB2><EFBFBD><EFBFBD>趨<EFBFBD><E8B6A8>*/
 $config->default->view   = 'html';             // Ĭ<>ϵ<EFBFBD><CFB5><EFBFBD>ͼ<EFBFBD><CDBC>ʽ<EFBFBD><CABD>
--- a/trunk/module/action/lang/en.php
+++ b/trunk/module/action/lang/en.php
@@ -17,31 +17,83 @@
 *
 * @copyright   Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com)
 * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     bug
+ * @package     action
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
+$lang->action->common   = '系统日志';
+$lang->action->trash    = '回收站';
+$lang->action->undelete = '还原';
+
+$lang->action->objectType = '对象类型';
+$lang->action->objectID   = '对象ID';
+$lang->action->objectName = '对象名称';
+$lang->action->actor      = '操作者';
+$lang->action->date       = '日期';
+
+$lang->action->objectTypes['product']     = '产品';
+$lang->action->objectTypes['story']       = '需求';
+$lang->action->objectTypes['productplan'] = '产品计划';
+$lang->action->objectTypes['release']     = '发布';
+$lang->action->objectTypes['project']     = '项目';
+$lang->action->objectTypes['task']        = '任务';
+$lang->action->objectTypes['build']       = 'Build';
+$lang->action->objectTypes['bug']         = 'Bug';
+$lang->action->objectTypes['case']        = '用例';
+$lang->action->objectTypes['testtask']    = '测试任务';
+$lang->action->objectTypes['user']        = '用户';
+
+/* 用来描述操作历史记录。*/
 $lang->action->desc->common    = '$date, <strong>$action</strong> by <strong>$actor</strong>';
 $lang->action->desc->extra     = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>';
 $lang->action->desc->opened    = '$date, 由 <strong>$actor</strong> 创建。';
 $lang->action->desc->changed   = '$date, 由 <strong>$actor</strong> 变更。';
 $lang->action->desc->edited    = '$date, 由 <strong>$actor</strong> 编辑。';
 $lang->action->desc->closed    = '$date, 由 <strong>$actor</strong> 关闭。';
+$lang->action->desc->deleted   = '$date, 由 <strong>$actor</strong> 删除。';
+$lang->action->desc->erased    = '$date, 由 <strong>$actor</strong> 删除。';
+$lang->action->desc->undeleted = '$date, 由 <strong>$actor</strong> 还原。';
 $lang->action->desc->commented = '$date, 由 <strong>$actor</strong> 发表评论。';
 $lang->action->desc->activated = '$date, 由 <strong>$actor</strong> 激活。';
+$lang->action->desc->moved     = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"';
+$lang->action->desc->confirmed = '$date, 由 <strong>$actor</strong> 确认需求变动，最新版本为<strong>#$extra</strong>';
 $lang->action->desc->diff1     = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />';
 $lang->action->desc->diff2     = '修改了 <strong><i>%s</i></strong>，区别为：<blockquote>%s</blockquote>';

-$lang->action->label->opened    = '创建了';
-$lang->action->label->changed   = '变更了';
-$lang->action->label->edited    = '编辑了';
-$lang->action->label->closed    = '关闭了';
-$lang->action->label->commented = '评论了';
-$lang->action->label->activated = '激活了';
-$lang->action->label->resolved  = '解决了';
-$lang->action->label->reviewed  = '评审了';
-$lang->action->label->story     = '需求|story|view|storyID=%s';
-$lang->action->label->task      = '任务|task|view|taskID=%s';
-$lang->action->label->bug       = 'Bug|bug|view|bugID=%s';
-$lang->action->label->testcase  = '用例|testcase|view|caseID=%s';
+/* 用来显示动态信息。*/
+$lang->action->label->opened              = '创建了';
+$lang->action->label->changed             = '变更了';
+$lang->action->label->edited              = '编辑了';
+$lang->action->label->closed              = '关闭了';
+$lang->action->label->deleted             = '删除了';
+$lang->action->label->erased              = '删除了';
+$lang->action->label->undeleted           = '还原了';
+$lang->action->label->commented           = '评论了';
+$lang->action->label->activated           = '激活了';
+$lang->action->label->resolved            = '解决了';
+$lang->action->label->reviewed            = '评审了';
+$lang->action->label->moved               = '移动了';
+$lang->action->label->confirmed           = '确认了需求，';
+$lang->action->label->linked2plan         = '关联计划';
+$lang->action->label->unlinkedfromplan    = '移除计划';
+$lang->action->label->linked2project      = '关联项目';
+$lang->action->label->unlinkedfromproject = '移除项目';
+$lang->action->label->marked              = '编辑了';
+$lang->action->label->login               = '登录系统';
+$lang->action->label->logout              = "退出登录";
+
+/* 用来生成相应对象的链接。*/
+$lang->action->label->product     = '产品|product|view|productID=%s';
+$lang->action->label->productplan = '计划|productplan|view|productID=%s';
+$lang->action->label->release     = '发布|release|view|productID=%s';
+$lang->action->label->story       = '需求|story|view|storyID=%s';
+$lang->action->label->project     = '项目|project|view|projectID=%s';
+$lang->action->label->task        = '任务|task|view|taskID=%s';
+$lang->action->label->build       = 'Build|build|view|buildID=%s';
+$lang->action->label->bug         = 'Bug|bug|view|bugID=%s';
+$lang->action->label->case        = '用例|testcase|view|caseID=%s';
+$lang->action->label->testtask    = '测试任务|testtask|view|caseID=%s';
+$lang->action->label->todo        = 'todo|todo|view|todoID=%s';
+$lang->action->label->user        = '用户';
+
 $lang->action->label->space     = '　';
--- a/trunk/module/action/lang/zh-tw.php
+++ b/trunk/module/action/lang/zh-tw.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * The action module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     action
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->action->common   = '系統日誌';
+$lang->action->trash    = '資源回收筒';
+$lang->action->undelete = '還原';
+
+$lang->action->objectType = '對象類型';
+$lang->action->objectID   = '對象ID';
+$lang->action->objectName = '對象名稱';
+$lang->action->actor      = '操作者';
+$lang->action->date       = '日期';
+
+$lang->action->objectTypes['product']     = '產品';
+$lang->action->objectTypes['story']       = '需求';
+$lang->action->objectTypes['productplan'] = '產品計劃';
+$lang->action->objectTypes['release']     = '發佈';
+$lang->action->objectTypes['project']     = '項目';
+$lang->action->objectTypes['task']        = '任務';
+$lang->action->objectTypes['build']       = 'Build';
+$lang->action->objectTypes['bug']         = 'Bug';
+$lang->action->objectTypes['case']        = '用例';
+$lang->action->objectTypes['testtask']    = '測試任務';
+$lang->action->objectTypes['user']        = '用戶';
+
+/* 用來描述操作歷史記錄。*/
+$lang->action->desc->common    = '$date, <strong>$action</strong> by <strong>$actor</strong>';
+$lang->action->desc->extra     = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->opened    = '$date, 由 <strong>$actor</strong> 創建。';
+$lang->action->desc->changed   = '$date, 由 <strong>$actor</strong> 變更。';
+$lang->action->desc->edited    = '$date, 由 <strong>$actor</strong> 編輯。';
+$lang->action->desc->closed    = '$date, 由 <strong>$actor</strong> 關閉。';
+$lang->action->desc->deleted   = '$date, 由 <strong>$actor</strong> 刪除。';
+$lang->action->desc->erased    = '$date, 由 <strong>$actor</strong> 刪除。';
+$lang->action->desc->undeleted = '$date, 由 <strong>$actor</strong> 還原。';
+$lang->action->desc->commented = '$date, 由 <strong>$actor</strong> 發表評論。';
+$lang->action->desc->activated = '$date, 由 <strong>$actor</strong> 激活。';
+$lang->action->desc->moved     = '$date, 由 <strong>$actor</strong> 移動，之前為 "$extra"';
+$lang->action->desc->confirmed = '$date, 由 <strong>$actor</strong> 確認需求變動，最新版本為<strong>#$extra</strong>';
+$lang->action->desc->diff1     = '修改了 <strong><i>%s</i></strong>，舊值為 "%s"，新值為 "%s"。<br />';
+$lang->action->desc->diff2     = '修改了 <strong><i>%s</i></strong>，區別為：<blockquote>%s</blockquote>';
+
+/* 用來顯示動態信息。*/
+$lang->action->label->opened              = '創建了';
+$lang->action->label->changed             = '變更了';
+$lang->action->label->edited              = '編輯了';
+$lang->action->label->closed              = '關閉了';
+$lang->action->label->deleted             = '刪除了';
+$lang->action->label->erased              = '刪除了';
+$lang->action->label->undeleted           = '還原了';
+$lang->action->label->commented           = '評論了';
+$lang->action->label->activated           = '激活了';
+$lang->action->label->resolved            = '解決了';
+$lang->action->label->reviewed            = '評審了';
+$lang->action->label->moved               = '移動了';
+$lang->action->label->confirmed           = '確認了需求，';
+$lang->action->label->linked2plan         = '關聯計劃';
+$lang->action->label->unlinkedfromplan    = '移除計劃';
+$lang->action->label->linked2project      = '關聯項目';
+$lang->action->label->unlinkedfromproject = '移除項目';
+$lang->action->label->marked              = '編輯了';
+$lang->action->label->login               = '登錄系統';
+$lang->action->label->logout              = "退出登錄";
+
+/* 用來生成相應對象的連結。*/
+$lang->action->label->product     = '產品|product|view|productID=%s';
+$lang->action->label->productplan = '計劃|productplan|view|productID=%s';
+$lang->action->label->release     = '發佈|release|view|productID=%s';
+$lang->action->label->story       = '需求|story|view|storyID=%s';
+$lang->action->label->project     = '項目|project|view|projectID=%s';
+$lang->action->label->task        = '任務|task|view|taskID=%s';
+$lang->action->label->build       = 'Build|build|view|buildID=%s';
+$lang->action->label->bug         = 'Bug|bug|view|bugID=%s';
+$lang->action->label->case        = '用例|testcase|view|caseID=%s';
+$lang->action->label->testtask    = '測試任務|testtask|view|caseID=%s';
+$lang->action->label->todo        = 'todo|todo|view|todoID=%s';
+$lang->action->label->user        = '用戶';
+
+$lang->action->label->space     = '　';
--- a/trunk/module/admin/lang/en.php
+++ b/trunk/module/admin/lang/en.php
@@ -29,5 +29,3 @@ $lang->admin->group   = '分组管理';
 $lang->admin->welcome = '欢迎使用禅道管理软件后台管理系统';

 $lang->admin->browseCompany = '浏览公司';
-$lang->admin->browseUser    = '浏览用户';
-$lang->admin->browseGroup   = '浏览分组';
--- a/trunk/module/admin/lang/zh-tw.php
+++ b/trunk/module/admin/lang/zh-tw.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * The admin module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     admin
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->admin->common  = '後台管理';
+$lang->admin->index   = '後台管理首頁';
+$lang->admin->company = '公司管理';
+$lang->admin->user    = '用戶管理';
+$lang->admin->group   = '分組管理';
+$lang->admin->welcome = '歡迎使用禪道管理軟件後台管理系統';
+
+$lang->admin->browseCompany = '瀏覽公司';
--- a/trunk/module/api/lang/en.php
+++ b/trunk/module/api/lang/en.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * The api module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     api
+ * @version     $Id: english.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->api->common   = 'API接口';
+$lang->api->getModel = '超级model调用接口';
--- a/trunk/module/api/lang/zh-tw.php
+++ b/trunk/module/api/lang/zh-tw.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * The api module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     api
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->api->common   = 'API介面';
+$lang->api->getModel = '超級model調用介面';
--- a/trunk/module/bug/lang/en.php
+++ b/trunk/module/bug/lang/en.php
@@ -21,7 +21,52 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
+/* 字段列表。*/
 $lang->bug->common         = '缺陷管理';
+$lang->bug->id             = 'Bug编号';
+$lang->bug->product        = '所属产品';
+$lang->bug->module         = '所属模块';
+$lang->bug->path           = '模块路径';
+$lang->bug->project        = '所属项目';
+$lang->bug->story          = '相关需求';
+$lang->bug->storyVersion   = '需求版本';
+$lang->bug->task           = '相关任务';
+$lang->bug->title          = 'Bug标题';
+$lang->bug->severity       = '严重程度';
+$lang->bug->severityAB     = '级别';
+$lang->bug->pri            = '优先级';
+$lang->bug->type           = 'Bug类型';
+$lang->bug->os             = '操作系统';
+$lang->bug->browser        = '浏览器';
+$lang->bug->machine        = '机器硬件';
+$lang->bug->found          = '如何发现';
+$lang->bug->steps          = '重现步骤';
+$lang->bug->status         = 'Bug状态';
+$lang->bug->mailto         = '抄送给';
+$lang->bug->openedBy       = '由谁创建';
+$lang->bug->openedByAB     = '创建';
+$lang->bug->openedDate     = '创建日期';
+$lang->bug->openedBuild    = '影响版本';
+$lang->bug->assignedTo     = '指派给';
+$lang->bug->assignedDate   = '指派日期';
+$lang->bug->resolvedBy     = '解决者';
+$lang->bug->resolution     = '解决方案';
+$lang->bug->resolutionAB   = '方案';
+$lang->bug->resolvedBuild  = '解决版本';
+$lang->bug->resolvedDate   = '解决日期';
+$lang->bug->closedBy       = '由谁关闭';
+$lang->bug->closedDate     = '关闭日期';
+$lang->bug->duplicateBug   = '重复Bug';
+$lang->bug->lastEditedBy   = '最后修改者';
+$lang->bug->lastEditedDate = '最后修改日期';
+$lang->bug->linkBug        = '相关Bug';
+$lang->bug->case           = '相关用例';
+$lang->bug->files          = '附件';
+$lang->bug->keywords       = '关键词';
+$lang->bug->lastEditedByAB   = '修改者';
+$lang->bug->lastEditedDateAB = '修改日期';
+
+/* 方法列表。*/
 $lang->bug->index          = '首页';
 $lang->bug->create         = '创建Bug';
 $lang->bug->edit           = '编辑Bug';
@@ -30,8 +75,12 @@ $lang->bug->view           = 'Bug详情';
 $lang->bug->resolve        = '解决Bug';
 $lang->bug->close          = '关闭Bug';
 $lang->bug->activate       = '激活Bug';
-$lang->bug->ajaxGetUserBugs = '接口:我的Bug';
+$lang->bug->reportChart    = '报表统计';
+$lang->bug->delete         = '删除Bug';
+$lang->bug->ajaxGetUserBugs    = '接口:我的Bug';
+$lang->bug->confirmStoryChange = '确认需求变动';

+/* 查询条件列表。*/
 $lang->bug->selectProduct  = '请选择产品';
 $lang->bug->byModule       = '按模块';
 $lang->bug->assignToMe     = '指派给我';
@@ -43,7 +92,10 @@ $lang->bug->postponedBugs  = '被延期';
 $lang->bug->allBugs        = '所有Bug';
 $lang->bug->moduleBugs     = '按模块浏览';
 $lang->bug->byQuery        = '搜索';
+$lang->bug->needConfirm    = '需求有变动的Bug';
+$lang->bug->allProduct     = '所有产品';

+/* 页面标签。*/
 $lang->bug->lblProductAndModule         = '产品模块';
 $lang->bug->lblProjectAndTask           = '项目任务';
 $lang->bug->lblStory                    = '相关需求';
@@ -54,8 +106,7 @@ $lang->bug->lblMailto                   = '抄送给';
 $lang->bug->lblLastEdited               = '最后修改';
 $lang->bug->lblResolved                 = '由谁解决';

-$lang->bug->confirmChangeProduct = '修改产品会导致相应的项目、需求和任务发生变化，确定吗？';
-
+/* legend列表。*/
 $lang->bug->legendBasicInfo   = '基本信息';
 $lang->bug->legendMailto      = '抄送给';
 $lang->bug->legendAttatch     = '附件';
@@ -69,19 +120,38 @@ $lang->bug->legendComment     = '备注';
 $lang->bug->legendLife        = 'BUG的一生';
 $lang->bug->legendMisc        = '其相关他';

+/* 功能按钮。*/
+$lang->bug->buttonCopy     = '复制';
 $lang->bug->buttonEdit     = '编辑';
 $lang->bug->buttonActivate = '激活';
 $lang->bug->buttonResolve  = '解决';
 $lang->bug->buttonClose    = '关闭';
 $lang->bug->buttonToList   = '返回';

-$lang->bug->severityList[3] = 3;
-$lang->bug->severityList[1] = 1;
-$lang->bug->severityList[2] = 2;
-$lang->bug->severityList[4] = 4;
+/* 交互提示。*/
+$lang->bug->confirmChangeProduct = '修改产品会导致相应的项目、需求和任务发生变化，确定吗？';
+$lang->bug->confirmDelete        = '您确认要删除该Bug吗？';

-/* Define the OS list. */
+/* 模板。*/
+$lang->bug->tblStep        = "[步骤]\n";
+$lang->bug->tblResult      = "[结果]\n";
+$lang->bug->tblExpect      = "[期望]\n";
+
+/* 各个字段取值列表。*/
+$lang->bug->severityList[3] = '3';
+$lang->bug->severityList[1] = '1';
+$lang->bug->severityList[2] = '2';
+$lang->bug->severityList[4] = '4';
+
+$lang->bug->priList[0] = '';
+$lang->bug->priList[3] = '3';
+$lang->bug->priList[1] = '1';
+$lang->bug->priList[2] = '2';
+$lang->bug->priList[4] = '4';
+
+$lang->bug->osList['']        = '';
 $lang->bug->osList['all']     = '全部';
+$lang->bug->osList['windows'] = 'Windows';
 $lang->bug->osList['winxp']   = 'Windows XP';
 $lang->bug->osList['win7']    = 'Windows 7';
 $lang->bug->osList['vista']   = 'Windows Vista';
@@ -89,27 +159,39 @@ $lang->bug->osList['win2000'] = 'Windows 2000';
 $lang->bug->osList['winnt']   = 'Windows NT';
 $lang->bug->osList['win98']   = 'Windows 98';
 $lang->bug->osList['linux']   = 'Linux';
+$lang->bug->osList['freebsd'] = 'FreeBSD';
 $lang->bug->osList['unix']    = 'Unix';
 $lang->bug->osList['others']  = '其他';

-/* Define the OS list. */
+$lang->bug->browserList['']         = '';
 $lang->bug->browserList['all']      = '全部';
+$lang->bug->browserList['ie']       = 'IE系列';
 $lang->bug->browserList['ie6']      = 'IE6';
 $lang->bug->browserList['ie7']      = 'IE7';
 $lang->bug->browserList['ie8']      = 'IE8';
+$lang->bug->browserList['firefox']  = 'firefox系列';
 $lang->bug->browserList['firefox2'] = 'firefox2';
 $lang->bug->browserList['firefx3']  = 'firefox3';
+$lang->bug->browserList['opera']    = 'opera系列';
 $lang->bug->browserList['opera9']   = 'opera9';
 $lang->bug->browserList['oprea10']  = 'opera10';
 $lang->bug->browserList['safari']   = 'safari';
 $lang->bug->browserList['chrome']   = 'chrome';
 $lang->bug->browserList['other']    = '其他';

-/* Define the types. */
 $lang->bug->typeList['']             = '';
 $lang->bug->typeList['codeerror']    = '代码错误';
 $lang->bug->typeList['interface']    = '界面优化';
 $lang->bug->typeList['designchange'] = '设计变更';
+$lang->bug->typeList['newfeature']   = '新增需求';
+$lang->bug->typeList['designdefect'] = '设计缺陷';
+$lang->bug->typeList['config']       = '配置相关';
+$lang->bug->typeList['install']      = '安装部署';
+$lang->bug->typeList['security']     = '安全相关';
+$lang->bug->typeList['performance']  = '性能问题';
+$lang->bug->typeList['standard']     = '标准规范';
+$lang->bug->typeList['automation']   = '测试脚本';
+$lang->bug->typeList['trackthings']  = '事务跟踪';
 $lang->bug->typeList['Others']       = '其他';

 $lang->bug->statusList['']         = '';
@@ -126,44 +208,69 @@ $lang->bug->resolutionList['notrepro']   = '无法重现';
 $lang->bug->resolutionList['postponed']  = '延期处理';
 $lang->bug->resolutionList['willnotfix'] = "不予解决";

-$lang->bug->id             = 'Bug编号';
-$lang->bug->product        = '所属产品';
-$lang->bug->module         = '所属模块';
-$lang->bug->path           = '模块路径';
-$lang->bug->project        = '所属项目';
-$lang->bug->story          = '相关需求';
-$lang->bug->storyVersion   = '需求版本';
-$lang->bug->task           = '相关任务';
-$lang->bug->title          = 'Bug标题';
-$lang->bug->severity       = '严重程度';
-$lang->bug->type           = 'Bug类型';
-$lang->bug->os             = '操作系统';
-$lang->bug->browser        = '浏览器';
-$lang->bug->machine        = '机器硬件';
-$lang->bug->found          = '如何发现';
-$lang->bug->steps          = '重现步骤';
-$lang->bug->status         = 'Bug状态';
-$lang->bug->mailto         = '抄送给';
-$lang->bug->openedBy       = '由谁创建';
-$lang->bug->openedDate     = '创建日期';
-$lang->bug->openedBuild    = '影响版本';
-$lang->bug->assignedTo     = '指派给';
-$lang->bug->assignedDate   = '指派日期';
-$lang->bug->resolvedBy     = '解决者';
-$lang->bug->resolution     = '解决方案';
-$lang->bug->resolvedBuild  = '解决版本';
-$lang->bug->resolvedDate   = '解决日期';
-$lang->bug->closedBy       = '由谁关闭';
-$lang->bug->closedDate     = '关闭日期';
-$lang->bug->duplicateBug   = '重复Bug';
-$lang->bug->lastEditedBy   = '最后修改者';
-$lang->bug->lastEditedDate = '最后修改日期';
-$lang->bug->linkBug        = '相关Bug';
-$lang->bug->case           = '相关用例';
-$lang->bug->files          = '附件';
+/* 统计报表。*/
+$lang->bug->report->common        = '统计报表';
+$lang->bug->report->select        = '请选择报表类型';
+$lang->bug->report->create        = '生成报表';
+$lang->bug->report->selectAll     = '全选';
+$lang->bug->report->selectReverse = '反选';

-$lang->bug->tblStep        = "[步骤]\n";
-$lang->bug->tblResult      = "[结果]\n";
-$lang->bug->tblExpect      = "[期望]\n";
+$lang->bug->report->charts['bugsPerProject']     = '项目Bug数量';
+$lang->bug->report->charts['bugsPerModule']      = '模块Bug数量';
+$lang->bug->report->charts['openedBugsPerDay']   = '每天新增Bug数';
+$lang->bug->report->charts['resolvedBugsPerDay'] = '每天解决Bug数';
+$lang->bug->report->charts['closedBugsPerDay']   = '每天关闭的Bug数';
+$lang->bug->report->charts['openedBugsPerUser']  = '每人提交的Bug数';
+$lang->bug->report->charts['resolvedBugsPerUser']= '每人解决的Bug数';
+$lang->bug->report->charts['closedBugsPerUser']  = '每人关闭的Bug数';
+$lang->bug->report->charts['bugsPerSeverity']    = 'Bug严重程度统计';
+$lang->bug->report->charts['bugsPerResolution']  = 'Bug解决方案统计';
+$lang->bug->report->charts['bugsPerStatus']      = 'Bug状态统计';
+$lang->bug->report->charts['bugsPerType']        = 'Bug类型统计';
+//$lang->bug->report->charts['bugLiveDays']        = 'Bug处理时间统计';
+//$lang->bug->report->charts['bugHistories']       = 'Bug处理步骤统计';

+$lang->bug->report->options->swf                     = 'pie2d';
+$lang->bug->report->options->width                   = 'auto';
+$lang->bug->report->options->height                  = 300;
+$lang->bug->report->options->graph->baseFontSize     = 12;
+$lang->bug->report->options->graph->showNames        = 1;
+$lang->bug->report->options->graph->formatNumber     = 1;
+$lang->bug->report->options->graph->decimalPrecision = 0;
+$lang->bug->report->options->graph->animation        = 0;
+$lang->bug->report->options->graph->rotateNames      = 0;
+$lang->bug->report->options->graph->yAxisName        = 'COUNT';
+$lang->bug->report->options->graph->pieRadius        = 100; // 饼图直径。
+$lang->bug->report->options->graph->showColumnShadow = 0;   // 是否显示柱状图阴影。
+
+$lang->bug->report->bugsPerProject->graph->xAxisName     = '项目';
+$lang->bug->report->bugsPerModule->graph->xAxisName      = '模块';
+
+$lang->bug->report->openedBugsPerDay->swf                = 'column2d';
+$lang->bug->report->openedBugsPerDay->height             = 400;
+$lang->bug->report->openedBugsPerDay->graph->xAxisName   = '日期';
+$lang->bug->report->openedBugsPerDay->graph->rotateNames = 1;
+
+$lang->bug->report->resolvedBugsPerDay->swf              = 'column2d';
+$lang->bug->report->resolvedBugsPerDay->height           = 400;
+$lang->bug->report->resolvedBugsPerDay->graph->xAxisName = '日期';
+$lang->bug->report->resolvedBugsPerDay->graph->rotateNames = 1;
+
+$lang->bug->report->closedBugsPerDay->swf                = 'column2d';
+$lang->bug->report->closedBugsPerDay->height             = 400;
+$lang->bug->report->closedBugsPerDay->graph->xAxisName   = '日期';
+$lang->bug->report->closedBugsPerDay->graph->rotateNames = 1;
+
+$lang->bug->report->openedBugsPerUser->graph->xAxisName  = '用户';
+$lang->bug->report->resolvedBugsPerUser->graph->xAxisName= '用户';
+$lang->bug->report->closedBugsPerUser->graph->xAxisName  = '用户';
+
+$lang->bug->report->bugsPerSeverity->graph->xAxisName    = '严重程度';
+$lang->bug->report->bugsPerResolution->graph->xAxisName  = '解决方案';
+$lang->bug->report->bugsPerStatus->graph->xAxisName      = '状态';
+$lang->bug->report->bugsPerType->graph->xAxisName        = '类型';
+$lang->bug->report->bugLiveDays->graph->xAxisName        = '处理时间';
+$lang->bug->report->bugHistories->graph->xAxisName       = '处理步骤';
+
+/* 操作记录。*/
 $lang->bug->action->resolved = array('main' => '$date, 由 <strong>$actor</strong> 解决，方案为 <strong>$extra</strong>。', 'extra' => $lang->bug->resolutionList);
--- a/trunk/module/bug/lang/zh-tw.php
+++ b/trunk/module/bug/lang/zh-tw.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * The bug module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     bug
+ * @version     $Id: zh-tw.php 947 2010-07-14 10:09:33Z yuren_@126.com $
+ * @link        http://www.zentaoms.com
+ */
+/* 欄位列表。*/
+$lang->bug->common         = '缺陷管理';
+$lang->bug->id             = 'Bug編號';
+$lang->bug->product        = '所屬產品';
+$lang->bug->module         = '所屬模組';
+$lang->bug->path           = '模組路徑';
+$lang->bug->project        = '所屬項目';
+$lang->bug->story          = '相關需求';
+$lang->bug->storyVersion   = '需求版本';
+$lang->bug->task           = '相關任務';
+$lang->bug->title          = 'Bug標題';
+$lang->bug->severity       = '嚴重程度';
+$lang->bug->severityAB     = '級別';
+$lang->bug->pri            = '優先順序';
+$lang->bug->type           = 'Bug類型';
+$lang->bug->os             = '操作系統';
+$lang->bug->browser        = '瀏覽器';
+$lang->bug->machine        = '機器硬件';
+$lang->bug->found          = '如何發現';
+$lang->bug->steps          = '重現步驟';
+$lang->bug->status         = 'Bug狀態';
+$lang->bug->mailto         = '抄送給';
+$lang->bug->openedBy       = '由誰創建';
+$lang->bug->openedByAB     = '創建';
+$lang->bug->openedDate     = '創建日期';
+$lang->bug->openedBuild    = '影響版本';
+$lang->bug->assignedTo     = '指派給';
+$lang->bug->assignedDate   = '指派日期';
+$lang->bug->resolvedBy     = '解決者';
+$lang->bug->resolution     = '解決方案';
+$lang->bug->resolutionAB   = '方案';
+$lang->bug->resolvedBuild  = '解決版本';
+$lang->bug->resolvedDate   = '解決日期';
+$lang->bug->closedBy       = '由誰關閉';
+$lang->bug->closedDate     = '關閉日期';
+$lang->bug->duplicateBug   = '重複Bug';
+$lang->bug->lastEditedBy   = '最後修改者';
+$lang->bug->lastEditedDate = '最後修改日期';
+$lang->bug->linkBug        = '相關Bug';
+$lang->bug->case           = '相關用例';
+$lang->bug->files          = '附件';
+$lang->bug->keywords       = '關鍵詞';
+$lang->bug->lastEditedByAB   = '修改者';
+$lang->bug->lastEditedDateAB = '修改日期';
+
+/* 方法列表。*/
+$lang->bug->index          = '首頁';
+$lang->bug->create         = '創建Bug';
+$lang->bug->edit           = '編輯Bug';
+$lang->bug->browse         = 'Bug列表';
+$lang->bug->view           = 'Bug詳情';
+$lang->bug->resolve        = '解決Bug';
+$lang->bug->close          = '關閉Bug';
+$lang->bug->activate       = '激活Bug';
+$lang->bug->reportChart    = '報表統計';
+$lang->bug->delete         = '刪除Bug';
+$lang->bug->ajaxGetUserBugs    = '介面:我的Bug';
+$lang->bug->confirmStoryChange = '確認需求變動';
+
+/* 查詢條件列表。*/
+$lang->bug->selectProduct  = '請選擇產品';
+$lang->bug->byModule       = '按模組';
+$lang->bug->assignToMe     = '指派給我';
+$lang->bug->openedByMe     = '由我創建';
+$lang->bug->resolvedByMe   = '由我解決';
+$lang->bug->assignToNull   = '未指派';
+$lang->bug->longLifeBugs   = '久未處理';
+$lang->bug->postponedBugs  = '被延期';
+$lang->bug->allBugs        = '所有Bug';
+$lang->bug->moduleBugs     = '按模組瀏覽';
+$lang->bug->byQuery        = '搜索';
+$lang->bug->needConfirm    = '需求有變動的Bug';
+$lang->bug->allProduct     = '所有產品';
+
+/* 頁面標籤。*/
+$lang->bug->lblProductAndModule         = '產品模組';
+$lang->bug->lblProjectAndTask           = '項目任務';
+$lang->bug->lblStory                    = '相關需求';
+$lang->bug->lblTypeAndSeverity          = '類型/嚴重程度';
+$lang->bug->lblSystemBrowserAndHardware = '系統/瀏覽器';
+$lang->bug->lblAssignedTo               = '當前指派';
+$lang->bug->lblMailto                   = '抄送給';
+$lang->bug->lblLastEdited               = '最後修改';
+$lang->bug->lblResolved                 = '由誰解決';
+
+/* legend列表。*/
+$lang->bug->legendBasicInfo   = '基本信息';
+$lang->bug->legendMailto      = '抄送給';
+$lang->bug->legendAttatch     = '附件';
+$lang->bug->legendLinkBugs    = '相關Bug';
+$lang->bug->legendPrjStoryTask= '項目/需求/任務';
+$lang->bug->legendCases       = '相關用例';
+$lang->bug->legendSteps       = '重現步驟';
+$lang->bug->legendAction      = '操作';
+$lang->bug->legendHistory     = '歷史記錄';
+$lang->bug->legendComment     = '備註';
+$lang->bug->legendLife        = 'BUG的一生';
+$lang->bug->legendMisc        = '其相關他';
+
+/* 功能按鈕。*/
+$lang->bug->buttonCopy     = '複製';
+$lang->bug->buttonEdit     = '編輯';
+$lang->bug->buttonActivate = '激活';
+$lang->bug->buttonResolve  = '解決';
+$lang->bug->buttonClose    = '關閉';
+$lang->bug->buttonToList   = '返回';
+
+/* 交互提示。*/
+$lang->bug->confirmChangeProduct = '修改產品會導致相應的項目、需求和任務發生變化，確定嗎？';
+$lang->bug->confirmDelete        = '您確認要刪除該Bug嗎？';
+
+/* 模板。*/
+$lang->bug->tblStep        = "[步驟]\n";
+$lang->bug->tblResult      = "[結果]\n";
+$lang->bug->tblExpect      = "[期望]\n";
+
+/* 各個欄位取值列表。*/
+$lang->bug->severityList[3] = '3';
+$lang->bug->severityList[1] = '1';
+$lang->bug->severityList[2] = '2';
+$lang->bug->severityList[4] = '4';
+
+$lang->bug->priList[0] = '';
+$lang->bug->priList[3] = '3';
+$lang->bug->priList[1] = '1';
+$lang->bug->priList[2] = '2';
+$lang->bug->priList[4] = '4';
+
+$lang->bug->osList['']        = '';
+$lang->bug->osList['all']     = '全部';
+$lang->bug->osList['windows'] = 'Windows';
+$lang->bug->osList['winxp']   = 'Windows XP';
+$lang->bug->osList['win7']    = 'Windows 7';
+$lang->bug->osList['vista']   = 'Windows Vista';
+$lang->bug->osList['win2000'] = 'Windows 2000';
+$lang->bug->osList['winnt']   = 'Windows NT';
+$lang->bug->osList['win98']   = 'Windows 98';
+$lang->bug->osList['linux']   = 'Linux';
+$lang->bug->osList['freebsd'] = 'FreeBSD';
+$lang->bug->osList['unix']    = 'Unix';
+$lang->bug->osList['others']  = '其他';
+
+$lang->bug->browserList['']         = '';
+$lang->bug->browserList['all']      = '全部';
+$lang->bug->browserList['ie']       = 'IE系列';
+$lang->bug->browserList['ie6']      = 'IE6';
+$lang->bug->browserList['ie7']      = 'IE7';
+$lang->bug->browserList['ie8']      = 'IE8';
+$lang->bug->browserList['firefox']  = 'firefox系列';
+$lang->bug->browserList['firefox2'] = 'firefox2';
+$lang->bug->browserList['firefx3']  = 'firefox3';
+$lang->bug->browserList['opera']    = 'opera系列';
+$lang->bug->browserList['opera9']   = 'opera9';
+$lang->bug->browserList['oprea10']  = 'opera10';
+$lang->bug->browserList['safari']   = 'safari';
+$lang->bug->browserList['chrome']   = 'chrome';
+$lang->bug->browserList['other']    = '其他';
+
+$lang->bug->typeList['']             = '';
+$lang->bug->typeList['codeerror']    = '代碼錯誤';
+$lang->bug->typeList['interface']    = '界面優化';
+$lang->bug->typeList['designchange'] = '設計變更';
+$lang->bug->typeList['newfeature']   = '新增需求';
+$lang->bug->typeList['designdefect'] = '設計缺陷';
+$lang->bug->typeList['config']       = '配置相關';
+$lang->bug->typeList['install']      = '安裝部署';
+$lang->bug->typeList['security']     = '安全相關';
+$lang->bug->typeList['performance']  = '性能問題';
+$lang->bug->typeList['standard']     = '標準規範';
+$lang->bug->typeList['automation']   = '測試腳本';
+$lang->bug->typeList['trackthings']  = '事務跟蹤';
+$lang->bug->typeList['Others']       = '其他';
+
+$lang->bug->statusList['']         = '';
+$lang->bug->statusList['active']   = '激活';
+$lang->bug->statusList['resolved'] = '已解決';
+$lang->bug->statusList['closed']   = '已關閉';
+
+$lang->bug->resolutionList['']           = '';
+$lang->bug->resolutionList['bydesign']   = '設計如此';
+$lang->bug->resolutionList['duplicate']  = '重複Bug';
+$lang->bug->resolutionList['external']   = '外部原因';
+$lang->bug->resolutionList['fixed']      = '已解決';
+$lang->bug->resolutionList['notrepro']   = '無法重現';
+$lang->bug->resolutionList['postponed']  = '延期處理';
+$lang->bug->resolutionList['willnotfix'] = "不予解決";
+
+/* 統計報表。*/
+$lang->bug->report->common        = '統計報表';
+$lang->bug->report->select        = '請選擇報表類型';
+$lang->bug->report->create        = '生成報表';
+$lang->bug->report->selectAll     = '全選';
+$lang->bug->report->selectReverse = '反選';
+
+$lang->bug->report->charts['bugsPerProject']     = '項目Bug數量';
+$lang->bug->report->charts['bugsPerModule']      = '模組Bug數量';
+$lang->bug->report->charts['openedBugsPerDay']   = '每天新增Bug數';
+$lang->bug->report->charts['resolvedBugsPerDay'] = '每天解決Bug數';
+$lang->bug->report->charts['closedBugsPerDay']   = '每天關閉的Bug數';
+$lang->bug->report->charts['openedBugsPerUser']  = '每人提交的Bug數';
+$lang->bug->report->charts['resolvedBugsPerUser']= '每人解決的Bug數';
+$lang->bug->report->charts['closedBugsPerUser']  = '每人關閉的Bug數';
+$lang->bug->report->charts['bugsPerSeverity']    = 'Bug嚴重程度統計';
+$lang->bug->report->charts['bugsPerResolution']  = 'Bug解決方案統計';
+$lang->bug->report->charts['bugsPerStatus']      = 'Bug狀態統計';
+$lang->bug->report->charts['bugsPerType']        = 'Bug類型統計';
+//$lang->bug->report->charts['bugLiveDays']        = 'Bug處理時間統計';
+//$lang->bug->report->charts['bugHistories']       = 'Bug處理步驟統計';
+
+$lang->bug->report->options->swf                     = 'pie2d';
+$lang->bug->report->options->width                   = 'auto';
+$lang->bug->report->options->height                  = 300;
+$lang->bug->report->options->graph->baseFontSize     = 12;
+$lang->bug->report->options->graph->showNames        = 1;
+$lang->bug->report->options->graph->formatNumber     = 1;
+$lang->bug->report->options->graph->decimalPrecision = 0;
+$lang->bug->report->options->graph->animation        = 0;
+$lang->bug->report->options->graph->rotateNames      = 0;
+$lang->bug->report->options->graph->yAxisName        = 'COUNT';
+$lang->bug->report->options->graph->pieRadius        = 100; // 餅圖直徑。
+$lang->bug->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
+
+$lang->bug->report->bugsPerProject->graph->xAxisName     = '項目';
+$lang->bug->report->bugsPerModule->graph->xAxisName      = '模組';
+
+$lang->bug->report->openedBugsPerDay->swf                = 'column2d';
+$lang->bug->report->openedBugsPerDay->height             = 400;
+$lang->bug->report->openedBugsPerDay->graph->xAxisName   = '日期';
+$lang->bug->report->openedBugsPerDay->graph->rotateNames = 1;
+
+$lang->bug->report->resolvedBugsPerDay->swf              = 'column2d';
+$lang->bug->report->resolvedBugsPerDay->height           = 400;
+$lang->bug->report->resolvedBugsPerDay->graph->xAxisName = '日期';
+$lang->bug->report->resolvedBugsPerDay->graph->rotateNames = 1;
+
+$lang->bug->report->closedBugsPerDay->swf                = 'column2d';
+$lang->bug->report->closedBugsPerDay->height             = 400;
+$lang->bug->report->closedBugsPerDay->graph->xAxisName   = '日期';
+$lang->bug->report->closedBugsPerDay->graph->rotateNames = 1;
+
+$lang->bug->report->openedBugsPerUser->graph->xAxisName  = '用戶';
+$lang->bug->report->resolvedBugsPerUser->graph->xAxisName= '用戶';
+$lang->bug->report->closedBugsPerUser->graph->xAxisName  = '用戶';
+
+$lang->bug->report->bugsPerSeverity->graph->xAxisName    = '嚴重程度';
+$lang->bug->report->bugsPerResolution->graph->xAxisName  = '解決方案';
+$lang->bug->report->bugsPerStatus->graph->xAxisName      = '狀態';
+$lang->bug->report->bugsPerType->graph->xAxisName        = '類型';
+$lang->bug->report->bugLiveDays->graph->xAxisName        = '處理時間';
+$lang->bug->report->bugHistories->graph->xAxisName       = '處理步驟';
+
+/* 操作記錄。*/
+$lang->bug->action->resolved = array('main' => '$date, 由 <strong>$actor</strong> 解決，方案為 <strong>$extra</strong>。', 'extra' => $lang->bug->resolutionList);
--- a/trunk/module/build/lang/zh-tw.php
+++ b/trunk/module/build/lang/zh-tw.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * The build module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     build
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->build->common    = 'Build';
+$lang->build->create    = "創建Build";
+$lang->build->edit      = "編輯Build";
+$lang->build->delete    = "刪除Build";
+$lang->build->view      = "Build詳情";
+$lang->build->ajaxGetProductBuilds = '介面:產品Build列表';
+$lang->build->ajaxGetProjectBuilds = '介面:項目Build列表';
+
+$lang->build->confirmDelete = "您確認刪除該build嗎？";
+
+$lang->build->id        = 'ID';
+$lang->build->product   = '產品';
+$lang->build->project   = '項目';
+$lang->build->name      = '名稱編號';
+$lang->build->date      = 'Build日期';
+$lang->build->builder   = '構建者';
+$lang->build->scmPath   = '原始碼地址';
+$lang->build->filePath  = '存儲地址';
+$lang->build->desc      = '描述';
--- a/trunk/module/common/lang/en.php
+++ b/trunk/module/common/lang/en.php
@@ -23,35 +23,61 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
-$lang->zentaoMS   = '禅道管理';
-$lang->logout     = '退出系统';
-$lang->login      = '登录';
-$lang->currentPos = '当前位置：';
-$lang->arrow      = ' » ';
-$lang->colon      = '::';
-$lang->reset      = '重填';
-$lang->edit       = '编辑';
-$lang->delete     = '删除';
-$lang->close      = '关闭';
-$lang->activate   = '激活';
-$lang->delete     = '删除';
-$lang->save       = '保存';
-$lang->actions    = '操作';
-$lang->comment    = '备注';
-$lang->history    = '历史记录';
-$lang->welcome    = "欢迎使用%s{$lang->colon}{$lang->zentaoMS}";
-$lang->zentaoSite = "官方网站";
-$lang->myControl  = "我的地盘";
-$lang->sponser    = "<a href='http://www.pujia.com' target='_blank'>普加赞助</a>";
-$lang->at         = ' 于 ';
-$lang->feature    = '未来';
-$lang->year       = '年';
-$lang->downArrow  = '↓';
-$lang->goback     = '返回';
-$lang->selectAll  = '全选';
-$lang->attatch    = '附件';
-$lang->reverse    = '（切换顺序）';
-$lang->addFiles   = '上传了附件 ';
+$lang->arrow        = ' » ';
+$lang->colon        = '::';
+$lang->at           = ' 于 ';
+$lang->downArrow    = '↓';
+
+$lang->zentaoMS     = '禅道管理';
+$lang->welcome      = "欢迎使用『%s』{$lang->colon} {$lang->zentaoMS}";
+$lang->myControl    = "我的地盘";
+$lang->currentPos   = '当前位置：';
+$lang->logout       = '退出系统';
+$lang->login        = '登录';
+$lang->aboutZenTao  = '关于禅道';
+$lang->todayIs      = '今天是%s，';
+
+$lang->reset        = '重填';
+$lang->edit         = '编辑';
+$lang->copy         = '复制';
+$lang->delete       = '删除';
+$lang->close        = '关闭';
+$lang->link         = '关联';
+$lang->unlink       = '移除';
+$lang->import       = '导入';
+$lang->exportCSV    = '导出csv';
+$lang->setFileName  = '请输入文件名：';
+$lang->activate     = '激活';
+$lang->save         = '保存';
+$lang->confirm      = '确认';
+$lang->preview      = '预览';
+$lang->goback       = '返回';
+$lang->showHelp     = '显示帮助';
+$lang->go           = 'GO!';
+
+$lang->actions      = '操作';
+$lang->comment      = '备注';
+$lang->history      = '历史记录';
+$lang->attatch      = '附件';
+$lang->reverse      = '（切换顺序）';
+$lang->addFiles     = '上传了附件 ';
+$lang->files        = '附件 ';
+
+$lang->selectAll    = '全选';
+$lang->notFound     = '抱歉，您访问的对象并不存在！';
+$lang->showAll      = '++ 全部显示 ++';
+$lang->hideClosed   = '-- 隐藏已结束 --';
+
+$lang->feature      = '未来';
+$lang->year         = '年';
+$lang->workingHour  = '工时';
+
+$lang->idAB         = 'ID';
+$lang->priAB        = 'P';
+$lang->statusAB     = '状态';
+$lang->openedByAB   = '创建';
+$lang->assignedToAB = '指派';
+$lang->typeAB       = '类型';

 /* 主导航菜单。*/
 $lang->menu->index   = '首页|index|index';
@@ -62,6 +88,20 @@ $lang->menu->qa      = 'QA视图|qa|index';
 $lang->menu->company = '组织视图|company|index';
 $lang->menu->admin   = '后台管理|admin|index';

+/* 查询条中可以选择的对象列表。*/
+$lang->searchObjects['bug']         = 'B:Bug';
+$lang->searchObjects['story']       = 'S:需求';
+$lang->searchObjects['task']        = 'T:任务';
+$lang->searchObjects['testcase']    = 'C:用例';
+$lang->searchObjects['project']     = 'P:项目';
+$lang->searchObjects['product']     = 'P:产品';
+$lang->searchObjects['user']        = 'U:用户';
+$lang->searchObjects['build']       = 'B:Build';
+$lang->searchObjects['release']     = 'R:发布';
+$lang->searchObjects['productplan'] = 'P:产品计划';
+$lang->searchObjects['testtask']    = 'T:测试任务';
+$lang->searchTips                   = '输入编号';
+
 /* 首页菜单设置。*/
 $lang->index->menu->product = '浏览产品|product|browse';
 $lang->index->menu->project = '浏览项目|project|browse';
@@ -70,9 +110,9 @@ $lang->index->menu->project = '浏览项目|project|browse';
 $lang->my->menu->account  = '%s' . $lang->arrow;
 $lang->my->menu->todo     = array('link' => '我的TODO|my|todo|', 'subModule' => 'todo');
 $lang->my->menu->task     = '我的任务|my|task|';
-$lang->my->menu->project  = '我的项目|my|project|';
-$lang->my->menu->story    = '我的需求|my|story|';
 $lang->my->menu->bug      = '我的Bug|my|bug|';
+$lang->my->menu->story    = '我的需求|my|story|';
+$lang->my->menu->project  = '我的项目|my|project|';
 $lang->my->menu->profile  = array('link' => '我的档案|my|profile|', 'alias' => 'editprofile');
 $lang->todo->menu         = $lang->my->menu;

@@ -82,27 +122,28 @@ $lang->product->menu->story  = array('link' => '需求列表|product|browse|prod
 $lang->product->menu->plan   = array('link' => '计划列表|productplan|browse|productID=%s', 'subModule' => 'productplan');
 $lang->product->menu->release= array('link' => '发布列表|release|browse|productID=%s',     'subModule' => 'release');
 $lang->product->menu->roadmap= '路线图|product|roadmap|productID=%s';
+$lang->product->menu->view   = '基本信息|product|view|productID=%s';
 $lang->product->menu->edit   = '编辑产品|product|edit|productID=%s';
-$lang->product->menu->delete = array('link' => '删除产品|product|delete|productID=%s', 'target' => 'hiddenwin');
 $lang->product->menu->module = '维护模块|tree|browse|productID=%s&view=product';
+$lang->product->menu->delete = array('link' => '删除产品|product|delete|productID=%s', 'target' => 'hiddenwin');
 $lang->product->menu->create = array('link' => '新增产品|product|create', 'float' => 'right');
 $lang->story->menu           = $lang->product->menu;
 $lang->productplan->menu     = $lang->product->menu;
 $lang->release->menu         = $lang->product->menu;

 /* 项目视图菜单设置。*/
-$lang->project->menu->list   = '%s';
-$lang->project->menu->task   = array('link' => '任务列表|project|task|projectID=%s', 'subModule' => 'task');
-$lang->project->menu->story  = array('link' => '需求列表|project|story|projectID=%s', 'alias' => 'linkstory');
-$lang->project->menu->bug    = 'Bug列表|project|bug|projectID=%s';
-$lang->project->menu->build  = array('link' => 'Build列表|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->menu->burn   = '燃烧图|project|burn|projectID=%s';
-$lang->project->menu->team   = array('link' => '团队成员|project|team|projectID=%s', 'alias' => 'managemembers');
-$lang->project->menu->line   = $lang->colon;
-$lang->project->menu->view   = '基本信息|project|view|projectID=%s';
-$lang->project->menu->edit   = '编辑项目|project|edit|projectID=%s';
-$lang->project->menu->delete = array('link' => '删除项目|project|delete|projectID=%s', 'target' => 'hiddenwin');
-$lang->project->menu->product= '关联产品|project|manageproducts|projectID=%s';
+$lang->project->menu->list      = '%s';
+$lang->project->menu->task      = array('link' => '任务列表|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask');
+$lang->project->menu->story     = array('link' => '需求列表|project|story|projectID=%s');
+$lang->project->menu->bug       = 'Bug列表|project|bug|projectID=%s';
+$lang->project->menu->build     = array('link' => 'Build列表|project|build|projectID=%s', 'subModule' => 'build');
+$lang->project->menu->burn      = '燃尽图|project|burn|projectID=%s';
+$lang->project->menu->team      = array('link' => '团队成员|project|team|projectID=%s', 'alias' => 'managemembers');
+$lang->project->menu->product   = '关联产品|project|manageproducts|projectID=%s';
+$lang->project->menu->linkstory = array('link' => '关联需求|project|linkstory|projectID=%s');
+$lang->project->menu->view      = '基本信息|project|view|projectID=%s';
+$lang->project->menu->edit      = '编辑项目|project|edit|projectID=%s';
+$lang->project->menu->delete    = array('link' => '删除项目|project|delete|projectID=%s', 'target' => 'hiddenwin');

 $lang->project->menu->create = array('link' => '新增项目|project|create', 'float' => 'right');
 $lang->task->menu            = $lang->project->menu;
@@ -110,26 +151,28 @@ $lang->build->menu           = $lang->project->menu;

 /* QA视图菜单设置。*/
 $lang->bug->menu->product  = '%s';
-$lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active', 'subModule' => 'tree');
+$lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,activate,report', 'subModule' => 'tree');
 $lang->bug->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
 $lang->bug->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s');

 $lang->testcase->menu->product  = '%s';
-$lang->testcase->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active');
+$lang->testcase->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s');
 $lang->testcase->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
 $lang->testcase->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s');

 $lang->testtask->menu->product  = '%s';
-$lang->testtask->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active');
-$lang->testtask->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
-$lang->testtask->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
+$lang->testtask->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s');
+$lang->testtask->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s');
+$lang->testtask->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases');

 /* 组织结构视图菜单设置。*/
+$lang->company->menu->name        = '%s' . $lang->arrow;
 $lang->company->menu->browseUser  = array('link' => '用户列表|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => '部门维护|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => '权限分组|group|browse', 'subModule' => 'group');
+$lang->company->menu->edit        = array('link' => '公司管理|company|edit');
 $lang->company->menu->addGroup    = array('link' => '添加分组|group|create', 'float' => 'right');
-$lang->company->menu->addUser     = array('link' => '添加用户|user|create|company=%s&dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
+$lang->company->menu->addUser     = array('link' => '添加用户|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
 $lang->dept->menu            = $lang->company->menu;
 $lang->group->menu           = $lang->company->menu;

@@ -137,17 +180,17 @@ $lang->group->menu           = $lang->company->menu;
 $lang->user->menu->account  = '%s' . $lang->arrow;
 $lang->user->menu->todo     = array('link' => 'TODO列表|user|todo|account=%s', 'subModule' => 'todo');
 $lang->user->menu->task     = '任务列表|user|task|account=%s';
-$lang->user->menu->project  = '项目列表|user|project|account=%s';
 $lang->user->menu->bug      = 'Bug列表|user|bug|account=%s';
+$lang->user->menu->project  = '项目列表|user|project|account=%s';
 $lang->user->menu->profile  = array('link' => '用户信息|user|profile|account=%s', 'alias' => 'edit');
 $lang->user->menu->browse   = array('link' => '用户管理|company|browse|', 'float' => 'right');

 /* 后台管理菜单设置。*/
-$lang->admin->menu->browseCompany = array('link' => '公司管理|admin|browsecompany', 'subModule' => 'company');
-$lang->admin->menu->convert       = array('link' => '从其他系统导入|convert|index', 'subModule' => 'convert');
-$lang->admin->menu->createCompany = array('link' => '新增公司|company|create', 'float' => 'right');
-$lang->convert->menu              = $lang->admin->menu;
-$lang->upgrade->menu              = $lang->admin->menu;
+$lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action');
+$lang->admin->menu->convert = array('link' => '从其他系统导入|convert|index', 'subModule' => 'convert');
+$lang->convert->menu        = $lang->admin->menu;
+$lang->upgrade->menu        = $lang->admin->menu;
+$lang->action->menu         = $lang->admin->menu;

 /*菜单设置：分组设置。*/
 $lang->menugroup->release     = 'product';
@@ -155,7 +198,6 @@ $lang->menugroup->story       = 'product';
 $lang->menugroup->productplan = 'product';
 $lang->menugroup->task        = 'project';
 $lang->menugroup->build       = 'project';
-$lang->menugroup->company     = 'admin';
 $lang->menugroup->convert     = 'admin';
 $lang->menugroup->upgrade     = 'admin';
 $lang->menugroup->user        = 'company';
@@ -166,6 +208,7 @@ $lang->menugroup->testtask    = 'qa';
 $lang->menugroup->people      = 'company';
 $lang->menugroup->dept        = 'company';
 $lang->menugroup->todo        = 'my';
+$lang->menugroup->action      = 'admin';

 /* 错误提示信息。*/
 $lang->error->companyNotFound = "您访问的域名 %s 没有对应的公司。";
@@ -173,13 +216,14 @@ $lang->error->length          = array("『%s』长度错误，应当为『%s』"
 $lang->error->reg             = "『%s』不符合格式，应当为:『%s』。";
 $lang->error->unique          = "『%s』已经有『%s』这条记录了。";
 $lang->error->notempty        = "『%s』不能为空。";
+$lang->error->equal           = "『%s』必须为『%s』。";
 $lang->error->int             = array("『%s』应当是数字。", "『%s』应当介于『%s-%s』之间。");
 $lang->error->float           = "『%s』应当是数字，可以是小数。";
 $lang->error->email           = "『%s』应当为合法的EMAIL。";
 $lang->error->date            = "『%s』应当为合法的日期。";
 $lang->error->account         = "『%s』应当为合法的用户名。";
 $lang->error->passwordsame    = "两次密码应当相等。";
-$lang->error->passwordrule    = "密码应该符合规则。";
+$lang->error->passwordrule    = "密码应该符合规则，长度至少为六位。";

 /* 分页信息。*/
 $lang->pager->noRecord  = "暂时没有记录";
@@ -189,3 +233,21 @@ $lang->pager->pre       = "上页";
 $lang->pager->next      = "下页";
 $lang->pager->last      = "末页";
 $lang->pager->locate    = "GO!";
+
+$lang->zentaoSite     = "官方网站";
+$lang->sponser        = "<a href='http://www.pujia.com' target='_blank'>普加赞助</a>";
+$lang->zentaoKeywords = "开源项目管理软件,项目管理,项目管理软件,pmp,pms,php框架，国产php框架，scrum工具,scrum管理工具,scrum管理软件,敏捷项目管理,禅道";
+$lang->zentaoDESC     = "禅道项目管理软件(ZenTaoPMS)是一款国产的，基于LGPL协议，开源免费的项目管理软件(工具、系统)，同时也是一款scrum管理工具。
+    它集产品管理、项目管理、测试管理于一体，同时还包含了事务管理、组织管理等诸多功能，是中小型企业项目管理的首选。禅道项目管理软件使用PHP + MySQL开发，
+基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。禅道在手，项目无忧！"; 
+
+/* 时间格式设置。*/
+define('DT_DATETIME1',  'Y-m-d H:i:s');
+define('DT_DATETIME2',  'y-m-d H:i');
+define('DT_MONTHTIME1', 'n/d H:i');
+define('DT_MONTHTIME2', 'n月d日 H:i');
+define('DT_DATE1',     'Y-m-d');
+define('DT_DATE2',     'Ymd');
+define('DT_DATE3',     'Y年m月d日');
+define('DT_TIME1',     'H:i:s');
+define('DT_TIME2',     'H:i');
--- a/trunk/module/common/lang/zh-tw.php
+++ b/trunk/module/common/lang/zh-tw.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * The common simplified chinese file of ZenTaoMS.
+ *
+ * This file should be UTF-8 encoded.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     ZenTaoMS
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->arrow        = ' » ';
+$lang->colon        = '::';
+$lang->at           = ' 于 ';
+$lang->downArrow    = '↓';
+
+$lang->zentaoMS     = '禪道管理';
+$lang->welcome      = "歡迎使用『%s』{$lang->colon} {$lang->zentaoMS}";
+$lang->myControl    = "我的地盤";
+$lang->currentPos   = '當前位置：';
+$lang->logout       = '退出系統';
+$lang->login        = '登錄';
+$lang->aboutZenTao  = '關於禪道';
+$lang->todayIs      = '今天是%s，';
+
+$lang->reset        = '重填';
+$lang->edit         = '編輯';
+$lang->copy         = '複製';
+$lang->delete       = '刪除';
+$lang->close        = '關閉';
+$lang->link         = '關聯';
+$lang->unlink       = '移除';
+$lang->import       = '導入';
+$lang->exportCSV    = '導出csv';
+$lang->setFileName  = '請輸入檔案名：';
+$lang->activate     = '激活';
+$lang->save         = '保存';
+$lang->confirm      = '確認';
+$lang->preview      = '預覽';
+$lang->goback       = '返回';
+$lang->showHelp     = '顯示幫助';
+$lang->go           = 'GO!';
+
+$lang->actions      = '操作';
+$lang->comment      = '備註';
+$lang->history      = '歷史記錄';
+$lang->attatch      = '附件';
+$lang->reverse      = '（切換順序）';
+$lang->addFiles     = '上傳了附件 ';
+$lang->files        = '附件 ';
+
+$lang->selectAll    = '全選';
+$lang->notFound     = '抱歉，您訪問的對象並不存在！';
+$lang->showAll      = '++ 全部顯示 ++';
+$lang->hideClosed   = '-- 隱藏已結束 --';
+
+$lang->feature      = '未來';
+$lang->year         = '年';
+$lang->workingHour  = '工時';
+
+$lang->idAB         = 'ID';
+$lang->priAB        = 'P';
+$lang->statusAB     = '狀態';
+$lang->openedByAB   = '創建';
+$lang->assignedToAB = '指派';
+$lang->typeAB       = '類型';
+
+/* 主導航菜單。*/
+$lang->menu->index   = '首頁|index|index';
+$lang->menu->my      = '我的地盤|my|index';
+$lang->menu->product = '產品視圖|product|index';
+$lang->menu->project = '項目視圖|project|index';
+$lang->menu->qa      = 'QA視圖|qa|index';
+$lang->menu->company = '組織視圖|company|index';
+$lang->menu->admin   = '後台管理|admin|index';
+
+/* 查詢條中可以選擇的對象列表。*/
+$lang->searchObjects['bug']         = 'B:Bug';
+$lang->searchObjects['story']       = 'S:需求';
+$lang->searchObjects['task']        = 'T:任務';
+$lang->searchObjects['testcase']    = 'C:用例';
+$lang->searchObjects['project']     = 'P:項目';
+$lang->searchObjects['product']     = 'P:產品';
+$lang->searchObjects['user']        = 'U:用戶';
+$lang->searchObjects['build']       = 'B:Build';
+$lang->searchObjects['release']     = 'R:發佈';
+$lang->searchObjects['productplan'] = 'P:產品計劃';
+$lang->searchObjects['testtask']    = 'T:測試任務';
+$lang->searchTips                   = '輸入編號';
+
+/* 首頁菜單設置。*/
+$lang->index->menu->product = '瀏覽產品|product|browse';
+$lang->index->menu->project = '瀏覽項目|project|browse';
+
+/* 我的地盤菜單設置。*/
+$lang->my->menu->account  = '%s' . $lang->arrow;
+$lang->my->menu->todo     = array('link' => '我的TODO|my|todo|', 'subModule' => 'todo');
+$lang->my->menu->task     = '我的任務|my|task|';
+$lang->my->menu->bug      = '我的Bug|my|bug|';
+$lang->my->menu->story    = '我的需求|my|story|';
+$lang->my->menu->project  = '我的項目|my|project|';
+$lang->my->menu->profile  = array('link' => '我的檔案|my|profile|', 'alias' => 'editprofile');
+$lang->todo->menu         = $lang->my->menu;
+
+/* 產品視圖設置。*/
+$lang->product->menu->list   = '%s';
+$lang->product->menu->story  = array('link' => '需求列表|product|browse|productID=%s',     'subModule' => 'story');
+$lang->product->menu->plan   = array('link' => '計劃列表|productplan|browse|productID=%s', 'subModule' => 'productplan');
+$lang->product->menu->release= array('link' => '發佈列表|release|browse|productID=%s',     'subModule' => 'release');
+$lang->product->menu->roadmap= '路線圖|product|roadmap|productID=%s';
+$lang->product->menu->view   = '基本信息|product|view|productID=%s';
+$lang->product->menu->edit   = '編輯產品|product|edit|productID=%s';
+$lang->product->menu->module = '維護模組|tree|browse|productID=%s&view=product';
+$lang->product->menu->delete = array('link' => '刪除產品|product|delete|productID=%s', 'target' => 'hiddenwin');
+$lang->product->menu->create = array('link' => '新增產品|product|create', 'float' => 'right');
+$lang->story->menu           = $lang->product->menu;
+$lang->productplan->menu     = $lang->product->menu;
+$lang->release->menu         = $lang->product->menu;
+
+/* 項目視圖菜單設置。*/
+$lang->project->menu->list      = '%s';
+$lang->project->menu->task      = array('link' => '任務列表|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask');
+$lang->project->menu->story     = array('link' => '需求列表|project|story|projectID=%s');
+$lang->project->menu->bug       = 'Bug列表|project|bug|projectID=%s';
+$lang->project->menu->build     = array('link' => 'Build列表|project|build|projectID=%s', 'subModule' => 'build');
+$lang->project->menu->burn      = '燃盡圖|project|burn|projectID=%s';
+$lang->project->menu->team      = array('link' => '團隊成員|project|team|projectID=%s', 'alias' => 'managemembers');
+$lang->project->menu->product   = '關聯產品|project|manageproducts|projectID=%s';
+$lang->project->menu->linkstory = array('link' => '關聯需求|project|linkstory|projectID=%s');
+$lang->project->menu->view      = '基本信息|project|view|projectID=%s';
+$lang->project->menu->edit      = '編輯項目|project|edit|projectID=%s';
+$lang->project->menu->delete    = array('link' => '刪除項目|project|delete|projectID=%s', 'target' => 'hiddenwin');
+
+$lang->project->menu->create = array('link' => '新增項目|project|create', 'float' => 'right');
+$lang->task->menu            = $lang->project->menu;
+$lang->build->menu           = $lang->project->menu;
+
+/* QA視圖菜單設置。*/
+$lang->bug->menu->product  = '%s';
+$lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,activate,report', 'subModule' => 'tree');
+$lang->bug->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
+$lang->bug->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s');
+
+$lang->testcase->menu->product  = '%s';
+$lang->testcase->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s');
+$lang->testcase->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
+$lang->testcase->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s');
+
+$lang->testtask->menu->product  = '%s';
+$lang->testtask->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s');
+$lang->testtask->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s');
+$lang->testtask->menu->testtask = array('link' => '測試任務|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases');
+
+/* 組織結構視圖菜單設置。*/
+$lang->company->menu->name        = '%s' . $lang->arrow;
+$lang->company->menu->browseUser  = array('link' => '用戶列表|company|browse', 'subModule' => 'user');
+$lang->company->menu->dept        = array('link' => '部門維護|dept|browse', 'subModule' => 'dept');
+$lang->company->menu->browseGroup = array('link' => '權限分組|group|browse', 'subModule' => 'group');
+$lang->company->menu->edit        = array('link' => '公司管理|company|edit');
+$lang->company->menu->addGroup    = array('link' => '添加分組|group|create', 'float' => 'right');
+$lang->company->menu->addUser     = array('link' => '添加用戶|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
+$lang->dept->menu            = $lang->company->menu;
+$lang->group->menu           = $lang->company->menu;
+
+/* 用戶信息菜單設置。*/
+$lang->user->menu->account  = '%s' . $lang->arrow;
+$lang->user->menu->todo     = array('link' => 'TODO列表|user|todo|account=%s', 'subModule' => 'todo');
+$lang->user->menu->task     = '任務列表|user|task|account=%s';
+$lang->user->menu->bug      = 'Bug列表|user|bug|account=%s';
+$lang->user->menu->project  = '項目列表|user|project|account=%s';
+$lang->user->menu->profile  = array('link' => '用戶信息|user|profile|account=%s', 'alias' => 'edit');
+$lang->user->menu->browse   = array('link' => '用戶管理|company|browse|', 'float' => 'right');
+
+/* 後台管理菜單設置。*/
+$lang->admin->menu->trashes = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
+$lang->admin->menu->convert = array('link' => '從其他系統導入|convert|index', 'subModule' => 'convert');
+$lang->convert->menu        = $lang->admin->menu;
+$lang->upgrade->menu        = $lang->admin->menu;
+$lang->action->menu         = $lang->admin->menu;
+
+/*菜單設置：分組設置。*/
+$lang->menugroup->release     = 'product';
+$lang->menugroup->story       = 'product';
+$lang->menugroup->productplan = 'product';
+$lang->menugroup->task        = 'project';
+$lang->menugroup->build       = 'project';
+$lang->menugroup->convert     = 'admin';
+$lang->menugroup->upgrade     = 'admin';
+$lang->menugroup->user        = 'company';
+$lang->menugroup->group       = 'company';
+$lang->menugroup->bug         = 'qa';
+$lang->menugroup->testcase    = 'qa';
+$lang->menugroup->testtask    = 'qa';
+$lang->menugroup->people      = 'company';
+$lang->menugroup->dept        = 'company';
+$lang->menugroup->todo        = 'my';
+$lang->menugroup->action      = 'admin';
+
+/* 錯誤提示信息。*/
+$lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。";
+$lang->error->length          = array("『%s』長度錯誤，應當為『%s』", "『%s』長度應當不超過『%s』，且不小於『%s』。");
+$lang->error->reg             = "『%s』不符合格式，應當為:『%s』。";
+$lang->error->unique          = "『%s』已經有『%s』這條記錄了。";
+$lang->error->notempty        = "『%s』不能為空。";
+$lang->error->equal           = "『%s』必須為『%s』。";
+$lang->error->int             = array("『%s』應當是數字。", "『%s』應當介於『%s-%s』之間。");
+$lang->error->float           = "『%s』應當是數字，可以是小數。";
+$lang->error->email           = "『%s』應當為合法的EMAIL。";
+$lang->error->date            = "『%s』應當為合法的日期。";
+$lang->error->account         = "『%s』應當為合法的用戶名。";
+$lang->error->passwordsame    = "兩次密碼應當相等。";
+$lang->error->passwordrule    = "密碼應該符合規則，長度至少為六位。";
+
+/* 分頁信息。*/
+$lang->pager->noRecord  = "暫時沒有記錄";
+$lang->pager->digest    = "共<strong>%s</strong>條記錄,每頁 <strong>%s</strong>條，頁面：<strong>%s/%s</strong> ";
+$lang->pager->first     = "首頁";
+$lang->pager->pre       = "上頁";
+$lang->pager->next      = "下頁";
+$lang->pager->last      = "末頁";
+$lang->pager->locate    = "GO!";
+
+$lang->zentaoSite     = "官方網站";
+$lang->sponser        = "<a href='http://www.pujia.com' target='_blank'>普加贊助</a>";
+$lang->zentaoKeywords = "開源項目管理軟件,項目管理,項目管理軟件,pmp,pms,php框架，國產php框架，scrum工具,scrum管理工具,scrum管理軟件,敏捷項目管理,禪道";
+$lang->zentaoDESC     = "禪道項目管理軟件(ZenTaoPMS)是一款國產的，基于LGPL協議，開源免費的項目管理軟件(工具、系統)，同時也是一款scrum管理工具。
+    它集產品管理、項目管理、測試管理於一體，同時還包含了事務管理、組織管理等諸多功能，是中小型企業項目管理的首選。禪道項目管理軟件使用PHP + MySQL開發，
+基于自主的PHP開發框架──ZenTaoPHP而成。第三方開發者或者企業可以非常方便的開發插件或者進行定製。禪道在手，項目無憂！"; 
+
+/* 時間格式設置。*/
+define('DT_DATETIME1',  'Y-m-d H:i:s');
+define('DT_DATETIME2',  'y-m-d H:i');
+define('DT_MONTHTIME1', 'n/d H:i');
+define('DT_MONTHTIME2', 'n月d日 H:i');
+define('DT_DATE1',     'Y-m-d');
+define('DT_DATE2',     'Ymd');
+define('DT_DATE3',     'Y年m月d日');
+define('DT_TIME1',     'H:i:s');
+define('DT_TIME2',     'H:i');
--- a/trunk/module/company/lang/en.php
+++ b/trunk/module/company/lang/en.php
@@ -32,7 +32,8 @@ $lang->company->browse   = "用户列表";
 $lang->company->depts    = "部门列表";
 $lang->company->orgView  = '组织视图';

-$lang->company->confirmDelete  = "您确定删除该公司吗？";
+$lang->company->confirmDelete = "您确定删除该公司吗？";
+$lang->company->successSaved  = "成功保存";

 $lang->company->id       = '编号';
 $lang->company->name     = '公司名称';
@@ -41,7 +42,7 @@ $lang->company->fax      = '传真';
 $lang->company->address  = '通讯地址';
 $lang->company->zipcode  = '邮政编码';
 $lang->company->website  = '公司网站';
-$lang->company->backyard = '内网网址';
+$lang->company->backyard = '公司内网';
 $lang->company->pms      = 'PMS网站';
 $lang->company->guest    = '匿名登录';

--- a/trunk/module/company/lang/zh-tw.php
+++ b/trunk/module/company/lang/zh-tw.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * The company module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     company
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->company->common   = '組織視圖';
+$lang->company->index    = "組織視圖首頁";
+$lang->company->create   = "新增公司";
+$lang->company->edit     = "編輯公司";
+$lang->company->read     = "公司信息";
+$lang->company->update   = "更新公司";
+$lang->company->delete   = "刪除公司";
+$lang->company->browse   = "用戶列表";
+$lang->company->depts    = "部門列表";
+$lang->company->orgView  = '組織視圖';
+
+$lang->company->confirmDelete = "您確定刪除該公司嗎？";
+$lang->company->successSaved  = "成功保存";
+
+$lang->company->id       = '編號';
+$lang->company->name     = '公司名稱';
+$lang->company->phone    = '聯繫電話';
+$lang->company->fax      = '傳真';
+$lang->company->address  = '通訊地址';
+$lang->company->zipcode  = '郵政編碼';
+$lang->company->website  = '公司網站';
+$lang->company->backyard = '公司內網';
+$lang->company->pms      = 'PMS網站';
+$lang->company->guest    = '匿名登錄';
+
+$lang->company->guestList[0] = '不允許';
+$lang->company->guestList[1] = '允許';
--- a/trunk/module/convert/lang/en.php
+++ b/trunk/module/convert/lang/en.php
@@ -38,7 +38,7 @@ $lang->convert->source           = '来源系统';
 $lang->convert->version          = '版本';
 $lang->convert->mustSelectSource = "必须选择一个来源。";

-$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x');
+$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x');

 $lang->convert->setting     = '设置';
 $lang->convert->checkConfig = '检查配置';
@@ -68,6 +68,8 @@ $lang->convert->bugfree->users    = '用户';
 $lang->convert->bugfree->projects = '项目';
 $lang->convert->bugfree->modules  = '模块';
 $lang->convert->bugfree->bugs     = 'Bug';
+$lang->convert->bugfree->cases    = '测试用例';
+$lang->convert->bugfree->results  = '测试结果';
 $lang->convert->bugfree->actions  = '历史记录';
 $lang->convert->bugfree->files    = '附件';

--- a/trunk/module/convert/lang/zh-tw.php
+++ b/trunk/module/convert/lang/zh-tw.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * The convert module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     convert
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->convert->common  = '從其他系統導入';
+$lang->convert->next    = '下一步';
+$lang->convert->pre     = '返回';
+$lang->convert->reload  = '刷新';
+$lang->convert->error   = '錯誤 ';
+
+$lang->convert->start   = '開始轉換';
+$lang->convert->desc    = <<<EOT
+<p>歡迎使用系統轉換嚮導，本程序會幫助您將其他系統的數據轉換到禪道項目管理系統中。</p>
+<strong>轉換存在一定的風險，轉換之前，我們強烈建議您備份資料庫及相應的數據檔案，並保證轉換的時候，沒有其他人進行操作。</strong>
+EOT;
+
+$lang->convert->selectSource     = '選擇來源系統及版本';
+$lang->convert->source           = '來源系統';
+$lang->convert->version          = '版本';
+$lang->convert->mustSelectSource = "必須選擇一個來源。";
+
+$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x');
+
+$lang->convert->setting     = '設置';
+$lang->convert->checkConfig = '檢查配置';
+
+$lang->convert->ok         = '檢查通過(√)';
+$lang->convert->fail       = '檢查失敗(×)';
+
+$lang->convert->settingDB  = '設置資料庫';
+$lang->convert->dbHost     = '資料庫伺服器';
+$lang->convert->dbPort     = '伺服器連接埠';
+$lang->convert->dbUser     = '資料庫用戶名';
+$lang->convert->dbPassword = '資料庫密碼';
+$lang->convert->dbName     = '%s使用的庫';
+$lang->convert->dbPrefix   = '%s表首碼';
+$lang->convert->installPath= '%s安裝的根目錄';
+
+$lang->convert->checkDB    = '資料庫';
+$lang->convert->checkTable = '表';
+$lang->convert->checkPath  = '安裝路徑';
+
+$lang->convert->execute    = '執行轉換';
+$lang->convert->item       = '轉換項';
+$lang->convert->count      = '轉換數量';
+$lang->convert->info       = '轉換信息';
+
+$lang->convert->bugfree->users    = '用戶';
+$lang->convert->bugfree->projects = '項目';
+$lang->convert->bugfree->modules  = '模組';
+$lang->convert->bugfree->bugs     = 'Bug';
+$lang->convert->bugfree->cases    = '測試用例';
+$lang->convert->bugfree->results  = '測試結果';
+$lang->convert->bugfree->actions  = '歷史記錄';
+$lang->convert->bugfree->files    = '附件';
+
+$lang->convert->errorConnectDB     = '資料庫連接失敗 ';
+$lang->convert->errorFileNotExits  = '檔案 %s 不存在';
+$lang->convert->errorUserExists    = '用戶 %s 已存在';
+$lang->convert->errorCopyFailed    = '檔案 %s 拷貝失敗';
--- a/trunk/module/dept/lang/en.php
+++ b/trunk/module/dept/lang/en.php
@@ -26,7 +26,7 @@ $lang->dept->add         = "添加";
 $lang->dept->addChild    = "添加下级部门";
 $lang->dept->manageChild = "下级部门";
 $lang->dept->delete      = "删除部门";
-$lang->dept->browse      = "部门列表";
+$lang->dept->browse      = "部门维护";
 $lang->dept->manage      = "维护部门结构";
 $lang->dept->updateOrder = "更新排序";
 $lang->dept->users       = "成员列表";
--- a/trunk/module/dept/lang/zh-tw.php
+++ b/trunk/module/dept/lang/zh-tw.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * The dept module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     dept
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->dept->common      = '部門結構';
+$lang->dept->add         = "添加";
+$lang->dept->addChild    = "添加下級部門";
+$lang->dept->manageChild = "下級部門";
+$lang->dept->delete      = "刪除部門";
+$lang->dept->browse      = "部門維護";
+$lang->dept->manage      = "維護部門結構";
+$lang->dept->updateOrder = "更新排序";
+$lang->dept->users       = "成員列表";
+
+$lang->dept->saveButton    = " 保存 (S) ";
+$lang->dept->confirmDelete = " 您確定刪除該部門嗎？";
--- a/trunk/module/file/lang/en.php
+++ b/trunk/module/file/lang/en.php
@@ -21,5 +21,7 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
-$lang->file->common = '附件';
-$lang->file->label  = '标题：';
+$lang->file->common     = '附件';
+$lang->file->download   = '下载附件';
+$lang->file->export2CSV = '导出CSV';
+$lang->file->label    = '标题：';
--- a/trunk/module/file/lang/zh-tw.php
+++ b/trunk/module/file/lang/zh-tw.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * The file module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     file
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->file->common     = '附件';
+$lang->file->download   = '下載附件';
+$lang->file->export2CSV = '導出CSV';
+$lang->file->label    = '標題：';
--- a/trunk/module/group/lang/en.php
+++ b/trunk/module/group/lang/en.php
@@ -25,6 +25,7 @@ $lang->group->common       = '权限分组';
 $lang->group->browse       = '浏览分组';
 $lang->group->create       = '新增分组';
 $lang->group->edit         = '编辑分组';
+$lang->group->copy         = '复制分组';
 $lang->group->delete       = '删除分组';
 $lang->group->managePriv   = '权限维护';
 $lang->group->manageMember = '成员维护';
@@ -41,20 +42,27 @@ $lang->group->module   = '模块';
 $lang->group->method   = '方法';
 $lang->group->priv     = '权限';
 $lang->group->checkall = '全选';
+$lang->group->option   = '选项';

-/* 所有resource列表。*/
+$lang->group->copyOptions['copyPriv'] = '复制权限';
+$lang->group->copyOptions['copyUser'] = '复制用户';
+
+//---------------------------- 所有resource列表-------------------------*/
+
+/* 首页。*/
 $lang->resource->index->index = 'index';
-$lang->resource->index->ping  = 'ping';

+/* 我的地盘。*/
 $lang->resource->my->index       = 'index';
 $lang->resource->my->todo        = 'todo';
 $lang->resource->my->task        = 'task';
-$lang->resource->my->story       = 'story';
 $lang->resource->my->bug         = 'bug';
+$lang->resource->my->story       = 'story';
 $lang->resource->my->project     = 'project';
 $lang->resource->my->profile     = 'profile';
 $lang->resource->my->editProfile = 'editProfile';

+/* todo。*/
 $lang->resource->todo->create    = 'create';
 $lang->resource->todo->edit      = 'edit';
 $lang->resource->todo->view      = 'view';
@@ -62,123 +70,148 @@ $lang->resource->todo->delete    = 'delete';
 $lang->resource->todo->mark      = 'mark';
 $lang->resource->todo->import2Today = 'import2Today';

+/* 产品视图。*/
 $lang->resource->product->index  = 'index';
 $lang->resource->product->browse = 'browse';
 $lang->resource->product->create = 'create';
+$lang->resource->product->view   = 'view';
 $lang->resource->product->edit   = 'edit';
 $lang->resource->product->delete = 'delete';
 $lang->resource->product->roadmap= 'roadmap';
 $lang->resource->product->ajaxGetProjects = 'ajaxGetProjects';
 $lang->resource->product->ajaxGetPlans    = 'ajaxGetPlans';

+/* 需求。*/
 $lang->resource->story->create  = 'create';
 $lang->resource->story->edit    = 'edit';
 $lang->resource->story->delete  = 'delete';
 $lang->resource->story->view    = 'view';
-$lang->resource->story->change  = 'change';
-$lang->resource->story->review  = 'review';
-$lang->resource->story->close   = 'close';
-$lang->resource->story->activate= 'activate';
+$lang->resource->story->change  = 'lblChange';
+$lang->resource->story->review  = 'lblReview';
+$lang->resource->story->close   = 'lblClose';
+$lang->resource->story->activate= 'lblActivate';
 $lang->resource->story->tasks   = 'tasks';
 $lang->resource->story->ajaxGetProjectStories = 'ajaxGetProjectStories';
 $lang->resource->story->ajaxGetProductStories = 'ajaxGetProductStories';

-$lang->resource->productplan->browse = 'browse';
-$lang->resource->productplan->create = 'create';
-$lang->resource->productplan->edit   = 'edit';
-$lang->resource->productplan->delete = 'delete';
-$lang->resource->productplan->view   = 'view';
+/* 产品计划。*/
+$lang->resource->productplan->browse      = 'browse';
+$lang->resource->productplan->create      = 'create';
+$lang->resource->productplan->edit        = 'edit';
+$lang->resource->productplan->delete      = 'delete';
+$lang->resource->productplan->view        = 'view';
 $lang->resource->productplan->linkStory   = 'linkStory';
 $lang->resource->productplan->unlinkStory = 'unlinkStory';

+/* 发布。*/
 $lang->resource->release->browse = 'browse';
 $lang->resource->release->create = 'create';
 $lang->resource->release->edit   = 'edit';
 $lang->resource->release->delete = 'delete';
 $lang->resource->release->view   = 'view';

-$lang->resource->project->index  = 'index';
-$lang->resource->project->view   = 'view';
-$lang->resource->project->browse = 'browse';
-$lang->resource->project->create = 'create';
-$lang->resource->project->edit   = 'edit';
-$lang->resource->project->delete = 'delete';
-$lang->resource->project->task   = 'task';
-$lang->resource->project->story  = 'story';
-$lang->resource->project->build  = 'build';
-$lang->resource->project->bug    = 'bug';
-$lang->resource->project->burn   = 'burn';
-$lang->resource->project->burnData = 'burnData';
-$lang->resource->project->team     = 'team';
+/* 项目视图。*/
+$lang->resource->project->index          = 'index';
+$lang->resource->project->view           = 'view';
+$lang->resource->project->browse         = 'browse';
+$lang->resource->project->create         = 'create';
+$lang->resource->project->edit           = 'edit';
+$lang->resource->project->delete         = 'delete';
+$lang->resource->project->task           = 'task';
+$lang->resource->project->grouptask      = 'groupTask';
+$lang->resource->project->importtask     = 'importTask';
+$lang->resource->project->story          = 'story';
+$lang->resource->project->build          = 'build';
+$lang->resource->project->bug            = 'bug';
+$lang->resource->project->burn           = 'burn';
+$lang->resource->project->computeBurn    = 'computeBurn';
+$lang->resource->project->burnData       = 'burnData';
+$lang->resource->project->team           = 'team';
 $lang->resource->project->manageProducts = 'manageProducts';
-$lang->resource->project->manageChilds   = 'manageChilds';
+//$lang->resource->project->manageChilds   = 'manageChilds';
 $lang->resource->project->manageMembers  = 'manageMembers';
 $lang->resource->project->unlinkMember   = 'unlinkMember';
 $lang->resource->project->linkStory      = 'linkStory';
 $lang->resource->project->unlinkStory    = 'unlinkStory';

-$lang->resource->task->create = 'create';
-$lang->resource->task->edit   = 'edit';
-$lang->resource->task->delete = 'delete';
-$lang->resource->task->view   = 'view';
+/* 任务。*/
+$lang->resource->task->create              = 'create';
+$lang->resource->task->edit                = 'edit';
+$lang->resource->task->delete              = 'delete';
+$lang->resource->task->view                = 'view';
+$lang->resource->task->confirmStoryChange  = 'confirmStoryChange';
 $lang->resource->task->ajaxGetUserTasks    = 'ajaxGetUserTasks';
 $lang->resource->task->ajaxGetProjectTasks = 'ajaxGetProjectTasks';

-$lang->resource->build->create = 'create';
-$lang->resource->build->edit   = 'edit';
-$lang->resource->build->delete = 'delete';
-$lang->resource->build->view   = 'view';
+/* build。*/
+$lang->resource->build->create               = 'create';
+$lang->resource->build->edit                 = 'edit';
+$lang->resource->build->delete               = 'delete';
+$lang->resource->build->view                 = 'view';
 $lang->resource->build->ajaxGetProductBuilds = 'ajaxGetProductBuilds';
 $lang->resource->build->ajaxGetProjectBuilds = 'ajaxGetProjectBuilds';

+/* QA视图。*/
 $lang->resource->qa->index = 'index';

-$lang->resource->bug->index   = 'index';
-$lang->resource->bug->browse  = 'browse';
-$lang->resource->bug->create  = 'create';
-$lang->resource->bug->view    = 'view';
-$lang->resource->bug->edit    = 'edit';
-$lang->resource->bug->resolve = 'resolve';
-$lang->resource->bug->activate= 'activate';
-$lang->resource->bug->close   = 'close';
-$lang->resource->bug->ajaxGetUserBugs = 'ajaxGetUserBugs';
+/* Bug。*/
+$lang->resource->bug->index               = 'index';
+$lang->resource->bug->browse              = 'browse';
+$lang->resource->bug->create              = 'create';
+$lang->resource->bug->view                = 'view';
+$lang->resource->bug->edit                = 'edit';
+$lang->resource->bug->resolve             = 'resolve';
+$lang->resource->bug->activate            = 'activate';
+$lang->resource->bug->close               = 'close';
+$lang->resource->bug->report              = 'reportChart';
+$lang->resource->bug->confirmStoryChange  = 'confirmStoryChange';
+$lang->resource->bug->delete              = 'delete';
+$lang->resource->bug->ajaxGetUserBugs     = 'ajaxGetUserBugs';

-$lang->resource->testcase->index   = 'index';
-$lang->resource->testcase->browse  = 'browse';
-$lang->resource->testcase->create  = 'create';
-$lang->resource->testcase->view    = 'view';
-$lang->resource->testcase->edit    = 'edit';
+/* 测试用例。*/
+$lang->resource->testcase->index              = 'index';
+$lang->resource->testcase->browse             = 'browse';
+$lang->resource->testcase->create             = 'create';
+$lang->resource->testcase->view               = 'view';
+$lang->resource->testcase->edit               = 'edit';
+$lang->resource->testcase->delete             = 'delete';
+$lang->resource->testcase->confirmStoryChange = 'confirmStoryChange';

+/* 测试任务。*/
 $lang->resource->testtask->index       = 'index';
 $lang->resource->testtask->create      = 'create';
 $lang->resource->testtask->browse      = 'browse';
 $lang->resource->testtask->view        = 'view';
+$lang->resource->testtask->cases       = 'lblCases';
 $lang->resource->testtask->edit        = 'edit';
 $lang->resource->testtask->delete      = 'delete';
 $lang->resource->testtask->batchAssign = 'batchAssign';
 $lang->resource->testtask->linkcase    = 'linkCase';
-$lang->resource->testtask->unlinkcase  = 'unlinkCase';
-$lang->resource->testtask->runcase     = 'runCase';
-$lang->resource->testtask->results     = 'results';
+$lang->resource->testtask->unlinkcase  = 'lblUnlinkCase';
+$lang->resource->testtask->runcase     = 'lblRunCase';
+$lang->resource->testtask->results     = 'lblResults';

+/* 组织视图。*/
 $lang->resource->company->index  = 'index';
 $lang->resource->company->browse = 'browse';
-$lang->resource->company->create = 'create';
 $lang->resource->company->edit   = 'edit';
-$lang->resource->company->delete = 'delete';

+/* 部门。*/
 $lang->resource->dept->browse      = 'browse';
 $lang->resource->dept->updateOrder = 'updateOrder';
 $lang->resource->dept->manageChild = 'manageChild';
 $lang->resource->dept->delete      = 'delete';

+/* 分组。*/
 $lang->resource->group->browse       = 'browse';
 $lang->resource->group->create       = 'create';
 $lang->resource->group->edit         = 'edit';
+$lang->resource->group->copy         = 'copy';
 $lang->resource->group->delete       = 'delete';
 $lang->resource->group->managePriv   = 'managePriv';
 $lang->resource->group->manageMember = 'manageMember';

+/* 用户。*/
 $lang->resource->user->create = 'create';
 $lang->resource->user->view   = 'view';
 $lang->resource->user->edit   = 'edit';
@@ -189,14 +222,27 @@ $lang->resource->user->bug    = 'bug';
 $lang->resource->user->project= 'project';
 $lang->resource->user->profile= 'profile';

+/* 模块维护。*/
 $lang->resource->tree->browse            = 'browse';
 $lang->resource->tree->updateOrder       = 'updateOrder';
 $lang->resource->tree->manageChild       = 'manageChild';
+$lang->resource->tree->edit              = 'edit';
 $lang->resource->tree->delete            = 'delete';
 $lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu';

+/* 搜索*/
 $lang->resource->search->buildForm    = 'buildForm';
 $lang->resource->search->buildQuery   = 'buildQuery';
+$lang->resource->search->saveQuery    = 'saveQuery';
+$lang->resource->search->deleteQuery  = 'deleteQuery';

+/* 后台管理。*/
 $lang->resource->admin->index         = 'index';
-$lang->resource->admin->browseCompany = 'browseCompany';
+
+/* 其他的一些杂项。*/
+$lang->resource->api->getModel    = 'getModel';
+$lang->resource->file->download   = 'download';
+$lang->resource->file->export2CSV = 'export2CSV';
+$lang->resource->misc->ping       = 'ping';
+$lang->resource->action->trash    = 'trash';
+$lang->resource->action->undelete = 'undelete';
--- a/trunk/module/group/lang/zh-tw.php
+++ b/trunk/module/group/lang/zh-tw.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * The group module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     group
+ * @version     $Id: zh-tw.php 918 2010-07-06 01:51:26Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->group->common       = '權限分組';
+$lang->group->browse       = '瀏覽分組';
+$lang->group->create       = '新增分組';
+$lang->group->edit         = '編輯分組';
+$lang->group->copy         = '複製分組';
+$lang->group->delete       = '刪除分組';
+$lang->group->managePriv   = '權限維護';
+$lang->group->manageMember = '成員維護';
+$lang->group->linkMember   = '關聯用戶';
+$lang->group->unlinkMember = '移除用戶';
+$lang->group->confirmDelete= '您確定刪除該用戶分組嗎？';
+$lang->group->successSaved = '成功保存';
+
+$lang->group->id       = '編號';
+$lang->group->name     = '分組名稱';
+$lang->group->desc     = '分組描述';
+$lang->group->users    = '用戶列表';
+$lang->group->module   = '模組';
+$lang->group->method   = '方法';
+$lang->group->priv     = '權限';
+$lang->group->checkall = '全選';
+$lang->group->option   = '選項';
+
+$lang->group->copyOptions['copyPriv'] = '複製權限';
+$lang->group->copyOptions['copyUser'] = '複製用戶';
+
+//---------------------------- 所有resource列表-------------------------*/
+
+/* 首頁。*/
+$lang->resource->index->index = 'index';
+
+/* 我的地盤。*/
+$lang->resource->my->index       = 'index';
+$lang->resource->my->todo        = 'todo';
+$lang->resource->my->task        = 'task';
+$lang->resource->my->bug         = 'bug';
+$lang->resource->my->story       = 'story';
+$lang->resource->my->project     = 'project';
+$lang->resource->my->profile     = 'profile';
+$lang->resource->my->editProfile = 'editProfile';
+
+/* todo。*/
+$lang->resource->todo->create    = 'create';
+$lang->resource->todo->edit      = 'edit';
+$lang->resource->todo->view      = 'view';
+$lang->resource->todo->delete    = 'delete';
+$lang->resource->todo->mark      = 'mark';
+$lang->resource->todo->import2Today = 'import2Today';
+
+/* 產品視圖。*/
+$lang->resource->product->index  = 'index';
+$lang->resource->product->browse = 'browse';
+$lang->resource->product->create = 'create';
+$lang->resource->product->view   = 'view';
+$lang->resource->product->edit   = 'edit';
+$lang->resource->product->delete = 'delete';
+$lang->resource->product->roadmap= 'roadmap';
+$lang->resource->product->ajaxGetProjects = 'ajaxGetProjects';
+$lang->resource->product->ajaxGetPlans    = 'ajaxGetPlans';
+
+/* 需求。*/
+$lang->resource->story->create  = 'create';
+$lang->resource->story->edit    = 'edit';
+$lang->resource->story->delete  = 'delete';
+$lang->resource->story->view    = 'view';
+$lang->resource->story->change  = 'lblChange';
+$lang->resource->story->review  = 'lblReview';
+$lang->resource->story->close   = 'lblClose';
+$lang->resource->story->activate= 'lblActivate';
+$lang->resource->story->tasks   = 'tasks';
+$lang->resource->story->ajaxGetProjectStories = 'ajaxGetProjectStories';
+$lang->resource->story->ajaxGetProductStories = 'ajaxGetProductStories';
+
+/* 產品計劃。*/
+$lang->resource->productplan->browse      = 'browse';
+$lang->resource->productplan->create      = 'create';
+$lang->resource->productplan->edit        = 'edit';
+$lang->resource->productplan->delete      = 'delete';
+$lang->resource->productplan->view        = 'view';
+$lang->resource->productplan->linkStory   = 'linkStory';
+$lang->resource->productplan->unlinkStory = 'unlinkStory';
+
+/* 發佈。*/
+$lang->resource->release->browse = 'browse';
+$lang->resource->release->create = 'create';
+$lang->resource->release->edit   = 'edit';
+$lang->resource->release->delete = 'delete';
+$lang->resource->release->view   = 'view';
+
+/* 項目視圖。*/
+$lang->resource->project->index          = 'index';
+$lang->resource->project->view           = 'view';
+$lang->resource->project->browse         = 'browse';
+$lang->resource->project->create         = 'create';
+$lang->resource->project->edit           = 'edit';
+$lang->resource->project->delete         = 'delete';
+$lang->resource->project->task           = 'task';
+$lang->resource->project->grouptask      = 'groupTask';
+$lang->resource->project->importtask     = 'importTask';
+$lang->resource->project->story          = 'story';
+$lang->resource->project->build          = 'build';
+$lang->resource->project->bug            = 'bug';
+$lang->resource->project->burn           = 'burn';
+$lang->resource->project->computeBurn    = 'computeBurn';
+$lang->resource->project->burnData       = 'burnData';
+$lang->resource->project->team           = 'team';
+$lang->resource->project->manageProducts = 'manageProducts';
+//$lang->resource->project->manageChilds   = 'manageChilds';
+$lang->resource->project->manageMembers  = 'manageMembers';
+$lang->resource->project->unlinkMember   = 'unlinkMember';
+$lang->resource->project->linkStory      = 'linkStory';
+$lang->resource->project->unlinkStory    = 'unlinkStory';
+
+/* 任務。*/
+$lang->resource->task->create              = 'create';
+$lang->resource->task->edit                = 'edit';
+$lang->resource->task->delete              = 'delete';
+$lang->resource->task->view                = 'view';
+$lang->resource->task->confirmStoryChange  = 'confirmStoryChange';
+$lang->resource->task->ajaxGetUserTasks    = 'ajaxGetUserTasks';
+$lang->resource->task->ajaxGetProjectTasks = 'ajaxGetProjectTasks';
+
+/* build。*/
+$lang->resource->build->create               = 'create';
+$lang->resource->build->edit                 = 'edit';
+$lang->resource->build->delete               = 'delete';
+$lang->resource->build->view                 = 'view';
+$lang->resource->build->ajaxGetProductBuilds = 'ajaxGetProductBuilds';
+$lang->resource->build->ajaxGetProjectBuilds = 'ajaxGetProjectBuilds';
+
+/* QA視圖。*/
+$lang->resource->qa->index = 'index';
+
+/* Bug。*/
+$lang->resource->bug->index               = 'index';
+$lang->resource->bug->browse              = 'browse';
+$lang->resource->bug->create              = 'create';
+$lang->resource->bug->view                = 'view';
+$lang->resource->bug->edit                = 'edit';
+$lang->resource->bug->resolve             = 'resolve';
+$lang->resource->bug->activate            = 'activate';
+$lang->resource->bug->close               = 'close';
+$lang->resource->bug->report              = 'reportChart';
+$lang->resource->bug->confirmStoryChange  = 'confirmStoryChange';
+$lang->resource->bug->delete              = 'delete';
+$lang->resource->bug->ajaxGetUserBugs     = 'ajaxGetUserBugs';
+
+/* 測試用例。*/
+$lang->resource->testcase->index              = 'index';
+$lang->resource->testcase->browse             = 'browse';
+$lang->resource->testcase->create             = 'create';
+$lang->resource->testcase->view               = 'view';
+$lang->resource->testcase->edit               = 'edit';
+$lang->resource->testcase->delete             = 'delete';
+$lang->resource->testcase->confirmStoryChange = 'confirmStoryChange';
+
+/* 測試任務。*/
+$lang->resource->testtask->index       = 'index';
+$lang->resource->testtask->create      = 'create';
+$lang->resource->testtask->browse      = 'browse';
+$lang->resource->testtask->view        = 'view';
+$lang->resource->testtask->cases       = 'lblCases';
+$lang->resource->testtask->edit        = 'edit';
+$lang->resource->testtask->delete      = 'delete';
+$lang->resource->testtask->batchAssign = 'batchAssign';
+$lang->resource->testtask->linkcase    = 'linkCase';
+$lang->resource->testtask->unlinkcase  = 'lblUnlinkCase';
+$lang->resource->testtask->runcase     = 'lblRunCase';
+$lang->resource->testtask->results     = 'lblResults';
+
+/* 組織視圖。*/
+$lang->resource->company->index  = 'index';
+$lang->resource->company->browse = 'browse';
+$lang->resource->company->edit   = 'edit';
+
+/* 部門。*/
+$lang->resource->dept->browse      = 'browse';
+$lang->resource->dept->updateOrder = 'updateOrder';
+$lang->resource->dept->manageChild = 'manageChild';
+$lang->resource->dept->delete      = 'delete';
+
+/* 分組。*/
+$lang->resource->group->browse       = 'browse';
+$lang->resource->group->create       = 'create';
+$lang->resource->group->edit         = 'edit';
+$lang->resource->group->copy         = 'copy';
+$lang->resource->group->delete       = 'delete';
+$lang->resource->group->managePriv   = 'managePriv';
+$lang->resource->group->manageMember = 'manageMember';
+
+/* 用戶。*/
+$lang->resource->user->create = 'create';
+$lang->resource->user->view   = 'view';
+$lang->resource->user->edit   = 'edit';
+$lang->resource->user->delete = 'delete';
+$lang->resource->user->todo   = 'todo';
+$lang->resource->user->task   = 'task';
+$lang->resource->user->bug    = 'bug';
+$lang->resource->user->project= 'project';
+$lang->resource->user->profile= 'profile';
+
+/* 模組維護。*/
+$lang->resource->tree->browse            = 'browse';
+$lang->resource->tree->updateOrder       = 'updateOrder';
+$lang->resource->tree->manageChild       = 'manageChild';
+$lang->resource->tree->edit              = 'edit';
+$lang->resource->tree->delete            = 'delete';
+$lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu';
+
+/* 搜索*/
+$lang->resource->search->buildForm    = 'buildForm';
+$lang->resource->search->buildQuery   = 'buildQuery';
+$lang->resource->search->saveQuery    = 'saveQuery';
+$lang->resource->search->deleteQuery  = 'deleteQuery';
+
+/* 後台管理。*/
+$lang->resource->admin->index         = 'index';
+
+/* 其他的一些雜項。*/
+$lang->resource->api->getModel    = 'getModel';
+$lang->resource->file->download   = 'download';
+$lang->resource->file->export2CSV = 'export2CSV';
+$lang->resource->misc->ping       = 'ping';
+$lang->resource->action->trash    = 'trash';
+$lang->resource->action->undelete = 'undelete';
--- a/trunk/module/index/lang/en.php
+++ b/trunk/module/index/lang/en.php
@@ -27,4 +27,4 @@ $lang->index->common = '首页';
 $lang->index->index  = '首页';
 $lang->index->ping   = '接口:同步session';
 $lang->index->latest = '最新动态';
-$lang->index->action = '%s, %s <i>%s</i> %s <strong>%s</strong>';
+$lang->index->action = '%s, %s <i>%s</i> %s <strong>%s</strong>。';
--- a/trunk/module/index/lang/zh-tw.php
+++ b/trunk/module/index/lang/zh-tw.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * The index module simplified chinese file of ZenTaoMS.
+ *
+ * This file should be UTF-8 encoded.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     ZenTaoMS
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->index->common = '首頁';
+$lang->index->index  = '首頁';
+$lang->index->ping   = '介面:同步session';
+$lang->index->latest = '最新動態';
+$lang->index->action = '%s, %s <i>%s</i> %s <strong>%s</strong>。';
--- a/trunk/module/install/lang/en.php
+++ b/trunk/module/install/lang/en.php
@@ -27,14 +27,24 @@ $lang->install->pre     = '返回';
 $lang->install->reload  = '刷新';
 $lang->install->error   = '错误 ';

-$lang->install->start   = '开始安装';
-$lang->install->welcome = '欢迎使用禅道项目管理软件！';
-$lang->install->desc    = <<<EOT
+$lang->install->start            = '开始安装';
+$lang->install->keepInstalling   = '继续安装当前版本';
+$lang->install->seeLatestRelease = '看看最新的版本';
+$lang->install->welcome          = '欢迎使用禅道项目管理软件！';
+$lang->install->desc             = <<<EOT
 禅道项目管理软件(ZenTaoPMS)是一款国产的，基于LGPL协议，开源免费的项目管理软件，它集产品管理、项目管理、测试管理于一体，同时还包含了事务管理、组织管理等诸多功能，是中小型企业项目管理的首选。

 禅道项目管理软件使用PHP + MySQL开发，基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。
+
+禅道项目管理软件由<strong class='red'><a href='http://www.cnezsoft.com' target='_blank'>青岛易软天创网络科技有限公司开发</a></strong>。
+禅道项目管理软件的官方支持网站：<a href='http://www.zentaoms.com' target='_blank'>http://www.zentaoms.com</a>
+官方技术支持QQ群：41408140
+
+您现在正在安装的版本是 <strong class='red'>%s</strong>。
 EOT;

+$lang->install->newReleased= "<strong class='red'>提示</strong>：官网网站已有最新版本，为<strong class='red'>%s</strong>, 发布日期于 %s。";
+$lang->install->choice     = '您可以选择：';
 $lang->install->checking   = '系统检查';
 $lang->install->ok         = '检查通过(√)';
 $lang->install->fail       = '检查失败(×)';
@@ -68,6 +78,7 @@ $lang->install->requestType  = 'URL方式';
 $lang->install->requestTypes['GET']       = '普通方式';
 $lang->install->requestTypes['PATH_INFO'] = '静态友好方式';
 $lang->install->dbHost     = '数据库服务器';
+$lang->install->dbHostNote = '如果localhost无法访问，尝试使用127.0.0.1';
 $lang->install->dbPort     = '服务器端口';
 $lang->install->dbUser     = '数据库用户名';
 $lang->install->dbPassword = '数据库密码';
@@ -84,7 +95,8 @@ $lang->install->setConfig  = '生成配置文件';
 $lang->install->key        = '配置项';
 $lang->install->value      = '值';
 $lang->install->saveConfig = '保存配置文件';
-$lang->install->save2File  = '拷贝上面文本框中的内容，将其保存到 " %s "中。';
+$lang->install->save2File  = '<div class="a-center"><span class="fail">尝试写入配置文件，失败！</span></div>拷贝上面文本框中的内容，将其保存到 "<strong> %s </strong>"中。您以后还可继续修改此配置文件。';
+$lang->install->saved2File = '配置信息已经成功保存到" <strong>%s</strong> "中。您后面还可继续修改此文件。';
 $lang->install->errorNotSaveConfig = '还没有保存配置文件';

 $lang->install->getPriv  = '设置帐号';
--- a/trunk/module/install/lang/zh-tw.php
+++ b/trunk/module/install/lang/zh-tw.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * The install module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     install
+ * @version     $Id: zh-tw.php 929 2010-07-06 03:08:45Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->install->common  = '安裝';
+$lang->install->next    = '下一步';
+$lang->install->pre     = '返回';
+$lang->install->reload  = '刷新';
+$lang->install->error   = '錯誤 ';
+
+$lang->install->start            = '開始安裝';
+$lang->install->keepInstalling   = '繼續安裝當前版本';
+$lang->install->seeLatestRelease = '看看最新的版本';
+$lang->install->welcome          = '歡迎使用禪道項目管理軟件！';
+$lang->install->desc             = <<<EOT
+禪道項目管理軟件(ZenTaoPMS)是一款國產的，基于LGPL協議，開源免費的項目管理軟件，它集產品管理、項目管理、測試管理於一體，同時還包含了事務管理、組織管理等諸多功能，是中小型企業項目管理的首選。
+
+禪道項目管理軟件使用PHP + MySQL開發，基于自主的PHP開發框架──ZenTaoPHP而成。第三方開發者或者企業可以非常方便的開發插件或者進行定製。
+
+禪道項目管理軟件由<strong class='red'><a href='http://www.cnezsoft.com' target='_blank'>青島易軟天創網絡科技有限公司開發</a></strong>。
+禪道項目管理軟件的官方支持網站：<a href='http://www.zentaoms.com' target='_blank'>http://www.zentaoms.com</a>
+官方技術支持QQ群：41408140
+
+您現在正在安裝的版本是 <strong class='red'>%s</strong>。
+EOT;
+
+$lang->install->newReleased= "<strong class='red'>提示</strong>：官網網站已有最新版本，為<strong class='red'>%s</strong>, 發佈日期于 %s。";
+$lang->install->choice     = '您可以選擇：';
+$lang->install->checking   = '系統檢查';
+$lang->install->ok         = '檢查通過(√)';
+$lang->install->fail       = '檢查失敗(×)';
+$lang->install->loaded     = '已加載';
+$lang->install->unloaded   = '未加載';
+$lang->install->exists     = '目錄存在 ';
+$lang->install->notExists  = '目錄不存在 ';
+$lang->install->writable   = '目錄可寫 ';
+$lang->install->notWritable= '目錄不可寫 ';
+$lang->install->phpINI     = 'PHP配置檔案';
+$lang->install->checkItem  = '檢查項';
+$lang->install->current    = '當前配置';
+$lang->install->result     = '檢查結果';
+$lang->install->action     = '如何修改';
+
+$lang->install->phpVersion = 'PHP版本';
+$lang->install->phpFail    = 'PHP版本必須大於5.2.0';
+
+$lang->install->pdo          = 'PDO擴展';
+$lang->install->pdoFail      = '修改PHP配置檔案，加載PDO擴展。';
+$lang->install->pdoMySQL     = 'PDO_MySQL擴展';
+$lang->install->pdoMySQLFail = '修改PHP配置檔案，加載pdo_mysql擴展。';
+$lang->install->tmpRoot      = '臨時檔案目錄';
+$lang->install->dataRoot     = '上傳檔案目錄';
+$lang->install->mkdir        = '<p>需要創建目錄%s。<br /> linux下面命令為：<br /> mkdir -p %s</p>';
+$lang->install->chmod        = '需要修改目錄 "%s" 的權限。<br />linux下面命令為：<br />chmod o=rwx -R %s';
+
+$lang->install->settingDB    = '設置資料庫';
+$lang->install->webRoot      = 'PMS所在網站目錄';
+$lang->install->requestType  = 'URL方式';
+$lang->install->requestTypes['GET']       = '普通方式';
+$lang->install->requestTypes['PATH_INFO'] = '靜態友好方式';
+$lang->install->dbHost     = '資料庫伺服器';
+$lang->install->dbHostNote = '如果localhost無法訪問，嘗試使用127.0.0.1';
+$lang->install->dbPort     = '伺服器連接埠';
+$lang->install->dbUser     = '資料庫用戶名';
+$lang->install->dbPassword = '資料庫密碼';
+$lang->install->dbName     = 'PMS使用的庫';
+$lang->install->dbPrefix   = '建表使用的首碼';
+$lang->install->createDB   = '自動創建資料庫';
+$lang->install->clearDB    = '清空現有數據';
+
+$lang->install->errorConnectDB     = '資料庫連接失敗 ';
+$lang->install->errorCreateDB      = '資料庫創建失敗';
+$lang->install->errorCreateTable   = '創建表失敗';
+
+$lang->install->setConfig  = '生成配置檔案';
+$lang->install->key        = '配置項';
+$lang->install->value      = '值';
+$lang->install->saveConfig = '保存配置檔案';
+$lang->install->save2File  = '<div class="a-center"><span class="fail">嘗試寫入配置檔案，失敗！</span></div>拷貝上面文本框中的內容，將其保存到 "<strong> %s </strong>"中。您以後還可繼續修改此配置檔案。';
+$lang->install->saved2File = '配置信息已經成功保存到" <strong>%s</strong> "中。您後面還可繼續修改此檔案。';
+$lang->install->errorNotSaveConfig = '還沒有保存配置檔案';
+
+$lang->install->getPriv  = '設置帳號';
+$lang->install->company  = '公司名稱';
+$lang->install->pms      = 'PMS地址';
+$lang->install->pmsNote  = '即通過什麼地址可以訪問到禪道項目管理，設置域名或者IP地址即可，不需要http';
+$lang->install->account  = '管理員帳號';
+$lang->install->password = '管理員密碼';
+$lang->install->errorEmptyPassword = '密碼不能為空';
+
+$lang->install->success = "安裝成功！請刪除install.php，登錄禪道管理系統，設置用戶及分組！";
+
--- a/trunk/module/misc/lang/en.php
+++ b/trunk/module/misc/lang/en.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * The misc module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     misc
+ * @version     $Id: english.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->misc->common  = '杂项';
+$lang->misc->ping    = '防超时';
+
+$lang->misc->zentao->version           = '版本%s';
+$lang->misc->zentao->labels['about']   = '关于禅道';
+$lang->misc->zentao->labels['support'] = '技术支持';
+$lang->misc->zentao->labels['cowin']   = '帮助我们';
+$lang->misc->zentao->labels['service'] = '服务列表';
+
+$lang->misc->zentao->about['official']     = "官方网站";
+$lang->misc->zentao->about['project']      = "项目进展";
+$lang->misc->zentao->about['preview']      = "最新预览";
+$lang->misc->zentao->about['changelog']    = "版本历史";
+$lang->misc->zentao->about['license']      = "授权协议";
+$lang->misc->zentao->about['contributors'] = "贡献者";
+$lang->misc->zentao->about['thirdparty']   = "第三方代码";
+$lang->misc->zentao->about['sourcecode']   = "源代码";
+
+$lang->misc->zentao->support['manual']     = "用户手册";
+$lang->misc->zentao->support['faq']        = "常见问题";
+$lang->misc->zentao->support['forum']      = "支持论坛";
+$lang->misc->zentao->support['qqgroup']    = "官方QQ群";
+$lang->misc->zentao->support['howask']     = "如何提问";
+$lang->misc->zentao->support['vip']        = "商业支持";
+
+$lang->misc->zentao->cowin['reportbug']    = "汇报Bug";
+$lang->misc->zentao->cowin['feedback']     = "反馈需求";
+$lang->misc->zentao->cowin['devcode']      = "提交代码";
+$lang->misc->zentao->cowin['doc']          = "完善文档";
+$lang->misc->zentao->cowin['recommend']    = "推荐给朋友";
+$lang->misc->zentao->cowin['addlink']      = "添加友情链接";
+$lang->misc->zentao->cowin['shop']         = "逛逛我们的商店";
+$lang->misc->zentao->cowin['donate']       = "捐助我们";
+$lang->misc->zentao->cowin['cowinmore']    = "更多方式...";
+
+$lang->misc->zentao->service['install']    = '禅道安装服务';
+$lang->misc->zentao->service['fixissue']   = '禅道问题解决';
+$lang->misc->zentao->service['zentaotrain']= '禅道使用培训';
+$lang->misc->zentao->service['idc']        = '禅道在线托管';
+$lang->misc->zentao->service['custom']     = '禅道定制开发';
+$lang->misc->zentao->service['review']     = '禅道点评服务';
+$lang->misc->zentao->service['scrumtrain'] = 'scrum培训';
+$lang->misc->zentao->service['fwtrain']    = '禅道PHP框架培训';
+$lang->misc->zentao->service['servicemore']= '更多服务...';
+
+$lang->misc->copyright = "版权所有 &copy;2009-2010 <a href='http://www.cnezsoft.com' target='_blank'>青岛易软天创网络科技有限公司</a>";
--- a/trunk/module/misc/lang/zh-tw.php
+++ b/trunk/module/misc/lang/zh-tw.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * The misc module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     misc
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->misc->common  = '雜項';
+$lang->misc->ping    = '防超時';
+
+$lang->misc->zentao->version           = '版本%s';
+$lang->misc->zentao->labels['about']   = '關於禪道';
+$lang->misc->zentao->labels['support'] = '技術支持';
+$lang->misc->zentao->labels['cowin']   = '幫助我們';
+$lang->misc->zentao->labels['service'] = '服務列表';
+
+$lang->misc->zentao->about['official']     = "官方網站";
+$lang->misc->zentao->about['project']      = "項目進展";
+$lang->misc->zentao->about['preview']      = "最新預覽";
+$lang->misc->zentao->about['changelog']    = "版本歷史";
+$lang->misc->zentao->about['license']      = "授權協議";
+$lang->misc->zentao->about['contributors'] = "貢獻者";
+$lang->misc->zentao->about['thirdparty']   = "第三方代碼";
+$lang->misc->zentao->about['sourcecode']   = "原始碼";
+
+$lang->misc->zentao->support['manual']     = "用戶手冊";
+$lang->misc->zentao->support['faq']        = "常見問題";
+$lang->misc->zentao->support['forum']      = "支持論壇";
+$lang->misc->zentao->support['qqgroup']    = "官方QQ群";
+$lang->misc->zentao->support['howask']     = "如何提問";
+$lang->misc->zentao->support['vip']        = "商業支持";
+
+$lang->misc->zentao->cowin['reportbug']    = "彙報Bug";
+$lang->misc->zentao->cowin['feedback']     = "反饋需求";
+$lang->misc->zentao->cowin['devcode']      = "提交代碼";
+$lang->misc->zentao->cowin['doc']          = "完善文檔";
+$lang->misc->zentao->cowin['recommend']    = "推薦給朋友";
+$lang->misc->zentao->cowin['addlink']      = "添加友情連結";
+$lang->misc->zentao->cowin['shop']         = "逛逛我們的商店";
+$lang->misc->zentao->cowin['donate']       = "捐助我們";
+$lang->misc->zentao->cowin['cowinmore']    = "更多方式...";
+
+$lang->misc->zentao->service['install']    = '禪道安裝服務';
+$lang->misc->zentao->service['fixissue']   = '禪道問題解決';
+$lang->misc->zentao->service['zentaotrain']= '禪道使用培訓';
+$lang->misc->zentao->service['idc']        = '禪道在綫託管';
+$lang->misc->zentao->service['custom']     = '禪道定製開發';
+$lang->misc->zentao->service['review']     = '禪道點評服務';
+$lang->misc->zentao->service['scrumtrain'] = 'scrum培訓';
+$lang->misc->zentao->service['fwtrain']    = '禪道PHP框架培訓';
+$lang->misc->zentao->service['servicemore']= '更多服務...';
+
+$lang->misc->copyright = "版權所有 &copy;2009-2010 <a href='http://www.cnezsoft.com' target='_blank'>青島易軟天創網絡科技有限公司</a>";
--- a/trunk/module/my/lang/en.php
+++ b/trunk/module/my/lang/en.php
@@ -1,12 +1,13 @@
 <?php
-$lang->my->common      = '我的地盘';
+$lang->my->common = '我的地盘';
+
+/* 方法列表。*/
 $lang->my->index       = '首页';
-$lang->my->profile     = '我的档案';
-$lang->my->project     = '我的项目';
+$lang->my->todo        = '我的TODO';
 $lang->my->task        = '我的任务';
 $lang->my->bug         = '我的Bug';
-$lang->my->todo        = '我的TODO';
 $lang->my->story       = '我的需求';
+$lang->my->project     = '我的项目';
 $lang->my->team        = '我的团队';
-$lang->my->editProfile = '更新信息';
 $lang->my->profile     = '我的档案';
+$lang->my->editProfile = '更新信息';
--- a/trunk/module/my/lang/zh-tw.php
+++ b/trunk/module/my/lang/zh-tw.php
@@ -0,0 +1,13 @@
+<?php
+$lang->my->common = '我的地盤';
+
+/* 方法列表。*/
+$lang->my->index       = '首頁';
+$lang->my->todo        = '我的TODO';
+$lang->my->task        = '我的任務';
+$lang->my->bug         = '我的Bug';
+$lang->my->story       = '我的需求';
+$lang->my->project     = '我的項目';
+$lang->my->team        = '我的團隊';
+$lang->my->profile     = '我的檔案';
+$lang->my->editProfile = '更新信息';
--- a/trunk/module/product/lang/en.php
+++ b/trunk/module/product/lang/en.php
@@ -24,6 +24,7 @@
 $lang->product->common = '产品视图';
 $lang->product->index  = "产品首页";
 $lang->product->browse = "浏览产品";
+$lang->product->view   = "产品信息";
 $lang->product->edit   = "编辑产品";
 $lang->product->create = "新增产品";
 $lang->product->read   = "产品详情";
@@ -35,8 +36,8 @@ $lang->product->roadmap   = '路线图';
 $lang->product->selectProduct   = "请选择产品";
 $lang->product->saveButton      = " 保存 (S) ";
 $lang->product->confirmDelete   = " 您确定删除该产品吗？";
-$lang->product->ajaxGetProjects = "接口:获得项目列表";
-$lang->product->ajaxGetPlans    = "接口:获得计划列表";
+$lang->product->ajaxGetProjects = "接口:项目列表";
+$lang->product->ajaxGetPlans    = "接口:计划列表";

 $lang->product->errorFormat    = '产品数据格式不正确';
 $lang->product->errorEmptyName = '产品名称不能为空';
@@ -53,3 +54,7 @@ $lang->product->desc    = '产品描述';
 $lang->product->moduleStory = '按模块浏览';
 $lang->product->searchStory = '搜索';
 $lang->product->allStory    = '全部需求';
+
+$lang->product->statusList['']       = '';
+$lang->product->statusList['normal'] = '正常';
+$lang->product->statusList['closed'] = '结束';
--- a/trunk/module/product/lang/zh-tw.php
+++ b/trunk/module/product/lang/zh-tw.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * The product module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     product
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->product->common = '產品視圖';
+$lang->product->index  = "產品首頁";
+$lang->product->browse = "瀏覽產品";
+$lang->product->view   = "產品信息";
+$lang->product->edit   = "編輯產品";
+$lang->product->create = "新增產品";
+$lang->product->read   = "產品詳情";
+$lang->product->edit   = "編輯產品";
+$lang->product->delete = "刪除產品";
+
+$lang->product->roadmap   = '路線圖';
+
+$lang->product->selectProduct   = "請選擇產品";
+$lang->product->saveButton      = " 保存 (S) ";
+$lang->product->confirmDelete   = " 您確定刪除該產品嗎？";
+$lang->product->ajaxGetProjects = "介面:項目列表";
+$lang->product->ajaxGetPlans    = "介面:計劃列表";
+
+$lang->product->errorFormat    = '產品數據格式不正確';
+$lang->product->errorEmptyName = '產品名稱不能為空';
+$lang->product->errorEmptyCode = '產品代號不能為空';
+
+$lang->product->id      = '編號';
+$lang->product->company = '所屬公司';
+$lang->product->name    = '產品名稱';
+$lang->product->code    = '產品代號';
+$lang->product->order   = '排序';
+$lang->product->status  = '狀態';
+$lang->product->desc    = '產品描述';
+
+$lang->product->moduleStory = '按模組瀏覽';
+$lang->product->searchStory = '搜索';
+$lang->product->allStory    = '全部需求';
+
+$lang->product->statusList['']       = '';
+$lang->product->statusList['normal'] = '正常';
+$lang->product->statusList['closed'] = '結束';
--- a/trunk/module/productplan/lang/zh-tw.php
+++ b/trunk/module/productplan/lang/zh-tw.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * The productplan module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     productplan
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->productplan->common    = '產品計劃';
+$lang->productplan->browse    = "瀏覽計劃";
+$lang->productplan->index     = "計劃列表";
+$lang->productplan->create    = "創建計劃";
+$lang->productplan->edit      = "編輯計劃";
+$lang->productplan->delete    = "刪除計劃";
+$lang->productplan->view      = "計劃詳情";
+$lang->productplan->linkStory       = "關聯需求";
+$lang->productplan->unlinkStory     = "移除需求";
+$lang->productplan->linkedStories   = '已關聯需求列表';
+$lang->productplan->unlinkedStories = '未關聯需求列表';
+
+$lang->productplan->confirmDelete      = "您確認刪除該計劃嗎？";
+$lang->productplan->confirmUnlinkStory = "您確認移除該需求嗎？";
+
+$lang->productplan->id      = '編號';
+$lang->productplan->product = '產品';
+$lang->productplan->title   = '名稱';
+$lang->productplan->desc    = '描述';
+$lang->productplan->begin   = '開始日期';
+$lang->productplan->end     = '結束日期';
--- a/trunk/module/project/lang/en.php
+++ b/trunk/module/project/lang/en.php
@@ -21,30 +21,8 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
+/* 字段列表。*/
 $lang->project->common       = '项目视图';
-$lang->project->index        = "项目首页";
-$lang->project->create       = "添加项目";
-$lang->project->delete       = "删除项目";
-$lang->project->browse       = "浏览项目";
-$lang->project->edit         = "编辑项目";
-$lang->project->manage       = "维护模块";
-$lang->project->view         = "基本信息";
-
-$lang->project->selectProject  = "请选择项目";
-$lang->project->manageMembers  = '团队管理';
-$lang->project->unlinkMember   = '移除';
-$lang->project->manageProducts = '关联产品';
-$lang->project->linkStory      = '关联需求';
-$lang->project->unlinkStory    = '移除需求';
-$lang->project->manageTasks    = '任务管理';
-$lang->project->linkTask       = '关联任务';
-$lang->project->manageChilds   = '关联子项目';
-$lang->project->confirmDelete  = '您确定删除项目[%s]吗？';
-$lang->project->confirmUnlinkMember = '您确定从该项目中移除该用户吗？';
-$lang->project->confirmUnlinkStory  = '您确定从该项目中移除该需求吗？';
-
-$lang->project->errorNoLinkedProducts = '该项目没有关联的产品，系统将转到产品关联页面';
-
 $lang->project->id           = '项目编号';
 $lang->project->company      = '所属公司';
 $lang->project->iscat        = '作为目录';
@@ -68,32 +46,82 @@ $lang->project->canceledDate = '取消日期';
 $lang->project->PO           = '产品负责人';
 $lang->project->PM           = '项目负责人';
 $lang->project->QM           = '测试负责人';
+$lang->project->acl          = '访问控制';
 $lang->project->teamname     = '团队名称';
-$lang->project->team         = '团队成员';
 $lang->project->products     = '相关产品';
 $lang->project->childProjects= '子项目';
-$lang->project->task         = '任务列表';
-$lang->project->story        = '需求列表';
-$lang->project->bug          = 'Bug列表';
-$lang->project->build        = 'Build列表';
-$lang->project->burn         = '燃烧图';
-$lang->project->burnData     = '燃烧图数据';
-
-$lang->project->beginAndEnd  = '起止时间';
-$lang->project->lblStats     = '工时统计';
-$lang->project->stats        = '总共预计『%s』工时<br />已经消耗『%s』工时<br />预计剩余『%s』工时';
-$lang->project->oneLineStats = "项目『%s』, 代号为『%s』, 相关产品为『%s』，『%s』开始，『%s』结束，总预计『%s』工时，已消耗『%s』工时，预计剩余『%s』工时。";
-
-$lang->project->statusList->wait  = '未开始';
-$lang->project->statusList->doing = '进行中';
-$lang->project->statusList->done  = '已完成';
+$lang->project->whitelist    = '分组白名单';

 $lang->team->account     = '用户';
 $lang->team->role        = '角色';
 $lang->team->joinDate    = '加盟日';
 $lang->team->workingHour = '工时/天';

-$lang->project->charts->burn->graph->caption      = "燃烧图";
+/* 字段取值列表。*/
+$lang->project->statusList['']      = '';
+$lang->project->statusList['wait']  = '未开始';
+$lang->project->statusList['doing'] = '进行中';
+$lang->project->statusList['done']  = '已完成';
+
+$lang->project->aclList['open']    = '默认设置(有项目视图权限，即可访问)';
+$lang->project->aclList['private'] = '私有项目(只有项目团队成员才能访问)';
+$lang->project->aclList['custom']  = '自定义白名单(团队成员和白名单的成员可以访问)';
+
+/* 方法列表。*/
+$lang->project->index          = "项目首页";
+$lang->project->task           = '任务列表';
+$lang->project->groupTask      = '分组浏览任务';
+$lang->project->story          = '需求列表';
+$lang->project->bug            = 'Bug列表';
+$lang->project->build          = 'Build列表';
+$lang->project->burn           = '燃尽图';
+$lang->project->computeBurn    = '更新燃尽图';
+$lang->project->burnData       = '燃尽图数据';
+$lang->project->team           = '团队成员';
+$lang->project->manageProducts = '关联产品';
+$lang->project->linkStory      = '关联需求';
+$lang->project->view           = "基本信息";
+$lang->project->create         = "添加项目";
+$lang->project->delete         = "删除项目";
+$lang->project->browse         = "浏览项目";
+$lang->project->edit           = "编辑项目";
+$lang->project->manageMembers  = '团队管理';
+$lang->project->unlinkMember   = '移除成员';
+$lang->project->unlinkStory    = '移除需求';
+$lang->project->importTask     = '导入之前未完';
+
+/* 分组浏览。*/
+$lang->project->listTask            = '列表方式';
+$lang->project->groupTaskByStory    = '需求分组';
+$lang->project->groupTaskByStatus   = '状态分组';
+$lang->project->groupTaskByPri      = '优先级分组';
+$lang->project->groupTaskByOwner    = '指派给分组';
+$lang->project->groupTaskByEstimate = '预计分组';
+$lang->project->groupTaskByConsumed = '已消耗分组';
+$lang->project->groupTaskByLeft     = '剩余分组';
+$lang->project->groupTaskByType     = '类型分组';
+$lang->project->groupTaskByDeadline = '截止分组';
+$lang->project->listTaskNeedConfrim = '需求变动';
+
+/* 页面提示。*/
+$lang->project->selectProject  = "请选择项目";
+$lang->project->beginAndEnd    = '起止时间';
+$lang->project->lblStats       = '工时统计';
+$lang->project->stats          = '总共预计『%s』工时<br />已经消耗『%s』工时<br />预计剩余『%s』工时';
+$lang->project->oneLineStats   = "项目『%s』, 代号为『%s』, 相关产品为『%s』，『%s』开始，『%s』结束，总预计『%s』工时，已消耗『%s』工时，预计剩余『%s』工时。";
+$lang->project->storySummary   = "共『%s』个需求，预计『%s』个工时。";
+$lang->project->wbs            = "分解任务";
+$lang->project->largeBurnChart = '点击查看大图';
+
+/* 交互提示。*/
+$lang->project->confirmDelete         = '您确定删除项目[%s]吗？';
+$lang->project->confirmUnlinkMember   = '您确定从该项目中移除该用户吗？';
+$lang->project->confirmUnlinkStory    = '您确定从该项目中移除该需求吗？';
+$lang->project->errorNoLinkedProducts = '该项目没有关联的产品，系统将转到产品关联页面';
+$lang->project->accessDenied          = '您无权访问该项目！';
+
+/* 统计。*/
+$lang->project->charts->burn->graph->caption      = "燃尽图";
 $lang->project->charts->burn->graph->xAxisName    = "日期";
 $lang->project->charts->burn->graph->yAxisName    = "HOUR";
 $lang->project->charts->burn->graph->baseFontSize = 12;
--- a/trunk/module/project/lang/zh-tw.php
+++ b/trunk/module/project/lang/zh-tw.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * The project module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     project
+ * @version     $Id: zh-tw.php 902 2010-07-04 06:25:03Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+/* 欄位列表。*/
+$lang->project->common       = '項目視圖';
+$lang->project->id           = '項目編號';
+$lang->project->company      = '所屬公司';
+$lang->project->iscat        = '作為目錄';
+$lang->project->type         = '項目類型';
+$lang->project->parent       = '上級項目';
+$lang->project->name         = '項目名稱';
+$lang->project->code         = '項目代號';
+$lang->project->begin        = '開始日期';
+$lang->project->end          = '結束日期';
+$lang->project->status       = '項目狀態';
+$lang->project->statge       = '所處階段';
+$lang->project->pri          = '優先順序';
+$lang->project->desc         = '項目描述';
+$lang->project->goal         = '項目目標';
+$lang->project->openedBy     = '由誰創建';
+$lang->project->openedDate   = '創建日期';
+$lang->project->closedBy     = '由誰關閉';
+$lang->project->closedDate   = '關閉日期';
+$lang->project->canceledBy   = '由誰取消';
+$lang->project->canceledDate = '取消日期';
+$lang->project->PO           = '產品負責人';
+$lang->project->PM           = '項目負責人';
+$lang->project->QM           = '測試負責人';
+$lang->project->acl          = '訪問控制';
+$lang->project->teamname     = '團隊名稱';
+$lang->project->products     = '相關產品';
+$lang->project->childProjects= '子項目';
+$lang->project->whitelist    = '分組白名單';
+
+$lang->team->account     = '用戶';
+$lang->team->role        = '角色';
+$lang->team->joinDate    = '加盟日';
+$lang->team->workingHour = '工時/天';
+
+/* 欄位取值列表。*/
+$lang->project->statusList['']      = '';
+$lang->project->statusList['wait']  = '未開始';
+$lang->project->statusList['doing'] = '進行中';
+$lang->project->statusList['done']  = '已完成';
+
+$lang->project->aclList['open']    = '預設設置(有項目視圖權限，即可訪問)';
+$lang->project->aclList['private'] = '私有項目(只有項目團隊成員才能訪問)';
+$lang->project->aclList['custom']  = '自定義白名單(團隊成員和白名單的成員可以訪問)';
+
+/* 方法列表。*/
+$lang->project->index          = "項目首頁";
+$lang->project->task           = '任務列表';
+$lang->project->groupTask      = '分組瀏覽任務';
+$lang->project->story          = '需求列表';
+$lang->project->bug            = 'Bug列表';
+$lang->project->build          = 'Build列表';
+$lang->project->burn           = '燃盡圖';
+$lang->project->computeBurn    = '更新燃盡圖';
+$lang->project->burnData       = '燃盡圖數據';
+$lang->project->team           = '團隊成員';
+$lang->project->manageProducts = '關聯產品';
+$lang->project->linkStory      = '關聯需求';
+$lang->project->view           = "基本信息";
+$lang->project->create         = "添加項目";
+$lang->project->delete         = "刪除項目";
+$lang->project->browse         = "瀏覽項目";
+$lang->project->edit           = "編輯項目";
+$lang->project->manageMembers  = '團隊管理';
+$lang->project->unlinkMember   = '移除成員';
+$lang->project->unlinkStory    = '移除需求';
+$lang->project->importTask     = '導入之前未完';
+
+/* 分組瀏覽。*/
+$lang->project->listTask            = '列表方式';
+$lang->project->groupTaskByStory    = '需求分組';
+$lang->project->groupTaskByStatus   = '狀態分組';
+$lang->project->groupTaskByPri      = '優先順序分組';
+$lang->project->groupTaskByOwner    = '指派給分組';
+$lang->project->groupTaskByEstimate = '預計分組';
+$lang->project->groupTaskByConsumed = '已消耗分組';
+$lang->project->groupTaskByLeft     = '剩餘分組';
+$lang->project->groupTaskByType     = '類型分組';
+$lang->project->groupTaskByDeadline = '截止分組';
+$lang->project->listTaskNeedConfrim = '需求變動';
+
+/* 頁面提示。*/
+$lang->project->selectProject  = "請選擇項目";
+$lang->project->beginAndEnd    = '起止時間';
+$lang->project->lblStats       = '工時統計';
+$lang->project->stats          = '總共預計『%s』工時<br />已經消耗『%s』工時<br />預計剩餘『%s』工時';
+$lang->project->oneLineStats   = "項目『%s』, 代號為『%s』, 相關產品為『%s』，『%s』開始，『%s』結束，總預計『%s』工時，已消耗『%s』工時，預計剩餘『%s』工時。";
+$lang->project->storySummary   = "共『%s』個需求，預計『%s』個工時。";
+$lang->project->wbs            = "分解任務";
+$lang->project->largeBurnChart = '點擊查看大圖';
+
+/* 交互提示。*/
+$lang->project->confirmDelete         = '您確定刪除項目[%s]嗎？';
+$lang->project->confirmUnlinkMember   = '您確定從該項目中移除該用戶嗎？';
+$lang->project->confirmUnlinkStory    = '您確定從該項目中移除該需求嗎？';
+$lang->project->errorNoLinkedProducts = '該項目沒有關聯的產品，系統將轉到產品關聯頁面';
+$lang->project->accessDenied          = '您無權訪問該項目！';
+
+/* 統計。*/
+$lang->project->charts->burn->graph->caption      = "燃盡圖";
+$lang->project->charts->burn->graph->xAxisName    = "日期";
+$lang->project->charts->burn->graph->yAxisName    = "HOUR";
+$lang->project->charts->burn->graph->baseFontSize = 12;
+$lang->project->charts->burn->graph->formatNumber = 0;
+$lang->project->charts->burn->graph->animation    = 0;
+$lang->project->charts->burn->graph->rotateNames  = 1;
--- a/trunk/module/qa/lang/zh-tw.php
+++ b/trunk/module/qa/lang/zh-tw.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * The qa module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     company
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->qa->common  = 'QA視圖';
+$lang->qa->index   = "QA首頁";
--- a/trunk/module/release/lang/zh-tw.php
+++ b/trunk/module/release/lang/zh-tw.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * The release module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     release
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->release->common    = '發佈';
+$lang->release->create    = "創建發佈";
+$lang->release->edit      = "編輯發佈";
+$lang->release->delete    = "刪除發佈";
+$lang->release->view      = "發佈詳情";
+$lang->release->browse    = "瀏覽發佈";
+
+$lang->release->confirmDelete = "您確認刪除該release嗎？";
+
+$lang->release->id        = 'ID';
+$lang->release->product   = '產品';
+$lang->release->build     = 'Build';
+$lang->release->name      = '發佈名稱';
+$lang->release->date      = '發佈日期';
+$lang->release->desc      = '描述';
--- a/trunk/module/report/lang/en.php
+++ b/trunk/module/report/lang/en.php
@@ -21,4 +21,21 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
-$lang->report->common = '报表';
+$lang->report->common     = '报表';
+$lang->report->item       = '条目';
+$lang->report->value      = '值';
+$lang->report->percent    = '百分比';
+$lang->report->undefined  = '未设定';
+
+$lang->report->colors[]   = 'AFD8F8';
+$lang->report->colors[]   = 'F6BD0F';
+$lang->report->colors[]   = '8BBA00';
+$lang->report->colors[]   = 'FF8E46';
+$lang->report->colors[]   = '008E8E';
+$lang->report->colors[]   = 'D64646';
+$lang->report->colors[]   = '8E468E';
+$lang->report->colors[]   = '588526';
+$lang->report->colors[]   = 'B3AA00';
+$lang->report->colors[]   = '008ED6';
+$lang->report->colors[]   = '9D080D';
+$lang->report->colors[]   = 'A186BE';
--- a/trunk/module/report/lang/zh-tw.php
+++ b/trunk/module/report/lang/zh-tw.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * The report module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     report
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->report->common     = '報表';
+$lang->report->item       = '條目';
+$lang->report->value      = '值';
+$lang->report->percent    = '百分比';
+$lang->report->undefined  = '未設定';
+
+$lang->report->colors[]   = 'AFD8F8';
+$lang->report->colors[]   = 'F6BD0F';
+$lang->report->colors[]   = '8BBA00';
+$lang->report->colors[]   = 'FF8E46';
+$lang->report->colors[]   = '008E8E';
+$lang->report->colors[]   = 'D64646';
+$lang->report->colors[]   = '8E468E';
+$lang->report->colors[]   = '588526';
+$lang->report->colors[]   = 'B3AA00';
+$lang->report->colors[]   = '008ED6';
+$lang->report->colors[]   = '9D080D';
+$lang->report->colors[]   = 'A186BE';
--- a/trunk/module/search/lang/en.php
+++ b/trunk/module/search/lang/en.php
@@ -21,24 +21,34 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
-$lang->search->common    = '搜索';
-$lang->search->reset     = '重填';
-$lang->search->more      = '更多';
-$lang->search->lite      = '简洁';
-$lang->search->saveQuery = '保存';
-$lang->search->myQuery   = '我的查询';
-$lang->search->group1    = '第一组';
-$lang->search->group2    = '第二组';
-$lang->search->buildForm = '搜索表单';
-$lang->search->buildQuery= '执行搜索';
+$lang->search->common        = '搜索';
+$lang->search->reset         = '重置';
+$lang->search->more          = '更多';
+$lang->search->lite          = '简洁';
+$lang->search->saveQuery     = '保存';
+$lang->search->myQuery       = '我的查询';
+$lang->search->group1        = '第一组';
+$lang->search->group2        = '第二组';
+$lang->search->buildForm     = '搜索表单';
+$lang->search->buildQuery    = '执行搜索';
+$lang->search->saveQuery     = '保存查询';
+$lang->search->deleteQuery   = '删除查询';
+$lang->search->setQueryTitle = '请输入查询标题（保存之前请先查询）：';

-$lang->search->operators['=']       = '等于';
-$lang->search->operators['!=']      = '不等于';
-$lang->search->operators['>']       = '大于';
-$lang->search->operators['>=']      = '大于等于';
-$lang->search->operators['<']       = '小于';
-$lang->search->operators['<=']      = '小于等于';
+$lang->search->operators['=']       = '=';
+$lang->search->operators['!=']      = '!=';
+$lang->search->operators['>']       = '>';
+$lang->search->operators['>=']      = '>=';
+$lang->search->operators['<']       = '<';
+$lang->search->operators['<=']      = '<=';
 $lang->search->operators['include'] = '包含';

 $lang->search->andor['and']         = '并且';
 $lang->search->andor['or']          = '或者';
+
+$lang->search->null = '空';
+
+$lang->userquery->title     = '查询标题';
+$lang->userquery->myQueries = '我的查询';
+$lang->userquery->execut    = '执行';
+$lang->userquery->delete    = '删除';
--- a/trunk/module/search/lang/zh-tw.php
+++ b/trunk/module/search/lang/zh-tw.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * The search module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     search
+ * @version     $Id: zh-tw.php 917 2010-07-06 01:50:33Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->search->common        = '搜索';
+$lang->search->reset         = '重置';
+$lang->search->more          = '更多';
+$lang->search->lite          = '簡潔';
+$lang->search->saveQuery     = '保存';
+$lang->search->myQuery       = '我的查詢';
+$lang->search->group1        = '第一組';
+$lang->search->group2        = '第二組';
+$lang->search->buildForm     = '搜索表單';
+$lang->search->buildQuery    = '執行搜索';
+$lang->search->saveQuery     = '保存查詢';
+$lang->search->deleteQuery   = '刪除查詢';
+$lang->search->setQueryTitle = '請輸入查詢標題（保存之前請先查詢）：';
+
+$lang->search->operators['=']       = '=';
+$lang->search->operators['!=']      = '!=';
+$lang->search->operators['>']       = '>';
+$lang->search->operators['>=']      = '>=';
+$lang->search->operators['<']       = '<';
+$lang->search->operators['<=']      = '<=';
+$lang->search->operators['include'] = '包含';
+
+$lang->search->andor['and']         = '並且';
+$lang->search->andor['or']          = '或者';
+
+$lang->search->null = '空';
+
+$lang->userquery->title     = '查詢標題';
+$lang->userquery->myQueries = '我的查詢';
+$lang->userquery->execut    = '執行';
+$lang->userquery->delete    = '刪除';
--- a/trunk/module/story/lang/en.php
+++ b/trunk/module/story/lang/en.php
@@ -21,61 +21,67 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
-$lang->story->browse    = "Story表";
-$lang->story->create    = "Add Story";
-$lang->story->change    = "Change";
-$lang->story->review    = 'Review';
-$lang->story->edit      = "Edit";
-$lang->story->close     = 'Close';
-$lang->story->activate  = 'Activate';
-$lang->story->delete    = "Delete";
-$lang->story->view      = "View";
-$lang->story->tasks     = "Tasks";
+$lang->story->browse    = "需求列表";
+$lang->story->create    = "新增需求";
+$lang->story->change    = "变更";
+$lang->story->changed   = '需求变更';
+$lang->story->review    = '评审';
+$lang->story->edit      = "编辑需求";
+$lang->story->close     = '关闭';
+$lang->story->activate  = '激活';
+$lang->story->delete    = "删除需求";
+$lang->story->view      = "需求详情";
+$lang->story->tasks     = "相关任务";
+$lang->story->taskCount = '任务数';
 $lang->story->bugs      = "Bug";
-$lang->story->linkStory = 'Link Story';
+$lang->story->linkStory = '关联需求';

-$lang->story->common         = 'Story';
-$lang->story->id             = 'ID';
-$lang->story->product        = 'Product';
-$lang->story->module         = 'Module';
-$lang->story->release        = 'Release';
-$lang->story->bug            = 'Bug';
-$lang->story->title          = 'Title';
-$lang->story->spec           = 'Spec';
-$lang->story->type           = 'Type';
-$lang->story->pri            = 'PRI';
-$lang->story->estimate       = 'Estimate';
-$lang->story->status         = 'Status';
-$lang->story->stage          = 'Stage';
-$lang->story->mailto         = 'CC';
-$lang->story->openedBy       = 'Opened By';
-$lang->story->openedDate     = 'Opened Date';
-$lang->story->assignedTo     = 'Assigned To';
-$lang->story->assignedDate   = 'Assigned Date';
-$lang->story->lastEditedBy   = 'Last Edited By';
-$lang->story->lastEditedDate = 'Last Edited Date';
-$lang->story->lastEdited     = 'Laste Edited';
-$lang->story->closedBy       = 'Closed By';
-$lang->story->closedDate     = 'Closed Date';
-$lang->story->closedReason   = 'Closed Reason';
-$lang->story->rejectedReason = 'Rejected Reason';
-$lang->story->reviewedBy     = 'Reviewed By';
-$lang->story->reviewedDate   = 'Reviewed Date';
-$lang->story->version        = 'Version';
-$lang->story->project        = 'Project';
-$lang->story->plan           = 'Plan';
-$lang->story->comment        = 'Comment';
-$lang->story->linkStories    = 'Related Story';
-$lang->story->childStories   = 'Child Story';
-$lang->story->duplicateStory = 'Duplicate Story';
-$lang->story->reviewResult   = 'Review Result';
-$lang->story->preVersion     = 'Previous Version';
+$lang->story->common         = '需求';
+$lang->story->id             = '编号';
+$lang->story->product        = '所属产品';
+$lang->story->module         = '所属模块';
+$lang->story->release        = '发布计划';
+$lang->story->bug            = '相关bug';
+$lang->story->title          = '需求名称';
+$lang->story->spec           = '需求描述';
+$lang->story->type           = '需求类型 ';
+$lang->story->pri            = '优先级';
+$lang->story->estimate       = '预计工时';
+$lang->story->estimateAB     = '预计';
+$lang->story->status         = '当前状态';
+$lang->story->stage          = '所处阶段';
+$lang->story->stageAB        = '阶段';
+$lang->story->mailto         = '抄送给';
+$lang->story->openedBy       = '由谁创建';
+$lang->story->openedDate     = '创建日期';
+$lang->story->assignedTo     = '指派给';
+$lang->story->assignedDate   = '指派日期';
+$lang->story->lastEditedBy   = '最后修改';
+$lang->story->lastEditedDate = '最后修改日期';
+$lang->story->lastEdited     = '最后修改';
+$lang->story->closedBy       = '由谁关闭';
+$lang->story->closedDate     = '关闭日期';
+$lang->story->closedReason   = '关闭原因';
+$lang->story->rejectedReason = '拒绝原因';
+$lang->story->reviewedBy     = '由谁评审';
+$lang->story->reviewedDate   = '评审时间';
+$lang->story->version        = '版本号';
+$lang->story->project        = '所属项目';
+$lang->story->plan           = '所属计划';
+$lang->story->planAB         = '计划';
+$lang->story->comment        = '备注';
+$lang->story->linkStories    = '相关需求';
+$lang->story->childStories   = '细分需求';
+$lang->story->duplicateStory = '重复需求';
+$lang->story->reviewResult   = '评审结果';
+$lang->story->preVersion     = '之前版本';
+$lang->story->keywords       = '关键词';

 $lang->story->statusList['']          = '';
-$lang->story->statusList['draft']     = 'Draft';
-$lang->story->statusList['active']    = 'Active';
-$lang->story->statusList['closed']    = 'Closed';
-$lang->story->statusList['changed']   = 'Changed';
+$lang->story->statusList['draft']     = '草稿';
+$lang->story->statusList['active']    = '激活';
+$lang->story->statusList['closed']    = '已关闭';
+$lang->story->statusList['changed']   = '已变更';

 $lang->story->stageList['']           = '';
 $lang->story->stageList['wait']       = '未开始';
@@ -104,33 +110,47 @@ $lang->story->reviewResultList['revert'] = '撤销变更';
 $lang->story->reviewResultList['clarify']= '有待明确';
 $lang->story->reviewResultList['reject'] = '拒绝';

-$lang->story->priList[3]  = '一般';
-$lang->story->priList[1]  = '最高';
-$lang->story->priList[2]  = '较高';
-$lang->story->priList[4]  = '最低';
+$lang->story->priList[]   = '';
+$lang->story->priList[3]  = '3';
+$lang->story->priList[1]  = '1';
+$lang->story->priList[2]  = '2';
+$lang->story->priList[4]  = '4';

 $lang->story->legendBasicInfo      = '基本信息';
-$lang->story->legendLifeTime       = 'Story的一生';
+$lang->story->legendLifeTime       = '需求的一生';
 $lang->story->legendRelated        = '相关信息';
 $lang->story->legendMailto         = '抄送给';
 $lang->story->legendAttatch        = '附件';
 $lang->story->legendProjectAndTask = '项目任务';
-$lang->story->legendLinkStories    = '相关Story';
-$lang->story->legendChildStories   = '细分Story';
-$lang->story->legendSpec           = 'Story描述';
+$lang->story->legendLinkStories    = '相关需求';
+$lang->story->legendChildStories   = '细分需求';
+$lang->story->legendSpec           = '需求描述';
 $lang->story->legendHistory        = '历史记录';
 $lang->story->legendVersion        = '历史版本';
 $lang->story->legendMisc           = '其他相关';

-$lang->story->specTemplate          = "建议参考的模板：<br />作为一名<<i class='red'>某种类型的用户</i>><br />我希望<<i class='red'>达成某些目的</i>><br />这样可以<<i class='red'>开发的价值</i>>";
+$lang->story->lblChange            = '变更需求';
+$lang->story->lblReview            = '评审需求';
+$lang->story->lblActivate          = '激活需求';
+$lang->story->lblClose             = '关闭需求';
+
+$lang->story->affectedProjects     = '影响的项目';
+$lang->story->affectedBugs         = '影响的Bug';
+$lang->story->affectedCases        = '影响的用例';
+
+$lang->story->specTemplate          = "建议参考的模板：作为一名<<i class='red'>某种类型的用户</i>>，我希望<<i class='red'>达成某些目的</i>>，这样可以<<i class='red'>开发的价值</i>>。";
 $lang->story->needNotReview         = '不需要评审';
-$lang->story->confirmDelete         = "您确认删除该Story吗?";
-$lang->story->errorFormat           = 'Story数据有误';
+$lang->story->confirmDelete         = "您确认删除该需求吗?";
+$lang->story->errorFormat           = '需求数据有误';
 $lang->story->errorEmptyTitle       = '标题不能为空';
 $lang->story->mustChooseResult      = '必须选择评审结果';
 $lang->story->mustChoosePreVersion  = '必须选择回溯的版本';
-$lang->story->ajaxGetProjectStories = '接口:获取项目Story列表';
-$lang->story->ajaxGetProductStories = '接口:获取产品Story列表';
+$lang->story->ajaxGetProjectStories = '接口:获取项目需求列表';
+$lang->story->ajaxGetProductStories = '接口:获取产品需求列表';

-$lang->story->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => $lang->story->reviewResultList);
-$lang->story->action->closed   = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong>。', 'extra' => $lang->story->reasonList);
+$lang->story->action->reviewed            = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => $lang->story->reviewResultList);
+$lang->story->action->closed              = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong>。', 'extra' => $lang->story->reasonList);
+$lang->story->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 关联到计划 <strong>$extra</strong>。'); 
+$lang->story->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 从计划 <strong>$extra</strong> 移除。'); 
+$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 关联到项目 <strong>$extra</strong>。'); 
+$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。'); 
--- a/trunk/module/story/lang/zh-tw.php
+++ b/trunk/module/story/lang/zh-tw.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * The story module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     story
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->story->browse    = "需求列表";
+$lang->story->create    = "新增需求";
+$lang->story->change    = "變更";
+$lang->story->changed   = '需求變更';
+$lang->story->review    = '評審';
+$lang->story->edit      = "編輯需求";
+$lang->story->close     = '關閉';
+$lang->story->activate  = '激活';
+$lang->story->delete    = "刪除需求";
+$lang->story->view      = "需求詳情";
+$lang->story->tasks     = "相關任務";
+$lang->story->taskCount = '任務數';
+$lang->story->bugs      = "Bug";
+$lang->story->linkStory = '關聯需求';
+
+$lang->story->common         = '需求';
+$lang->story->id             = '編號';
+$lang->story->product        = '所屬產品';
+$lang->story->module         = '所屬模組';
+$lang->story->release        = '發佈計劃';
+$lang->story->bug            = '相關bug';
+$lang->story->title          = '需求名稱';
+$lang->story->spec           = '需求描述';
+$lang->story->type           = '需求類型 ';
+$lang->story->pri            = '優先順序';
+$lang->story->estimate       = '預計工時';
+$lang->story->estimateAB     = '預計';
+$lang->story->status         = '當前狀態';
+$lang->story->stage          = '所處階段';
+$lang->story->stageAB        = '階段';
+$lang->story->mailto         = '抄送給';
+$lang->story->openedBy       = '由誰創建';
+$lang->story->openedDate     = '創建日期';
+$lang->story->assignedTo     = '指派給';
+$lang->story->assignedDate   = '指派日期';
+$lang->story->lastEditedBy   = '最後修改';
+$lang->story->lastEditedDate = '最後修改日期';
+$lang->story->lastEdited     = '最後修改';
+$lang->story->closedBy       = '由誰關閉';
+$lang->story->closedDate     = '關閉日期';
+$lang->story->closedReason   = '關閉原因';
+$lang->story->rejectedReason = '拒絶原因';
+$lang->story->reviewedBy     = '由誰評審';
+$lang->story->reviewedDate   = '評審時間';
+$lang->story->version        = '版本號';
+$lang->story->project        = '所屬項目';
+$lang->story->plan           = '所屬計劃';
+$lang->story->planAB         = '計劃';
+$lang->story->comment        = '備註';
+$lang->story->linkStories    = '相關需求';
+$lang->story->childStories   = '細分需求';
+$lang->story->duplicateStory = '重複需求';
+$lang->story->reviewResult   = '評審結果';
+$lang->story->preVersion     = '之前版本';
+$lang->story->keywords       = '關鍵詞';
+
+$lang->story->statusList['']          = '';
+$lang->story->statusList['draft']     = '草稿';
+$lang->story->statusList['active']    = '激活';
+$lang->story->statusList['closed']    = '已關閉';
+$lang->story->statusList['changed']   = '已變更';
+
+$lang->story->stageList['']           = '';
+$lang->story->stageList['wait']       = '未開始';
+$lang->story->stageList['planned']    = '已計劃';
+$lang->story->stageList['projected']  = '已立項';
+$lang->story->stageList['developing'] = '研發中';
+$lang->story->stageList['developed']  = '研發完畢';
+$lang->story->stageList['testing']    = '測試中';
+$lang->story->stageList['tested']     = '測試完畢';
+$lang->story->stageList['verified']   = '已驗收';
+$lang->story->stageList['released']   = '已發佈';
+
+$lang->story->reasonList['']           = '';
+$lang->story->reasonList['done']       = '已完成';
+$lang->story->reasonList['subdivided'] = '已細分';
+$lang->story->reasonList['duplicate']  = '重複';
+$lang->story->reasonList['postponed']  = '延期';
+$lang->story->reasonList['willnotdo']  = '不做';
+$lang->story->reasonList['cancel']     = '已取消';
+$lang->story->reasonList['bydesign']   = '設計如此';
+//$lang->story->reasonList['isbug']      = '是個Bug';
+
+$lang->story->reviewResultList['']       = '';
+$lang->story->reviewResultList['pass']   = '確認通過';
+$lang->story->reviewResultList['revert'] = '撤銷變更';
+$lang->story->reviewResultList['clarify']= '有待明確';
+$lang->story->reviewResultList['reject'] = '拒絶';
+
+$lang->story->priList[]   = '';
+$lang->story->priList[3]  = '3';
+$lang->story->priList[1]  = '1';
+$lang->story->priList[2]  = '2';
+$lang->story->priList[4]  = '4';
+
+$lang->story->legendBasicInfo      = '基本信息';
+$lang->story->legendLifeTime       = '需求的一生';
+$lang->story->legendRelated        = '相關信息';
+$lang->story->legendMailto         = '抄送給';
+$lang->story->legendAttatch        = '附件';
+$lang->story->legendProjectAndTask = '項目任務';
+$lang->story->legendLinkStories    = '相關需求';
+$lang->story->legendChildStories   = '細分需求';
+$lang->story->legendSpec           = '需求描述';
+$lang->story->legendHistory        = '歷史記錄';
+$lang->story->legendVersion        = '歷史版本';
+$lang->story->legendMisc           = '其他相關';
+
+$lang->story->lblChange            = '變更需求';
+$lang->story->lblReview            = '評審需求';
+$lang->story->lblActivate          = '激活需求';
+$lang->story->lblClose             = '關閉需求';
+
+$lang->story->affectedProjects     = '影響的項目';
+$lang->story->affectedBugs         = '影響的Bug';
+$lang->story->affectedCases        = '影響的用例';
+
+$lang->story->specTemplate          = "建議參考的模板：作為一名<<i class='red'>某種類型的用戶</i>>，我希望<<i class='red'>達成某些目的</i>>，這樣可以<<i class='red'>開發的價值</i>>。";
+$lang->story->needNotReview         = '不需要評審';
+$lang->story->confirmDelete         = "您確認刪除該需求嗎?";
+$lang->story->errorFormat           = '需求數據有誤';
+$lang->story->errorEmptyTitle       = '標題不能為空';
+$lang->story->mustChooseResult      = '必須選擇評審結果';
+$lang->story->mustChoosePreVersion  = '必須選擇回溯的版本';
+$lang->story->ajaxGetProjectStories = '介面:獲取項目需求列表';
+$lang->story->ajaxGetProductStories = '介面:獲取產品需求列表';
+
+$lang->story->action->reviewed            = array('main' => '$date, 由 <strong>$actor</strong> 記錄評審結果，結果為 <strong>$extra</strong>。', 'extra' => $lang->story->reviewResultList);
+$lang->story->action->closed              = array('main' => '$date, 由 <strong>$actor</strong> 關閉，原因為 <strong>$extra</strong>。', 'extra' => $lang->story->reasonList);
+$lang->story->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 關聯到計劃 <strong>$extra</strong>。'); 
+$lang->story->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 從計劃 <strong>$extra</strong> 移除。'); 
+$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 關聯到項目 <strong>$extra</strong>。'); 
+$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 從項目 <strong>$extra</strong> 移除。'); 
--- a/trunk/module/task/lang/en.php
+++ b/trunk/module/task/lang/en.php
@@ -27,6 +27,13 @@ $lang->task->import    = "导入之前未完任务";
 $lang->task->edit      = "更新任务";
 $lang->task->delete    = "删除任务";
 $lang->task->view      = "查看任务";
+$lang->task->logEfforts= "记录工时";
+$lang->task->start     = "开始任务";
+$lang->task->complete  = "完成任务";
+$lang->task->close     = "关闭任务";
+$lang->task->cancel    = "取消任务";
+$lang->task->activate  = "激活任务";
+$lang->task->confirmStoryChange = "确认需求变动";

 $lang->task->common       = '任务';
 $lang->task->id           = '编号';
@@ -37,17 +44,23 @@ $lang->task->name         = '任务名称';
 $lang->task->type         = '任务类型';
 $lang->task->pri          = '优先级';
 $lang->task->owner        = '指派给';
+$lang->task->mailto       = '抄送给';
 $lang->task->estimate     = '最初预计';
+$lang->task->estimateAB   = '预计';
 $lang->task->left         = '预计剩余';
-$lang->task->consumed     = '已消耗';
+$lang->task->leftAB       = '剩余';
+$lang->task->consumed     = '已经消耗';
+$lang->task->consumedAB   = '消耗';
+$lang->task->deadline     = '截止日期';
+$lang->task->deadlineAB   = '截止';
 $lang->task->status       = '任务状态';
 $lang->task->desc         = '任务描述';
 $lang->task->statusCustom = '状态排序';

-$lang->task->statusList->wait  = '未开始';
-$lang->task->statusList->doing = '进行中';
-$lang->task->statusList->done  = '已完成';
-$lang->task->statusList->cancel= '已取消';
+$lang->task->statusList['wait']    = '未开始';
+$lang->task->statusList['doing']   = '进行中';
+$lang->task->statusList['done']    = '已完成';
+$lang->task->statusList['cancel']  = '已取消';

 $lang->task->typeList[''] = '';
 $lang->task->typeList['design'] = '设计';
@@ -56,21 +69,31 @@ $lang->task->typeList['test']   = '测试';
 $lang->task->typeList['study']  = '研究';
 $lang->task->typeList['discuss']= '讨论';
 $lang->task->typeList['ui']     = '界面';
+$lang->task->typeList['affair'] = '事务';
 $lang->task->typeList['misc']   = '其他';

-$lang->task->priList[3]  = '一般';
-$lang->task->priList[1]  = '最高';
-$lang->task->priList[2]  = '较高';
-$lang->task->priList[4]  = '最低';
+$lang->task->priList[0] = '';
+$lang->task->priList[3]  = '3';
+$lang->task->priList[1]  = '1';
+$lang->task->priList[2]  = '2';
+$lang->task->priList[4]  = '4';

 $lang->task->afterChoices['continueAdding'] = '继续为该需求添加任务';
 $lang->task->afterChoices['toTastList']     = '返回任务列表';
 $lang->task->afterChoices['toStoryList']    = '返回需求列表';

 $lang->task->buttonEdit       = '编辑';
+$lang->task->buttonClose      = '关闭';
+$lang->task->buttonCancel     = '取消';
+$lang->task->buttonActivate   = '激活';
+$lang->task->buttonLogEfforts = '记录工时';
+$lang->task->buttonDelete     = '删除';
 $lang->task->buttonBackToList = '返回';
+$lang->task->buttonStart      = '开始';
+$lang->task->buttonDone       = '完成';

 $lang->task->legendBasic  = '基本信息';
+$lang->task->legendEffort = '工时信息';
 $lang->task->legendDesc   = '任务描述';
 $lang->task->legendAction = '操作';

@@ -80,3 +103,4 @@ $lang->task->confirmDelete       = "您确定要删除这个任务吗？";
 $lang->task->copyStoryTitle      = "同需求";
 $lang->task->afterSubmit         = "添加之后";
 $lang->task->successSaved        = "成功添加，";
+$lang->task->delayWarning        = " <strong class='delayed f-14px'> 延期%s天 </strong>";
--- a/trunk/module/task/lang/zh-tw.php
+++ b/trunk/module/task/lang/zh-tw.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * The task module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     task
+ * @version     $Id: zh-tw.php 948 2010-07-16 09:02:20Z yuren_@126.com $
+ * @link        http://www.zentaoms.com
+ */
+$lang->task->index     = "任務一覽";
+$lang->task->create    = "新增任務";
+$lang->task->import    = "導入之前未完任務";
+$lang->task->edit      = "更新任務";
+$lang->task->delete    = "刪除任務";
+$lang->task->view      = "查看任務";
+$lang->task->logEfforts= "記錄工時";
+$lang->task->start     = "開始任務";
+$lang->task->complete  = "完成任務";
+$lang->task->close     = "關閉任務";
+$lang->task->cancel    = "取消任務";
+$lang->task->activate  = "激活任務";
+$lang->task->confirmStoryChange = "確認需求變動";
+
+$lang->task->common       = '任務';
+$lang->task->id           = '編號';
+$lang->task->project      = '所屬項目';
+$lang->task->story        = '相關需求';
+$lang->task->storyVersion = '需求版本';
+$lang->task->name         = '任務名稱';
+$lang->task->type         = '任務類型';
+$lang->task->pri          = '優先順序';
+$lang->task->owner        = '指派給';
+$lang->task->mailto       = '抄送給';
+$lang->task->estimate     = '最初預計';
+$lang->task->estimateAB   = '預計';
+$lang->task->left         = '預計剩餘';
+$lang->task->leftAB       = '剩餘';
+$lang->task->consumed     = '已經消耗';
+$lang->task->consumedAB   = '消耗';
+$lang->task->deadline     = '截止日期';
+$lang->task->deadlineAB   = '截止';
+$lang->task->status       = '任務狀態';
+$lang->task->desc         = '任務描述';
+$lang->task->statusCustom = '狀態排序';
+
+$lang->task->statusList['wait']    = '未開始';
+$lang->task->statusList['doing']   = '進行中';
+$lang->task->statusList['done']    = '已完成';
+$lang->task->statusList['cancel']  = '已取消';
+
+$lang->task->typeList[''] = '';
+$lang->task->typeList['design'] = '設計';
+$lang->task->typeList['devel']  = '開發';
+$lang->task->typeList['test']   = '測試';
+$lang->task->typeList['study']  = '研究';
+$lang->task->typeList['discuss']= '討論';
+$lang->task->typeList['ui']     = '界面';
+$lang->task->typeList['affair'] = '事務';
+$lang->task->typeList['misc']   = '其他';
+
+$lang->task->priList[0] = '';
+$lang->task->priList[3]  = '3';
+$lang->task->priList[1]  = '1';
+$lang->task->priList[2]  = '2';
+$lang->task->priList[4]  = '4';
+
+$lang->task->afterChoices['continueAdding'] = '繼續為該需求添加任務';
+$lang->task->afterChoices['toTastList']     = '返回任務列表';
+$lang->task->afterChoices['toStoryList']    = '返回需求列表';
+
+$lang->task->buttonEdit       = '編輯';
+$lang->task->buttonClose      = '關閉';
+$lang->task->buttonCancel     = '取消';
+$lang->task->buttonActivate   = '激活';
+$lang->task->buttonLogEfforts = '記錄工時';
+$lang->task->buttonDelete     = '刪除';
+$lang->task->buttonBackToList = '返回';
+$lang->task->buttonStart      = '開始';
+$lang->task->buttonDone       = '完成';
+
+$lang->task->legendBasic  = '基本信息';
+$lang->task->legendEffort = '工時信息';
+$lang->task->legendDesc   = '任務描述';
+$lang->task->legendAction = '操作';
+
+$lang->task->ajaxGetUserTasks    = "介面:我的任務";
+$lang->task->ajaxGetProjectTasks = "介面:項目任務";
+$lang->task->confirmDelete       = "您確定要刪除這個任務嗎？";
+$lang->task->copyStoryTitle      = "同需求";
+$lang->task->afterSubmit         = "添加之後";
+$lang->task->successSaved        = "成功添加，";
+$lang->task->delayWarning        = " <strong class='delayed f-14px'> 延期%s天 </strong>";
--- a/trunk/module/testcase/lang/en.php
+++ b/trunk/module/testcase/lang/en.php
@@ -40,6 +40,17 @@ $lang->testcase->lastEditedDate = '最后修改日期';
 $lang->testcase->version        = '用例版本';
 $lang->testcase->result         = '测试结果';
 $lang->testcase->real           = '实际情况';
+$lang->testcase->keywords       = '关键词';
+$lang->testcase->files          = '附件';
+$lang->testcase->howRun         = '执行方式';
+$lang->testcase->scriptedBy     = '由谁编写';
+$lang->testcase->scriptedDate   = '编写日期';
+$lang->testcase->scriptedStatus = '脚本状态';
+$lang->testcase->scriptedLocation = '脚本位置';
+$lang->testcase->linkCase         = '相关用例';
+$lang->testcase->stage            = '适用阶段';
+$lang->testcase->lastEditedByAB   = '修改者';
+$lang->testcase->lastEditedDateAB = '修改日期';
 $lang->case = $lang->testcase;  // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。

 $lang->testcase->stepID     = '编号';
@@ -52,7 +63,9 @@ $lang->testcase->create         = "创建用例";
 $lang->testcase->delete         = "删除用例";
 $lang->testcase->view           = "用例详情";
 $lang->testcase->edit           = "编辑用例";
+$lang->testcase->delete         = "删除用例";
 $lang->testcase->browse         = "用例列表";
+$lang->testcase->confirmStoryChange = '确认需求变动';

 $lang->testcase->deleteStep     = 'ｘ';
 $lang->testcase->insertBefore   = '＋↑';
@@ -63,6 +76,7 @@ $lang->testcase->byModule       = '按模块';
 $lang->testcase->assignToMe     = '指派给我';
 $lang->testcase->openedByMe     = '由我创建';
 $lang->testcase->allCases       = '所有Case';
+$lang->testcase->needConfirm    = '需求有变动的用例';
 $lang->testcase->moduleCases    = '按模块浏览';
 $lang->testcase->bySearch       = '搜索';

@@ -88,6 +102,8 @@ $lang->testcase->legendComment     = '备注';
 $lang->testcase->legendProduct     = '产品模块';
 $lang->testcase->legendVersion     = '版本历史';

+$lang->testcase->confirmDelete     = '您确认要删除该测试用例吗？';
+
 $lang->testcase->priList[3] = 3;
 $lang->testcase->priList[1] = 1;
 $lang->testcase->priList[2] = 2;
@@ -97,10 +113,23 @@ $lang->testcase->priList[4] = 4;
 $lang->testcase->typeList['']            = '';
 $lang->testcase->typeList['feature']     = '功能测试';
 $lang->testcase->typeList['performance'] = '性能测试';
+$lang->testcase->typeList['config']      = '配置相关';
+$lang->testcase->typeList['install']     = '安装部署';
+$lang->testcase->typeList['security']    = '安全相关';
+$lang->testcase->typeList['other']       = '其他';

-$lang->testcase->statusList['']         = '';
-$lang->testcase->statusList['normal']   = '正常';
-$lang->testcase->statusList['blocked']  = 'Blocked';
+$lang->testcase->stageList['']            = '';
+$lang->testcase->stageList['unittest']    = '单元测试阶段';
+$lang->testcase->stageList['feature']     = '功能测试阶段';
+$lang->testcase->stageList['intergrate']  = '集成测试阶段';
+$lang->testcase->stageList['system']      = '系统测试阶段';
+$lang->testcase->stageList['smoke']       = '冒烟测试阶段';
+$lang->testcase->stageList['bvt']         = '版本验证阶段';
+
+$lang->testcase->statusList['']            = '';
+$lang->testcase->statusList['normal']      = '正常';
+$lang->testcase->statusList['blocked']     = '被阻塞';
+$lang->testcase->statusList['investigate'] = '研究中';

 $lang->testcase->resultList['n/a']     = 'N/A';
 $lang->testcase->resultList['pass']    = '通过';
--- a/trunk/module/testcase/lang/zh-tw.php
+++ b/trunk/module/testcase/lang/zh-tw.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * The testcase module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     testcase
+ * @version     $Id: zh-tw.php 949 2010-07-17 05:39:30Z yuren_@126.com $
+ * @link        http://www.zentaoms.com
+ */
+$lang->testcase->id             = '用例編號';
+$lang->testcase->product        = '所屬產品';
+$lang->testcase->module         = '所屬模組';
+$lang->testcase->story          = '相關需求';
+$lang->testcase->storyVersion   = '需求版本';
+$lang->testcase->title          = '用例標題';
+$lang->testcase->pri            = '優先順序';
+$lang->testcase->type           = '用例類型';
+$lang->testcase->status         = '用例狀態';
+$lang->testcase->steps          = '用例步驟';
+$lang->testcase->frequency      = '執行頻率';
+$lang->testcase->order          = '排序';
+$lang->testcase->openedBy       = '由誰創建 ';
+$lang->testcase->openedDate     = '創建日期';
+$lang->testcase->lastEditedBy   = '最後修改者';
+$lang->testcase->lastEditedDate = '最後修改日期';
+$lang->testcase->version        = '用例版本';
+$lang->testcase->result         = '測試結果';
+$lang->testcase->real           = '實際情況';
+$lang->testcase->keywords       = '關鍵詞';
+$lang->testcase->files          = '附件';
+$lang->testcase->howRun         = '執行方式';
+$lang->testcase->scriptedBy     = '由誰編寫';
+$lang->testcase->scriptedDate   = '編寫日期';
+$lang->testcase->scriptedStatus = '腳本狀態';
+$lang->testcase->scriptedLocation = '腳本位置';
+$lang->testcase->linkCase         = '相關用例';
+$lang->testcase->stage            = '適用階段';
+$lang->testcase->lastEditedByAB   = '修改者';
+$lang->testcase->lastEditedDateAB = '修改日期';
+$lang->case = $lang->testcase;  // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
+
+$lang->testcase->stepID     = '編號';
+$lang->testcase->stepDesc   = '步驟';
+$lang->testcase->stepExpect = '預期';
+
+$lang->testcase->common         = '用例管理';
+$lang->testcase->index          = "用例管理首頁";
+$lang->testcase->create         = "創建用例";
+$lang->testcase->delete         = "刪除用例";
+$lang->testcase->view           = "用例詳情";
+$lang->testcase->edit           = "編輯用例";
+$lang->testcase->delete         = "刪除用例";
+$lang->testcase->browse         = "用例列表";
+$lang->testcase->confirmStoryChange = '確認需求變動';
+
+$lang->testcase->deleteStep     = 'ｘ';
+$lang->testcase->insertBefore   = '＋↑';
+$lang->testcase->insertAfter    = '＋↓';
+
+$lang->testcase->selectProduct  = '請選擇產品';
+$lang->testcase->byModule       = '按模組';
+$lang->testcase->assignToMe     = '指派給我';
+$lang->testcase->openedByMe     = '由我創建';
+$lang->testcase->allCases       = '所有Case';
+$lang->testcase->needConfirm    = '需求有變動的用例';
+$lang->testcase->moduleCases    = '按模組瀏覽';
+$lang->testcase->bySearch       = '搜索';
+
+$lang->testcase->lblProductAndModule         = '產品模組';
+$lang->testcase->lblTypeAndPri               = '類型&優先順序';
+$lang->testcase->lblSystemBrowserAndHardware = '系統::瀏覽器';
+$lang->testcase->lblAssignAndMail            = '指派給::抄送給';
+$lang->testcase->lblStory                    = '相關需求';
+$lang->testcase->lblLastEdited               = '最後編輯';
+
+$lang->testcase->legendRelated     = '相關信息';
+$lang->testcase->legendBasicInfo   = '基本信息';
+$lang->testcase->legendMailto      = '抄送給';
+$lang->testcase->legendAttatch     = '附件';
+$lang->testcase->legendLinkBugs    = '相關Bug';
+$lang->testcase->legendOpenAndEdit = '創建編輯';
+$lang->testcase->legendStoryAndTask= '需求::任務';
+$lang->testcase->legendCases       = '相關用例';
+$lang->testcase->legendSteps       = '用例步驟';
+$lang->testcase->legendAction      = '操作';
+$lang->testcase->legendHistory     = '歷史記錄';
+$lang->testcase->legendComment     = '備註';
+$lang->testcase->legendProduct     = '產品模組';
+$lang->testcase->legendVersion     = '版本歷史';
+
+$lang->testcase->confirmDelete     = '您確認要刪除該測試用例嗎？';
+
+$lang->testcase->priList[3] = 3;
+$lang->testcase->priList[1] = 1;
+$lang->testcase->priList[2] = 2;
+$lang->testcase->priList[4] = 4;
+
+/* Define the types. */
+$lang->testcase->typeList['']            = '';
+$lang->testcase->typeList['feature']     = '功能測試';
+$lang->testcase->typeList['performance'] = '性能測試';
+$lang->testcase->typeList['config']      = '配置相關';
+$lang->testcase->typeList['install']     = '安裝部署';
+$lang->testcase->typeList['security']    = '安全相關';
+$lang->testcase->typeList['other']       = '其他';
+
+$lang->testcase->stageList['']            = '';
+$lang->testcase->stageList['unittest']    = '單元測試階段';
+$lang->testcase->stageList['feature']     = '功能測試階段';
+$lang->testcase->stageList['intergrate']  = '整合測試階段';
+$lang->testcase->stageList['system']      = '系統測試階段';
+$lang->testcase->stageList['smoke']       = '冒煙測試階段';
+$lang->testcase->stageList['bvt']         = '版本驗證階段';
+
+$lang->testcase->statusList['']            = '';
+$lang->testcase->statusList['normal']      = '正常';
+$lang->testcase->statusList['blocked']     = '被阻塞';
+$lang->testcase->statusList['investigate'] = '研究中';
+
+$lang->testcase->resultList['n/a']     = 'N/A';
+$lang->testcase->resultList['pass']    = '通過';
+$lang->testcase->resultList['fail']    = '失敗';
+$lang->testcase->resultList['blocked'] = '阻塞';
+
+$lang->testcase->buttonEdit     = '編輯';
+$lang->testcase->buttonToList   = '返回';
--- a/trunk/module/testtask/lang/en.php
+++ b/trunk/module/testtask/lang/en.php
@@ -28,12 +28,14 @@ $lang->testtask->view           = "测试任务详情";
 $lang->testtask->edit           = "编辑测试任务";
 $lang->testtask->browse         = "测试任务列表";
 $lang->testtask->linkCase       = "关联用例";
+$lang->testtask->linkCaseAB     = "关联";
 $lang->testtask->unlinkCase     = "移除";
 $lang->testtask->batchAssign    = "批量指派";
 $lang->testtask->runCase        = "执行";
 $lang->testtask->results        = "结果";
 $lang->testtask->createBug      = "创建Bug";
 $lang->testtask->assign         = '指派';
+$lang->testtask->cases          = '用例';

 $lang->testtask->common         = '测试任务';
 $lang->testtask->id             = '任务编号';
@@ -59,3 +61,8 @@ $lang->testtask->unlinkedCases = '未关联用例列表';
 $lang->testtask->linkedCases   = '已关联用例列表';
 $lang->testtask->confirmDelete = '您确认要删除该测试任务吗？';
 $lang->testtask->passAll       = '全部通过';
+
+$lang->testtask->lblCases      = '用例列表';
+$lang->testtask->lblUnlinkCase = '移除用例';
+$lang->testtask->lblRunCase    = '执行用例';
+$lang->testtask->lblResults    = '执行结果';
--- a/trunk/module/testtask/lang/zh-tw.php
+++ b/trunk/module/testtask/lang/zh-tw.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * The testtask module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     testtask
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->testtask->index          = "測試任務首頁";
+$lang->testtask->create         = "創建測試任務";
+$lang->testtask->delete         = "刪除測試任務";
+$lang->testtask->view           = "測試任務詳情";
+$lang->testtask->edit           = "編輯測試任務";
+$lang->testtask->browse         = "測試任務列表";
+$lang->testtask->linkCase       = "關聯用例";
+$lang->testtask->linkCaseAB     = "關聯";
+$lang->testtask->unlinkCase     = "移除";
+$lang->testtask->batchAssign    = "批量指派";
+$lang->testtask->runCase        = "執行";
+$lang->testtask->results        = "結果";
+$lang->testtask->createBug      = "創建Bug";
+$lang->testtask->assign         = '指派';
+$lang->testtask->cases          = '用例';
+
+$lang->testtask->common         = '測試任務';
+$lang->testtask->id             = '任務編號';
+$lang->testtask->product        = '所屬產品';
+$lang->testtask->project        = '所屬項目';
+$lang->testtask->build          = 'Build';
+$lang->testtask->name           = '任務名稱';
+$lang->testtask->begin          = '開始日期';
+$lang->testtask->end            = '結束日期';
+$lang->testtask->desc           = '任務描述';
+$lang->testtask->status         = '當前狀態';
+$lang->testtask->assignedTo     = '指派給';
+$lang->testtask->linkVersion    = '關聯(版本)';
+$lang->testtask->lastRun        = '最後執行';
+$lang->testtask->lastResult     = '最終結果';
+
+$lang->testtask->statusList['wait']    = '未開始';
+$lang->testtask->statusList['doing']   = '進行中';
+$lang->testtask->statusList['done']    = '已完成';
+$lang->testtask->statusList['blocked'] = '被阻塞';
+
+$lang->testtask->unlinkedCases = '未關聯用例列表';
+$lang->testtask->linkedCases   = '已關聯用例列表';
+$lang->testtask->confirmDelete = '您確認要刪除該測試任務嗎？';
+$lang->testtask->passAll       = '全部通過';
+
+$lang->testtask->lblCases      = '用例列表';
+$lang->testtask->lblUnlinkCase = '移除用例';
+$lang->testtask->lblRunCase    = '執行用例';
+$lang->testtask->lblResults    = '執行結果';
--- a/trunk/module/todo/lang/en.php
+++ b/trunk/module/todo/lang/en.php
@@ -26,6 +26,7 @@ $lang->todo->index     = "todo一览";
 $lang->todo->create    = "新增TODO";
 $lang->todo->edit      = "更新TODO";
 $lang->todo->view      = "TODO详情";
+$lang->todo->viewAB    = "详情";
 $lang->todo->markDone  = "未完成";
 $lang->todo->markWait  = "已完成";
 $lang->todo->markDoing = "已完成";
@@ -36,9 +37,12 @@ $lang->todo->import2Today = "导入到今天";
 $lang->todo->changeStatus = "更改";

 $lang->todo->id          = '编号';
+$lang->todo->account     = '所有者';
 $lang->todo->date        = '日期';
 $lang->todo->begin       = '开始时间';
+$lang->todo->beginAB     = '开始';
 $lang->todo->end         = '结束时间';
+$lang->todo->endAB       = '结束';
 $lang->todo->beginAndEnd = '起止时间';
 $lang->todo->type        = '类型';
 $lang->todo->pri         = '优先级';
@@ -46,11 +50,14 @@ $lang->todo->name        = '名称';
 $lang->todo->status      = '状态';
 $lang->todo->desc        = '描述';
 $lang->todo->private     = '私人事务';
+$lang->todo->idvalue     = '任务或Bug';

 $lang->todo->week  = '星期';
 $lang->todo->today = '今天';
 $lang->todo->weekDateList = '一,二,三,四,五,六,天';
 $lang->todo->dayInFeature = '暂不指定';
+$lang->todo->confirmBug   = '该Todo关联的是Bug #%s，需要修改它吗？';
+$lang->todo->confirmTask  = '该Todo关联的是Task #%s，需要修改它吗？';

 $lang->todo->statusList['wait']     = '未开始';
 $lang->todo->statusList['doing']    = '进行中';
@@ -77,3 +84,5 @@ $lang->todo->lastWeekTodos = '上周总结';
 $lang->todo->allDaysTodos  = '所有TODO';
 $lang->todo->allUndone     = '之前未完';
 $lang->todo->todayTodos    = '今日安排';
+
+$lang->todo->action->marked = array('main' => '$date, 由 <strong>$actor</strong> 标记为<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);
--- a/trunk/module/todo/lang/zh-tw.php
+++ b/trunk/module/todo/lang/zh-tw.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * The todo module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     todo
+ * @version     $Id: zh-tw.php 849 2010-05-31 03:40:44Z yuren_@126.com $
+ * @link        http://www.zentaoms.com
+ */
+$lang->todo->common    = 'TODO';
+$lang->todo->index     = "todo一覽";
+$lang->todo->create    = "新增TODO";
+$lang->todo->edit      = "更新TODO";
+$lang->todo->view      = "TODO詳情";
+$lang->todo->viewAB    = "詳情";
+$lang->todo->markDone  = "未完成";
+$lang->todo->markWait  = "已完成";
+$lang->todo->markDoing = "已完成";
+$lang->todo->mark      = "更改狀態";
+$lang->todo->delete    = "刪除TODO";
+$lang->todo->browse    = "瀏覽TODO";
+$lang->todo->import2Today = "導入到今天";
+$lang->todo->changeStatus = "更改";
+
+$lang->todo->id          = '編號';
+$lang->todo->account     = '所有者';
+$lang->todo->date        = '日期';
+$lang->todo->begin       = '開始時間';
+$lang->todo->beginAB     = '開始';
+$lang->todo->end         = '結束時間';
+$lang->todo->endAB       = '結束';
+$lang->todo->beginAndEnd = '起止時間';
+$lang->todo->type        = '類型';
+$lang->todo->pri         = '優先順序';
+$lang->todo->name        = '名稱';
+$lang->todo->status      = '狀態';
+$lang->todo->desc        = '描述';
+$lang->todo->private     = '私人事務';
+$lang->todo->idvalue     = '任務或Bug';
+
+$lang->todo->week  = '星期';
+$lang->todo->today = '今天';
+$lang->todo->weekDateList = '一,二,三,四,五,六,天';
+$lang->todo->dayInFeature = '暫不指定';
+$lang->todo->confirmBug   = '該Todo關聯的是Bug #%s，需要修改它嗎？';
+$lang->todo->confirmTask  = '該Todo關聯的是Task #%s，需要修改它嗎？';
+
+$lang->todo->statusList['wait']     = '未開始';
+$lang->todo->statusList['doing']    = '進行中';
+$lang->todo->statusList['done']     = '已完成';
+//$lang->todo->statusList['cancel']   = '已取消';
+//$lang->todo->statusList['postpone'] = '已延期';
+
+$lang->todo->priList[3] = '一般';
+$lang->todo->priList[1] = '最高';
+$lang->todo->priList[2] = '較高';
+$lang->todo->priList[4] = '最低';
+
+$lang->todo->typeList->custom = '自定義';
+$lang->todo->typeList->bug    = 'Bug';
+$lang->todo->typeList->task   = '項目任務';
+
+$lang->todo->confirmDelete  = "您確定要刪除這個todo嗎？";
+$lang->todo->successMarked  = "成功切換狀態！";
+$lang->todo->thisIsPrivate  = '這是一條私人事務。:)';
+$lang->todo->lblDisableDate = '暫時不設定時間';
+
+$lang->todo->thisWeekTodos = '本週計劃';
+$lang->todo->lastWeekTodos = '上周總結';
+$lang->todo->allDaysTodos  = '所有TODO';
+$lang->todo->allUndone     = '之前未完';
+$lang->todo->todayTodos    = '今日安排';
+
+$lang->todo->action->marked = array('main' => '$date, 由 <strong>$actor</strong> 標記為<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);
--- a/trunk/module/tree/lang/en.php
+++ b/trunk/module/tree/lang/en.php
@@ -23,9 +23,10 @@
 */
 $lang->tree->common      = '模块维护';
 $lang->tree->add         = "添加";
+$lang->tree->edit        = "编辑";
 $lang->tree->addChild    = "添加子模块";
 $lang->tree->delete      = "删除模块";
-$lang->tree->browse      = "模块列表";
+$lang->tree->browse      = "模块维护";
 $lang->tree->manage      = "维护模块";
 $lang->tree->manageProduct= "维护产品视图模块";
 $lang->tree->manageProject= "维护项目视图模块";
@@ -36,4 +37,8 @@ $lang->tree->manageChild  = "维护子模块";
 $lang->tree->child        = "子模块";
 $lang->tree->ajaxGetOptionMenu = "接口:获取下拉列表";

-$lang->tree->confirmDelete = " 您确定删除该模块吗？";
+$lang->tree->confirmDelete = "您确定删除该模块吗？";
+$lang->tree->successSave   = "成功保存";
+
+$lang->tree->name   = '模块名称';
+$lang->tree->parent = '上级模块';
--- a/trunk/module/tree/lang/zh-tw.php
+++ b/trunk/module/tree/lang/zh-tw.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * The tree module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     tree
+ * @version     $Id: zh-tw.php 824 2010-05-02 15:32:06Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->tree->common      = '模組維護';
+$lang->tree->add         = "添加";
+$lang->tree->edit        = "編輯";
+$lang->tree->addChild    = "添加子模組";
+$lang->tree->delete      = "刪除模組";
+$lang->tree->browse      = "模組維護";
+$lang->tree->manage      = "維護模組";
+$lang->tree->manageProduct= "維護產品視圖模組";
+$lang->tree->manageProject= "維護項目視圖模組";
+$lang->tree->manageBug    = "維護QA視圖模組";
+$lang->tree->manageCase   = "維護用例視圖模組";
+$lang->tree->updateOrder  = "更新排序";
+$lang->tree->manageChild  = "維護子模組";
+$lang->tree->child        = "子模組";
+$lang->tree->ajaxGetOptionMenu = "介面:獲取下拉列表";
+
+$lang->tree->confirmDelete = "您確定刪除該模組嗎？";
+$lang->tree->successSave   = "成功保存";
+
+$lang->tree->name   = '模組名稱';
+$lang->tree->parent = '上級模組';
--- a/trunk/module/upgrade/lang/en.php
+++ b/trunk/module/upgrade/lang/en.php
@@ -43,5 +43,12 @@ $lang->upgrade->toVersion     = '升级到';
 $lang->upgrade->confirm       = '确认要执行的SQL语句';
 $lang->upgrade->sureExecute   = '确认执行';

-$lang->upgrade->fromVersions['0_3'] = '0.3 BETA';
-$lang->upgrade->fromVersions['0_4'] = '0.4 BETA';
+$lang->upgrade->fromVersions['0_3beta']   = '0.3 BETA';
+$lang->upgrade->fromVersions['0_4beta']   = '0.4 BETA';
+$lang->upgrade->fromVersions['0_5beta']   = '0.5 BETA';
+$lang->upgrade->fromVersions['0_6beta']   = '0.6 BETA';
+$lang->upgrade->fromVersions['1_0beta']   = '1.0 BETA';
+$lang->upgrade->fromVersions['1_0rc1']    = '1.0 RC1';
+$lang->upgrade->fromVersions['1_0rc2']    = '1.0 RC2';
+$lang->upgrade->fromVersions['1_0']       = '1.0 STABLE';
+$lang->upgrade->fromVersions['1_0_1']     = '1.0.1';
--- a/trunk/module/upgrade/lang/zh-tw.php
+++ b/trunk/module/upgrade/lang/zh-tw.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * The upgrade module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     upgrade
+ * @version     $Id: zh-tw.php 923 2010-07-06 02:24:09Z wwccss $
+ * @link        http://www.zentaoms.com
+ */
+$lang->upgrade->common  = '升級';
+$lang->upgrade->result  = '升級結果';
+$lang->upgrade->fail    = '升級失敗';
+$lang->upgrade->success = '升級成功';
+$lang->upgrade->tohome  = '返迴首頁';
+$lang->upgrade->warnning= '警告';
+$lang->upgrade->warnningContent = <<<EOT
+警告！升級有危險，請先備份資料庫，以防萬一。<br />
+備份方法：<br />
+1. 可以通過phpMyAdmin進行備份。<br />
+2. 使用mysql命令行的工具。<br />
+   # mysqldump -u <span class='red'>username</span> -p <span class='red'>dbname</span> > <span class='red'>filename</span> <br />
+   要將上面紅色的部分分別替換成對應的用戶名和禪道系統的資料庫名。<br />
+   比如： mysqldump -u root -p zentao >zentao.bak
+EOT;
+$lang->upgrade->selectVersion = '選擇版本';
+$lang->upgrade->noteVersion   = "務必選擇正確的版本，否則會造成數據丟失。";
+$lang->upgrade->fromVersion   = '原來的版本';
+$lang->upgrade->toVersion     = '升級到';
+$lang->upgrade->confirm       = '確認要執行的SQL語句';
+$lang->upgrade->sureExecute   = '確認執行';
+
+$lang->upgrade->fromVersions['0_3beta']   = '0.3 BETA';
+$lang->upgrade->fromVersions['0_4beta']   = '0.4 BETA';
+$lang->upgrade->fromVersions['0_5beta']   = '0.5 BETA';
+$lang->upgrade->fromVersions['0_6beta']   = '0.6 BETA';
+$lang->upgrade->fromVersions['1_0beta']   = '1.0 BETA';
+$lang->upgrade->fromVersions['1_0rc1']    = '1.0 RC1';
+$lang->upgrade->fromVersions['1_0rc2']    = '1.0 RC2';
+$lang->upgrade->fromVersions['1_0']       = '1.0 STABLE';
+$lang->upgrade->fromVersions['1_0_1']     = '1.0.1';
--- a/trunk/module/user/lang/en.php
+++ b/trunk/module/user/lang/en.php
@@ -21,69 +21,70 @@
 * @version     $Id$
 * @link        http://www.zentaoms.com
 */
-$lang->user->common        = 'User';
-$lang->user->index         = "User视图首页";
-$lang->user->view          = "User Info";
-$lang->user->create        = "Add User";
-$lang->user->read          = "View User";
-$lang->user->edit          = "Edit User";
-$lang->user->update        = "Edit User";
-$lang->user->delete        = "Delete User";
-$lang->user->activate      = "Activate";
-$lang->user->browse        = "Browse User";
-$lang->user->login         = "Login";
-$lang->user->userView      = "User view";
+$lang->user->common        = '用户';
+$lang->user->index         = "用户视图首页";
+$lang->user->view          = "用户详情";
+$lang->user->create        = "添加用户";
+$lang->user->read          = "查看用户";
+$lang->user->edit          = "编辑用户";
+$lang->user->update        = "编辑用户";
+$lang->user->delete        = "删除用户";
+$lang->user->activate      = "激活";
+$lang->user->browse        = "浏览用户";
+$lang->user->login         = "用户登录";
+$lang->user->userView      = "人员视图";
 $lang->user->editProfile   = "修改个人信息";
 $lang->user->editPassword  = "修改密码";
 $lang->user->deny          = "访问受限";
-$lang->user->confirmDelete   = "您确认删除该User吗？";
-$lang->user->confirmActivate = "您确认激活该User吗？";
+$lang->user->confirmDelete   = "您确认删除该用户吗？";
+$lang->user->confirmActivate = "您确认激活该用户吗？";
 $lang->user->relogin         = "重新登录";
 $lang->user->asGuest         = "游客访问";
 $lang->user->goback          = "返回前一页";
-$lang->user->allUsers        = '全部User';
+$lang->user->allUsers        = '全部用户';
+$lang->user->deleted         = '(已删除)';

-$lang->user->profile     = 'User档案';
-$lang->user->project     = 'User项目';
-$lang->user->task        = 'User任务';
-$lang->user->bug         = 'UserBug';
-$lang->user->todo        = 'UserTODO';
-$lang->user->story       = 'User需求';
-$lang->user->team        = 'User团队';
+$lang->user->profile     = '用户档案';
+$lang->user->project     = '用户项目';
+$lang->user->task        = '用户任务';
+$lang->user->bug         = '用户Bug';
+$lang->user->todo        = '用户TODO';
+$lang->user->story       = '用户需求';
+$lang->user->team        = '用户团队';
 $lang->user->editProfile = '修改信息';

-$lang->user->welcom    = "欢迎使用%s公司项目管理系统";
-$lang->user->errorDeny = "抱歉，您无权访问『<b>%s</b>』模块的『<b>%s</b>』功能。请联系管理员获取权限。点击后退返回上页。";
+$lang->user->errorDeny   = "抱歉，您无权访问『<b>%s</b>』模块的『<b>%s</b>』功能。请联系管理员获取权限。点击后退返回上页。";
+$lang->user->loginFailed = "登录失败，请检查您的用户名或密码是否填写正确。";

 $lang->user->gendarList->m = '男';
 $lang->user->gendarList->f = '女';
 $lang->user->statusList['active'] = '正常';
 $lang->user->statusList['delete'] = '删除';

-$lang->user->id        = 'ID';
-$lang->user->company   = 'Company';
-$lang->user->dept      = 'Department';
-$lang->user->account   = 'Account';
-$lang->user->password  = 'Password';
-$lang->user->password2 = 'Repeat Password';
-$lang->user->realname  = 'Real Name';
-$lang->user->nickname  = 'Nick Name';
-$lang->user->avatar    = 'Avatar';
-$lang->user->birthyear = 'Birth Year';
-$lang->user->birthday  = 'Birth Day';
-$lang->user->gendar    = 'Gendar';
-$lang->user->email     = 'EMail';
+$lang->user->id        = '用户编号';
+$lang->user->company   = '所属公司';
+$lang->user->dept      = '所属部门';
+$lang->user->account   = '用户名';
+$lang->user->password  = '密码';
+$lang->user->password2 = '请重复密码';
+$lang->user->realname  = '真实姓名';
+$lang->user->nickname  = '昵称';
+$lang->user->avatar    = '头像';
+$lang->user->birthyear = '出生年';
+$lang->user->birthday  = '出生月日';
+$lang->user->gendar    = '性别';
+$lang->user->email     = '邮箱';
 $lang->user->msn       = 'MSN';
 $lang->user->qq        = 'QQ';
-$lang->user->yahoo     = 'Yahoo!';
+$lang->user->yahoo     = '雅虎通';
 $lang->user->gtalk     = 'GTalk';
-$lang->user->wangwang  = 'WangWang';
-$lang->user->mobile    = 'Mobile';
-$lang->user->phone     = 'Phone';
-$lang->user->address   = 'Address';
-$lang->user->zipcode   = 'Zipcode';
-$lang->user->join      = 'Join Date';
-$lang->user->visits    = 'Visists';
-$lang->user->ip        = 'IP';
-$lang->user->last      = 'Lasttime';
-$lang->user->status    = 'Status';
+$lang->user->wangwang  = '旺旺';
+$lang->user->mobile    = '手机';
+$lang->user->phone     = '电话';
+$lang->user->address   = '通讯地址';
+$lang->user->zipcode   = '邮编';
+$lang->user->join      = '加入日期';
+$lang->user->visits    = '访问次数';
+$lang->user->ip        = '最后IP';
+$lang->user->last      = '最后登录时间';
+$lang->user->status    = '状态';
--- a/trunk/module/user/lang/zh-tw.php
+++ b/trunk/module/user/lang/zh-tw.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * The user module zh-tw file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 青島易軟天創網絡科技有限公司(www.cnezsoft.com)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     user
+ * @version     $Id: zh-tw.php 885 2010-06-30 02:19:11Z yuren_@126.com $
+ * @link        http://www.zentaoms.com
+ */
+$lang->user->common        = '用戶';
+$lang->user->index         = "用戶視圖首頁";
+$lang->user->view          = "用戶詳情";
+$lang->user->create        = "添加用戶";
+$lang->user->read          = "查看用戶";
+$lang->user->edit          = "編輯用戶";
+$lang->user->update        = "編輯用戶";
+$lang->user->delete        = "刪除用戶";
+$lang->user->activate      = "激活";
+$lang->user->browse        = "瀏覽用戶";
+$lang->user->login         = "用戶登錄";
+$lang->user->userView      = "人員視圖";
+$lang->user->editProfile   = "修改個人信息";
+$lang->user->editPassword  = "修改密碼";
+$lang->user->deny          = "訪問受限";
+$lang->user->confirmDelete   = "您確認刪除該用戶嗎？";
+$lang->user->confirmActivate = "您確認激活該用戶嗎？";
+$lang->user->relogin         = "重新登錄";
+$lang->user->asGuest         = "遊客訪問";
+$lang->user->goback          = "返回前一頁";
+$lang->user->allUsers        = '全部用戶';
+$lang->user->deleted         = '(已刪除)';
+
+$lang->user->profile     = '用戶檔案';
+$lang->user->project     = '用戶項目';
+$lang->user->task        = '用戶任務';
+$lang->user->bug         = '用戶Bug';
+$lang->user->todo        = '用戶TODO';
+$lang->user->story       = '用戶需求';
+$lang->user->team        = '用戶團隊';
+$lang->user->editProfile = '修改信息';
+
+$lang->user->errorDeny   = "抱歉，您無權訪問『<b>%s</b>』模組的『<b>%s</b>』功能。請聯繫管理員獲取權限。點擊後退返回上頁。";
+$lang->user->loginFailed = "登錄失敗，請檢查您的用戶名或密碼是否填寫正確。";
+
+$lang->user->gendarList->m = '男';
+$lang->user->gendarList->f = '女';
+$lang->user->statusList['active'] = '正常';
+$lang->user->statusList['delete'] = '刪除';
+
+$lang->user->id        = '用戶編號';
+$lang->user->company   = '所屬公司';
+$lang->user->dept      = '所屬部門';
+$lang->user->account   = '用戶名';
+$lang->user->password  = '密碼';
+$lang->user->password2 = '請重複密碼';
+$lang->user->realname  = '真實姓名';
+$lang->user->nickname  = '暱稱';
+$lang->user->avatar    = '頭像';
+$lang->user->birthyear = '出生年';
+$lang->user->birthday  = '出生月日';
+$lang->user->gendar    = '性別';
+$lang->user->email     = '郵箱';
+$lang->user->msn       = 'MSN';
+$lang->user->qq        = 'QQ';
+$lang->user->yahoo     = '雅虎通';
+$lang->user->gtalk     = 'GTalk';
+$lang->user->wangwang  = '旺旺';
+$lang->user->mobile    = '手機';
+$lang->user->phone     = '電話';
+$lang->user->address   = '通訊地址';
+$lang->user->zipcode   = '郵編';
+$lang->user->join      = '加入日期';
+$lang->user->visits    = '訪問次數';
+$lang->user->ip        = '最後IP';
+$lang->user->last      = '最後登錄時間';
+$lang->user->status    = '狀態';