diff --git a/db/update2.3.sql b/db/update2.3.sql
index a75b08d55d..d59bf5c4dd 100644
--- a/db/update2.3.sql
+++ b/db/update2.3.sql
@@ -13,3 +13,5 @@ ALTER TABLE `zt_case` CHANGE `lastRun` `lastRunDate` DATETIME NOT NULL ,
 CHANGE `lastResult` `lastRunResult` CHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; 
 ALTER TABLE `zt_testRun` CHANGE `lastRun` `lastRunDate` DATETIME NOT NULL ,
 CHANGE `lastResult` `lastRunResult` CHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+
+update `zt_task` set `storyVersion` = 1  WHERE `storyVersion` = 0;
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 09d484f86a..7d1453ce1f 100644
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     action
- * @version     $Id: zh-tw.php 2224 2011-10-25 07:41:54Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2377 2011-11-29 13:24:37Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->action->common   = '系統日誌';
@@ -65,7 +65,7 @@ $lang->action->desc->confirmed   = '$date, 由 <strong>$actor</strong> 確認需
 $lang->action->desc->bugconfirmed= '$date, 由 <strong>$actor</strong> 確認Bug' . "\n";
 $lang->action->desc->started     = '$date, 由 <strong>$actor</strong> 啟動。' . "\n";
 $lang->action->desc->canceled    = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
-$lang->action->desc->svncommited = '$date, <strong>$actor</strong> 提交了Subversion，最新版本為<strong>#$extra</strong>' . "\n";
+$lang->action->desc->svncommited = '$date, <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>' . "\n";
 $lang->action->desc->finished    = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
 $lang->action->desc->diff1       = '修改了 <strong><i>%s</i></strong>，舊值為 "%s"，新值為 "%s"。<br />' . "\n";
 $lang->action->desc->diff2       = '修改了 <strong><i>%s</i></strong>，區別為：' . "\n" . '<blockquote>%s</blockquote>' . "\n";
@@ -88,7 +88,7 @@ $lang->action->label->resolved            = '解決了';
 $lang->action->label->reviewed            = '評審了';
 $lang->action->label->moved               = '移動了';
 $lang->action->label->confirmed           = '確認了需求，';
-$lang->action->label->bugconfirmed        = '確認了Bug，';
+$lang->action->label->bugconfirmed        = '確認了';
 $lang->action->label->svncommited         = '提交Svn';
 $lang->action->label->linked2plan         = '關聯計劃';
 $lang->action->label->unlinkedfromplan    = '移除計劃';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index a08130f688..e02dd903ef 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     bug
- * @version     $Id: zh-tw.php 2257 2011-10-28 06:04:42Z wwccss $
+ * @version     $Id: zh-tw.php 2380 2011-11-30 07:46:01Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -35,6 +35,8 @@ $lang->bug->statusAB         = '狀態';
 $lang->bug->activatedCount   = '激活次數';
 $lang->bug->activatedCountAB = '激活次數';
 $lang->bug->confirmed        = '是否確認';
+$lang->bug->toTask           = '轉為任務ID';
+$lang->bug->toStory          = '轉為需求ID';
 $lang->bug->mailto           = '抄送給';
 $lang->bug->openedBy         = '由誰創建';
 $lang->bug->openedByAB       = '創建';
@@ -141,6 +143,7 @@ $lang->bug->buttonCreateTestcase = '創建用例';
 $lang->bug->confirmChangeProduct = '修改產品會導致相應的項目、需求和任務發生變化，確定嗎？';
 $lang->bug->confirmDelete        = '您確認要刪除該Bug嗎？';
 $lang->bug->setTemplateTitle     = '請輸入bug模板標題（保存之前請先填寫bug重現步驟）：';
+$lang->bug->remindTask           = '該Bug已經轉化為任務，請及時更新任務狀態。任務：';
 
 /* 模板。*/
 $lang->bug->tplStep        = "<p>[步驟]</p>";
@@ -221,6 +224,7 @@ $lang->bug->resolutionList['']           = '';
 $lang->bug->resolutionList['bydesign']   = '設計如此';
 $lang->bug->resolutionList['duplicate']  = '重複Bug';
 $lang->bug->resolutionList['external']   = '外部原因';
+$lang->bug->resolutionList['tostory']    = '轉為需求';
 $lang->bug->resolutionList['fixed']      = '已解決';
 $lang->bug->resolutionList['notrepro']   = '無法重現';
 $lang->bug->resolutionList['postponed']  = '延期處理';
@@ -296,3 +300,4 @@ $lang->bug->report->bugHistories->graph->xAxisName          = '處理步驟';
 
 /* 操作記錄。*/
 $lang->bug->action->resolved = array('main' => '$date, 由 <strong>$actor</strong> 解決，方案為 <strong>$extra</strong>。', 'extra' => $lang->bug->resolutionList);
+$lang->bug->action->tostory  = array('main' => '$date, 由 <strong>$actor</strong> 轉化為<strong>需求</strong>，編號為 <strong>$extra</strong>。');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 3260c7bf60..f04ebdd984 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -139,7 +139,7 @@ $lang->product->menu->view    = 'Info|product|view|productID=%s';
 $lang->product->menu->edit    = 'Edit|product|edit|productID=%s';
 $lang->product->menu->module  = 'Modules|tree|browse|productID=%s&view=story';
 $lang->product->menu->create  = array('link' => 'New Product|product|create', 'float' => 'right');
-$lang->project->menu->project = array('link' => 'Project list|product|index|locate=false&status=all&productID=%s', 'float' => 'right');
+$lang->product->menu->project = array('link' => 'Project list|product|index|locate=false&status=all&productID=%s', 'float' => 'right');
 $lang->story->menu            = $lang->product->menu;
 $lang->productplan->menu      = $lang->product->menu;
 $lang->release->menu          = $lang->product->menu;
@@ -249,10 +249,10 @@ $lang->error->companyNotFound = "The domain %s does not exist.";
 $lang->error->length          = array("『%s』length should be『%s』", "『%s』length should between『%s』and 『%s』.");
 $lang->error->reg             = "『%s』should like『%s』";
 $lang->error->unique          = "『%s』has『%s』already.";
+$lang->error->gt              = "『%s』must great than『%s』.";
 $lang->error->notempty        = "『%s』can not be empty.";
 $lang->error->empty           = "『%s』 must be empty.";
 $lang->error->equal           = "『%s』must be『%s』.";
-$lang->error->gt              = "『%s』must great than『%s』.";
 $lang->error->int             = array("『%s』should be interger", "『%s』should between『%s-%s』.");
 $lang->error->float           = "『%s』should be a interger or float.";
 $lang->error->email           = "『%s』should be email.";
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index cc6a4ad382..1e5854e83e 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     ZenTaoPMS
- * @version     $Id: zh-tw.php 2246 2011-10-27 08:54:27Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2372 2011-11-29 02:57:12Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->arrow        = ' » ';
@@ -139,6 +139,7 @@ $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=story';
 $lang->product->menu->create  = array('link' => '新增產品|product|create', 'float' => 'right');
+$lang->product->menu->project = array('link' => '項目列表|product|index|locate=false&status=all&productID=%s', 'float' => 'right');
 $lang->story->menu            = $lang->product->menu;
 $lang->productplan->menu      = $lang->product->menu;
 $lang->release->menu          = $lang->product->menu;
@@ -150,6 +151,7 @@ $lang->project->menu->story     = array('link' => '需求|project|story|projectI
 $lang->project->menu->bug       = 'Bug|project|bug|projectID=%s';
 $lang->project->menu->dynamic   = '動態|project|dynamic|projectID=%s';
 $lang->project->menu->build     = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
+$lang->project->menu->testtask  = '測試任務|project|testtask|projectID=%s';
 $lang->project->menu->burn      = '燃盡圖|project|burn|projectID=%s';
 $lang->project->menu->team      = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers');
 $lang->project->menu->doc       = array('link' => '文檔|project|doc|porjectID=%s', 'subModule' => 'doc');
@@ -247,6 +249,7 @@ $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->gt              = "『%s』應當大於『%s』。";
 $lang->error->notempty        = "『%s』不能為空。";
 $lang->error->empty           = "『%s』必須為空。";
 $lang->error->equal           = "『%s』必須為『%s』。";
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index cffde633ce..bca68747f7 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -31,6 +31,7 @@ $lang->resource->todo->create    = 'create';
 $lang->resource->todo->edit      = 'edit';
 $lang->resource->todo->view      = 'view';
 $lang->resource->todo->delete    = 'delete';
+$lang->resource->todo->export    = 'export';
 $lang->resource->todo->mark      = 'mark';
 $lang->resource->todo->import2Today = 'import2Today';
 
@@ -349,3 +350,4 @@ $lang->changelog['2.3'][]   = 'svn-apiSync';
 $lang->changelog['2.4'][]   = 'user-ajaxGetUser';
 $lang->changelog['2.4'][]   = 'task-assignedTo';
 $lang->changelog['2.4'][]   = 'project-testtask';
+$lang->changelog['2.4'][]   = 'todo-export';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index 6034081af0..ec0101e009 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     group
- * @version     $Id: zh-tw.php 2238 2011-10-27 06:03:38Z wwccss $
+ * @version     $Id: zh-tw.php 2367 2011-11-29 02:02:53Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->group->common             = '權限分組';
@@ -51,5 +51,6 @@ $lang->group->versions['2.0']   = '禪道2.0';
 $lang->group->versions['2.1']   = '禪道2.1';
 $lang->group->versions['2.2']   = '禪道2.2';
 $lang->group->versions['2.3']   = '禪道2.3';
+$lang->group->versions['2.4']   = '禪道2.4';
 
 include (dirname(__FILE__) . '/resource.php');
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index 0afc56844e..90f59443a3 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     install
- * @version     $Id: zh-tw.php 1914 2011-06-24 10:11:25Z yidong@cnezsoft.com $
+ * @version     $Id: zh-tw.php 2341 2011-11-21 05:17:32Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->install->common  = '安裝';
@@ -58,6 +58,8 @@ $lang->install->pdo          = 'PDO擴展';
 $lang->install->pdoFail      = '修改PHP配置檔案，加載PDO擴展。';
 $lang->install->pdoMySQL     = 'PDO_MySQL擴展';
 $lang->install->pdoMySQLFail = '修改PHP配置檔案，加載pdo_mysql擴展。';
+$lang->install->json         = 'JSON擴展';
+$lang->install->jsonFail     = '修改PHP配置檔案，加載JSON擴展。';
 $lang->install->tmpRoot      = '臨時檔案目錄';
 $lang->install->dataRoot     = '上傳檔案目錄';
 $lang->install->mkdir        = '<p>需要創建目錄%s。<br /> linux下面命令為：<br /> mkdir -p %s</p>';
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index e087cc7f52..f6767c1b14 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -17,9 +17,9 @@ $lang->mail->mtaList['sendmail'] = 'Sendmail on localhost';
 $lang->mail->turnonList['true']  = 'open';
 $lang->mail->turnonList['false'] = 'close';
 
+$lang->mail->debugList[2] = '2';
 $lang->mail->debugList[0] = '0';
 $lang->mail->debugList[1] = '1';
-$lang->mail->debugList[2] = '2';
 
 $lang->mail->smtp->authList['true']  = 'yes';
 $lang->mail->smtp->authList['false'] = 'no';
diff --git a/module/mail/lang/zh-tw.php b/module/mail/lang/zh-tw.php
index 62457af381..e430e728b5 100644
--- a/module/mail/lang/zh-tw.php
+++ b/module/mail/lang/zh-tw.php
@@ -17,9 +17,9 @@ $lang->mail->mtaList['sendmail'] = '本機sendmail';
 $lang->mail->turnonList['true']  = '打開';
 $lang->mail->turnonList['false'] = '關閉';
 
+$lang->mail->debugList[2] = '2';
 $lang->mail->debugList[0] = '0';
 $lang->mail->debugList[1] = '1';
-$lang->mail->debugList[2] = '2';
 
 $lang->mail->smtp->authList['true']  = '是';
 $lang->mail->smtp->authList['false'] = '否';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index e3e7545fab..213e2b5943 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -129,8 +129,8 @@ $lang->project->lblStats        = 'Stats';
 $lang->project->stats           = 'Total work hours is 『%s』hours, <br />Total estimate is『%s』hours,<br />Total confused is『%s』hours<br />Total left is『%s』hours';
 $lang->project->oneLineStats    = "Project『%s』, code is『%s』, products is『%s』,begin from『%s』to 『%s』,total estimate『%s』hours,consumed『%s』hours,left『%s』hours.";
 $lang->project->taskSummary     = "<strong>%s</strong> tasks this page, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
-$lang->project->groupSummary    = "<strong>%s</strong> tasks in this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
 $lang->project->memberHours     = "%s has <strong>%s</strong> workhours, ";
+$lang->project->groupSummary    = "<strong>%s</strong> tasks in this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
 $lang->project->wbs             = "WBS";
 $lang->project->largeBurnChart  = 'View large';
 $lang->project->howToUpdateBurn = "<a href='%s' class='helplink'><i>How?</i></a>";
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index be93db9fb5..b0fc793e9a 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     project
- * @version     $Id: zh-tw.php 2270 2011-10-29 03:35:05Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2376 2011-11-29 13:24:10Z wwccss $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -20,6 +20,7 @@ $lang->project->name         = '項目名稱';
 $lang->project->code         = '項目代號';
 $lang->project->begin        = '開始日期';
 $lang->project->end          = '結束日期';
+$lang->project->days         = '可用工作日';
 $lang->project->status       = '項目狀態';
 $lang->project->statge       = '所處階段';
 $lang->project->pri          = '優先順序';
@@ -44,13 +45,16 @@ $lang->project->totalEstimate= '總預計';
 $lang->project->totalConsumed= '總消耗';
 $lang->project->totalLeft    = '總剩餘';
 $lang->project->progess      = '進度';
+$lang->project->viewBug      = '查看bug';
 $lang->project->noProduct    = '無產品項目';
 $lang->project->select       = '--請選擇項目--';
 
-$lang->team->account     = '用戶';
-$lang->team->role        = '角色';
-$lang->team->joinDate    = '加盟日';
-$lang->team->workingHour = '工時/天';
+$lang->team->account    = '用戶';
+$lang->team->role       = '角色';
+$lang->team->join       = '加盟日';
+$lang->team->hours      = '可用工時/天';
+$lang->team->days       = '可用工日';
+$lang->team->totalHours = '總計';
 
 /* 欄位取值列表。*/
 $lang->project->statusList['']      = '';
@@ -70,6 +74,7 @@ $lang->project->story          = '需求列表';
 $lang->project->bug            = 'Bug列表';
 $lang->project->dynamic        = '動態';
 $lang->project->build          = 'Build列表';
+$lang->project->testtask       = '測試任務';
 $lang->project->burn           = '燃盡圖';
 $lang->project->computeBurn    = '更新燃盡圖';
 $lang->project->burnData       = '燃盡圖數據';
@@ -121,9 +126,10 @@ $lang->project->allProject          = '所有項目';
 $lang->project->selectProject   = "請選擇項目";
 $lang->project->beginAndEnd     = '起止時間';
 $lang->project->lblStats        = '工時統計';
-$lang->project->stats           = '總共預計<strong>%s</strong>工時<br />已經消耗<strong>%s</strong>工時<br />預計剩餘<strong>%s</strong>工時';
+$lang->project->stats           = '可用工時<strong>%s</strong>工時<br />總共預計<strong>%s</strong>工時<br />已經消耗<strong>%s</strong>工時<br />預計剩餘<strong>%s</strong>工時';
 $lang->project->oneLineStats    = "項目<strong>%s</strong>, 代號為<strong>%s</strong>, 相關產品為<strong>%s</strong>，<strong>%s</strong>開始，<strong>%s</strong>結束，總預計<strong>%s</strong>工時，已消耗<strong>%s</strong>工時，預計剩餘<strong>%s</strong>工時。";
 $lang->project->taskSummary     = "本頁共 <strong>%s</strong> 個任務，未開始<strong>%s</strong>，進行中<strong>%s</strong>，總預計<strong>%s</strong>工時，已消耗<strong>%s</strong>工時，剩餘<strong>%s</strong>工時。";
+$lang->project->memberHours     = "%s共有 <strong>%s</strong> 個可用工時，";
 $lang->project->groupSummary    = "本組共 <strong>%s</strong> 個任務，未開始<strong>%s</strong>，進行中<strong>%s</strong>，總預計<strong>%s</strong>工時，已消耗<strong>%s</strong>工時，剩餘<strong>%s</strong>工時。";
 $lang->project->wbs             = "分解任務";
 $lang->project->largeBurnChart  = '點擊查看大圖';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index 082c658149..1661ce8dd9 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -6,11 +6,12 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     story
- * @version     $Id: zh-tw.php 2296 2011-10-30 01:05:27Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2346 2011-11-21 06:09:08Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->story->browse      = "需求列表";
 $lang->story->create      = "新增需求";
+$lang->story->createCase  = "創建用例";
 $lang->story->batchCreate = "批量添加";
 $lang->story->change      = "變更";
 $lang->story->changed     = '需求變更';
@@ -118,6 +119,9 @@ $lang->story->sourceList['market']     = '市場';
 $lang->story->sourceList['service']    = '客服';
 $lang->story->sourceList['competitor'] = '競爭對手';
 $lang->story->sourceList['partner']    = '合作夥伴';
+$lang->story->sourceList['dev']        = '開發人員';
+$lang->story->sourceList['tester']     = '測試人員';
+$lang->story->sourceList['bug']        = 'Bug轉化';
 $lang->story->sourceList['other']      = '其他';
 
 $lang->story->priList[]   = '';
@@ -132,6 +136,8 @@ $lang->story->legendRelated        = '相關信息';
 $lang->story->legendMailto         = '抄送給';
 $lang->story->legendAttatch        = '附件';
 $lang->story->legendProjectAndTask = '項目任務';
+$lang->story->legendBugs           = '相關Bug';
+$lang->story->legendCases          = '相關用例';
 $lang->story->legendLinkStories    = '相關需求';
 $lang->story->legendChildStories   = '細分需求';
 $lang->story->legendSpec           = '需求描述';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 414de4ec1a..03dab9274d 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -48,7 +48,7 @@ $lang->task->deadlineAB     = 'Deadline';
 $lang->task->status         = 'Status';
 $lang->task->statusCustom   = 'Status Order';
 $lang->task->desc           = 'Desc';
-$lang->task->assigne        = 'Assign';
+$lang->task->assign         = 'Assign';
 $lang->task->assignedTo     = 'Assigned To';
 $lang->task->assignedToAB   = 'Assign';
 $lang->task->assignedDate   = 'Assigned Date';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 45018190d6..0563a4d747 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     task
- * @version     $Id: zh-tw.php 2270 2011-10-29 03:35:05Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2350 2011-11-21 09:02:13Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->task->index              = "任務一覽";
@@ -48,6 +48,7 @@ $lang->task->deadlineAB     = '截止';
 $lang->task->status         = '任務狀態';
 $lang->task->statusCustom   = '狀態排序';
 $lang->task->desc           = '任務描述';
+$lang->task->assign         = '重新指派';
 $lang->task->assignedTo     = '指派給';
 $lang->task->assignedToAB   = '指派給';
 $lang->task->assignedDate   = '指派日期';
@@ -125,6 +126,7 @@ $lang->task->copyStoryTitle      = "同需求";
 $lang->task->afterSubmit         = "添加之後";
 $lang->task->successSaved        = "成功添加，";
 $lang->task->delayWarning        = " <strong class='delayed f-14px'> 延期%s天 </strong>";
+$lang->task->remindBug           = "該需求為Bug轉化得到，請及時更新相關Bug。來源Bug：";
 
 /* 統計報表。*/
 $lang->task->report->common        = '統計報表';
diff --git a/module/task/model.php b/module/task/model.php
index 7a795eda9f..b720509489 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -106,7 +106,7 @@ class taskModel extends model
                 $data[$i]->openedBy     = $this->app->user->account;
                 $data[$i]->openedDate   = $now;
                 $data[$i]->statusCustom = strpos(self::CUSTOM_STATUS_ORDER, 'wait') + 1;
-                if($tasks->story[$i] != '') $data[$i]->storyVersion = $this->loadModel('story')->getVersion($tasks->story[$i]);
+                if($tasks->story[$i] != '') $data[$i]->storyVersion = $this->loadModel('story')->getVersion($data[$i]->story);
                 if($tasks->assignedTo[$i] != '') $data[$i]->assignedDate = $now;
 
                 $this->dao->insert(TABLE_TASK)->data($data[$i])
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index b8999c9ac6..c7b5a574cc 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     testtask
- * @version     $Id: zh-tw.php 2255 2011-10-28 05:51:57Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2379 2011-11-30 05:35:57Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->testtask->index          = "測試任務首頁";
@@ -38,8 +38,9 @@ $lang->testtask->desc           = '任務描述';
 $lang->testtask->status         = '當前狀態';
 $lang->testtask->assignedTo     = '指派給';
 $lang->testtask->linkVersion    = '關聯(版本)';
-$lang->testtask->lastRun        = '最後執行';
-$lang->testtask->lastResult     = '最終結果';
+$lang->testtask->lastRunAccount = '最後執行人';
+$lang->testtask->lastRunTime    = '最後執行時間';
+$lang->testtask->lastRunResult  = '最終結果';
 
 $lang->testtask->statusList['wait']    = '未開始';
 $lang->testtask->statusList['doing']   = '進行中';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 1c19bf9a11..931fc23137 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -19,6 +19,7 @@ $lang->todo->markDone  = "Undone";
 $lang->todo->markWait  = "Done";
 $lang->todo->markDoing = "Done";
 $lang->todo->mark      = "Change status";
+$lang->todo->export    = "Export";
 $lang->todo->delete    = "Delete";
 $lang->todo->browse    = "Browse";
 $lang->todo->import2Today = "Import to today";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 1d3e10273d..895adb168a 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -19,6 +19,7 @@ $lang->todo->markDone  = "未完成";
 $lang->todo->markWait  = "已完成";
 $lang->todo->markDoing = "已完成";
 $lang->todo->mark      = "更改状态";
+$lang->todo->export    = "导出";
 $lang->todo->delete    = "删除TODO";
 $lang->todo->browse    = "浏览TODO";
 $lang->todo->import2Today = "导入到今天";
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 2a2e9c4662..525b155dfa 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -40,6 +40,7 @@ $lang->user->todo        = 'Todo';
 $lang->user->story       = 'Story';
 $lang->user->team        = 'Team';
 $lang->user->dynamic     = 'Dynamic';
+$lang->user->ajaxGetUser = 'AJAX:get users';
 $lang->user->editProfile = 'Edit profile';
 
 $lang->user->errorDeny   = "Sorry, you can't access the <b>%s</b> module's <b>%s</b> feature";
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index b0acea758a..8e4a7f7d0f 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     user
- * @version     $Id: zh-tw.php 2174 2011-10-16 06:16:13Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2335 2011-11-18 01:19:32Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->user->common        = '用戶';
@@ -40,6 +40,7 @@ $lang->user->todo        = '用戶TODO';
 $lang->user->story       = '用戶需求';
 $lang->user->team        = '用戶團隊';
 $lang->user->dynamic     = '用戶動態';
+$lang->user->ajaxGetUser = '介面:獲得用戶';
 $lang->user->editProfile = '修改信息';
 
 $lang->user->errorDeny   = "抱歉，您無權訪問『<b>%s</b>』模組的『<b>%s</b>』功能。請聯繫管理員獲取權限。點擊後退返回上頁。";