diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index a959e17338..0bacc737a0 100644
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -23,11 +23,11 @@ $lang->action->trashTips  = "Tips:The deleting actions in zentao are all logic";
 
 $lang->action->dynamic->today     = 'Today';
 $lang->action->dynamic->yesterday = 'Yesterday';
-$lang->action->dynamic->twoDaysAgo= 'The day Before Yesterday';
-$lang->action->dynamic->thisWeek  = 'This Week';
-$lang->action->dynamic->lastWeek  = 'Last Week';
-$lang->action->dynamic->thisMonth = 'This Month';
-$lang->action->dynamic->lastMonth = 'Last Month';
+$lang->action->dynamic->twoDaysAgo= 'Two days ago';
+$lang->action->dynamic->thisWeek  = 'This week';
+$lang->action->dynamic->lastWeek  = 'Last week';
+$lang->action->dynamic->thisMonth = 'This month';
+$lang->action->dynamic->lastMonth = 'Last month';
 $lang->action->dynamic->all       = 'All';
 
 $lang->action->objectTypes['product']     = 'PRODUCT';
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 8c7e737d64..595740d178 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 1561 2011-03-12 02:02:52Z wwccss $
+ * @version     $Id: zh-tw.php 1825 2011-05-02 05:54:29Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->action->common   = '系統日誌';
@@ -17,9 +17,18 @@ $lang->action->objectType = '對象類型';
 $lang->action->objectID   = '對象ID';
 $lang->action->objectName = '對象名稱';
 $lang->action->actor      = '操作者';
+$lang->action->action     = '動作';
 $lang->action->date       = '日期';
-$lang->action->trashTips  = '提示：禪道系統的刪除都是標記刪除，並沒有真正從資料庫裡面刪除數據。這樣做是為了系統數據的完整和安全。
-                             因此如果你確定要刪除某一條數據，可以使用phpmyadmin等管理工具，進資料庫刪除。';
+$lang->action->trashTips  = '提示：為了保證系統的完整性，禪道系統的刪除都是標記刪除。';
+
+$lang->action->dynamic->today     = '今天';
+$lang->action->dynamic->yesterday = '昨天';
+$lang->action->dynamic->twoDaysAgo= '前天';
+$lang->action->dynamic->thisWeek  = '本週';
+$lang->action->dynamic->lastWeek  = '上周';
+$lang->action->dynamic->thisMonth = '本月';
+$lang->action->dynamic->lastMonth = '上月';
+$lang->action->dynamic->all       = '所有';
 
 $lang->action->objectTypes['product']     = '產品';
 $lang->action->objectTypes['story']       = '需求';
@@ -34,6 +43,7 @@ $lang->action->objectTypes['testtask']    = '測試任務';
 $lang->action->objectTypes['user']        = '用戶';
 $lang->action->objectTypes['doc']         = '文檔';
 $lang->action->objectTypes['doclib']      = '文檔庫';
+$lang->action->objectTypes['todo']        = 'TODO';
 
 /* 用來描述操作歷史記錄。*/
 $lang->action->desc->common      = '$date, <strong>$action</strong> by <strong>$actor</strong>' . "\n";
@@ -47,7 +57,7 @@ $lang->action->desc->deleted     = '$date, 由 <strong>$actor</strong> 刪除。
 $lang->action->desc->deletedfile = '$date, 由 <strong>$actor</strong> 刪除了附件：<strong><i>$extra</i></strong>' . "\n";
 $lang->action->desc->erased      = '$date, 由 <strong>$actor</strong> 刪除。' . "\n";
 $lang->action->desc->undeleted   = '$date, 由 <strong>$actor</strong> 還原。' . "\n";
-$lang->action->desc->commented   = '$date, 由 <strong>$actor</strong> 發表評論。' . "\n";
+$lang->action->desc->commented   = '$date, 由 <strong>$actor</strong> 添加備註。' . "\n";
 $lang->action->desc->activated   = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
 $lang->action->desc->moved       = '$date, 由 <strong>$actor</strong> 移動，之前為 "$extra"' . "\n";
 $lang->action->desc->confirmed   = '$date, 由 <strong>$actor</strong> 確認需求變動，最新版本為<strong>#$extra</strong>' . "\n";
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 7edfa88d55..939eef8daa 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 1498 2011-03-04 09:06:00Z wwccss $
+ * @version     $Id: zh-tw.php 1823 2011-05-02 05:53:08Z wwccss $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -66,6 +66,7 @@ $lang->bug->resolve        = '解決Bug';
 $lang->bug->close          = '關閉Bug';
 $lang->bug->activate       = '激活Bug';
 $lang->bug->reportChart    = '報表統計';
+$lang->bug->export         = '導出數據';
 $lang->bug->delete         = '刪除Bug';
 $lang->bug->saveTemplate   = '保存模板';
 $lang->bug->deleteTemplate = '刪除模板';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index a2f669ed9d..e52f4ea0c4 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -197,11 +197,11 @@ $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     = 'Task|user|task|account=%s';
-$lang->user->menu->bug      = 'Bug列表|user|bug|account=%s';
+$lang->user->menu->bug      = 'Bug|user|bug|account=%s';
 $lang->user->menu->project  = 'Project|user|project|account=%s';
 $lang->user->menu->dynamic  = 'Dynamic|user|dynamic|type=today&account=%s';
 $lang->user->menu->profile  = array('link' => 'Profile|user|profile|account=%s', 'alias' => 'edit');
-$lang->user->menu->browse   = array('link' => '用户管理|company|browse|', 'float' => 'right');
+$lang->user->menu->browse   = array('link' => 'Manage user|company|browse|', 'float' => 'right');
 
 /* Admin menu. */
 $lang->admin->menu->trashes   = array('link' => 'Trash|action|trash', 'subModule' => 'action');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index ea2ba11e41..f73708f048 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 1557 2011-03-11 15:13:10Z wwccss $
+ * @version     $Id: zh-tw.php 1829 2011-05-02 06:42:18Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->arrow        = ' » ';
@@ -34,7 +34,7 @@ $lang->close        = '關閉';
 $lang->link         = '關聯';
 $lang->unlink       = '移除';
 $lang->import       = '導入';
-$lang->exportCSV    = '導出csv';
+$lang->export       = '導出';
 $lang->setFileName  = '請輸入檔案名：';
 $lang->activate     = '激活';
 $lang->submitting   = '稍候...';
@@ -99,6 +99,11 @@ $lang->searchObjects['testtask']    = 'T:測試任務';
 $lang->searchObjects['doc']         = 'D:文檔';
 $lang->searchTips                   = '輸入編號';
 
+/* 導出檔案的類型列表。*/
+$lang->exportFileTypeList['csv']  = 'csv';
+$lang->exportFileTypeList['xml']  = 'xml';
+$lang->exportFileTypeList['html'] = 'html';
+
 /* 風格列表。*/
 $lang->themes['default'] = '預設';
 $lang->themes['green']   = '綠色';
@@ -116,6 +121,7 @@ $lang->my->menu->bug      = '我的Bug|my|bug|';
 $lang->my->menu->testask  = '我的測試|my|testtask|';
 $lang->my->menu->story    = '我的需求|my|story|';
 $lang->my->menu->project  = '我的項目|my|project|';
+$lang->my->menu->dynamic  = '我的動態|my|dynamic|';
 $lang->my->menu->profile  = array('link' => '我的檔案|my|profile|', 'alias' => 'editprofile');
 $lang->todo->menu         = $lang->my->menu;
 
@@ -181,6 +187,7 @@ $lang->company->menu->browseUser  = array('link' => '用戶列表|company|browse
 $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->dynamic     = '組織動態|company|dynamic|';
 $lang->company->menu->addGroup    = array('link' => '添加分組|group|create', 'float' => 'right');
 $lang->company->menu->addUser     = array('link' => '添加用戶|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
 $lang->dept->menu            = $lang->company->menu;
@@ -192,15 +199,18 @@ $lang->user->menu->todo     = array('link' => 'TODO列表|user|todo|account=%s',
 $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->dynamic  = '用戶動態|user|dynamic|type=today&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->admin->menu->trashes   = array('link' => '資源回收筒|action|trash', 'subModule' => 'action');
+$lang->admin->menu->convert   = array('link' => '從其他系統導入|convert|index', 'subModule' => 'convert');
+$lang->admin->menu->extension = array('link' => '插件管理|extension|browse', 'subModule' => 'extension');
 $lang->convert->menu        = $lang->admin->menu;
 $lang->upgrade->menu        = $lang->admin->menu;
 $lang->action->menu         = $lang->admin->menu;
+$lang->extension->menu      = $lang->admin->menu;
 
 /*菜單設置：分組設置。*/
 $lang->menugroup->release     = 'product';
@@ -219,6 +229,7 @@ $lang->menugroup->people      = 'company';
 $lang->menugroup->dept        = 'company';
 $lang->menugroup->todo        = 'my';
 $lang->menugroup->action      = 'admin';
+$lang->menugroup->extension   = 'admin';
 
 /* 錯誤提示信息。*/
 $lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。";
@@ -238,7 +249,7 @@ $lang->error->passwordrule    = "密碼應該符合規則，長度至少為六
 
 /* 分頁信息。*/
 $lang->pager->noRecord  = "暫時沒有記錄";
-$lang->pager->digest    = "共<strong>%s</strong>條記錄,每頁 <strong>%s</strong>條，頁面：<strong>%s/%s</strong> ";
+$lang->pager->digest    = "共<strong>%s</strong>條記錄，每頁 <strong>%s</strong>條，頁面：<strong>%s/%s</strong> ";
 $lang->pager->first     = "首頁";
 $lang->pager->pre       = "上頁";
 $lang->pager->next      = "下頁";
diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php
index f19b6c23ee..b22f426ef5 100644
--- a/module/company/lang/zh-tw.php
+++ b/module/company/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     company
- * @version     $Id: zh-tw.php 1429 2011-02-21 14:35:26Z wwccss $
+ * @version     $Id: zh-tw.php 1674 2011-04-19 03:30:33Z liukmqd@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->company->common   = '組織視圖';
@@ -17,6 +17,7 @@ $lang->company->read     = "公司信息";
 $lang->company->update   = "更新公司";
 $lang->company->delete   = "刪除公司";
 $lang->company->browse   = "用戶列表";
+$lang->company->dynamic  = "組織動態";
 $lang->company->depts    = "部門列表";
 $lang->company->orgView  = '組織視圖';
 
diff --git a/module/doc/lang/zh-tw.php b/module/doc/lang/zh-tw.php
index edc12cfbf1..e2b1fc06a6 100644
--- a/module/doc/lang/zh-tw.php
+++ b/module/doc/lang/zh-tw.php
@@ -18,6 +18,7 @@ $lang->doc->lib            = '所屬文檔庫';
 $lang->doc->module         = '所屬分類';
 $lang->doc->title          = '文檔標題';
 $lang->doc->digest         = '文檔摘要';
+$lang->doc->comment        = '文檔備註';
 $lang->doc->type           = '文檔類型';
 $lang->doc->content        = '文檔正文';
 $lang->doc->keywords       = '關鍵字';
diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php
index 8b13789179..ef4c34d840 100644
--- a/module/extension/lang/zh-tw.php
+++ b/module/extension/lang/zh-tw.php
@@ -1 +1,85 @@
+<?php
+/**
+ * The extension module zh-tw file of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2011 QingDao Nature Easy Soft Network Technology Co,LTD (www.cnezsoft.com)
+ * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     extension
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+$lang->extension->common       = '插件管理';
+$lang->extension->browse       = '瀏覽插件';
+$lang->extension->install      = '安裝插件';
+$lang->extension->installAuto  = '自動安裝';
+$lang->extension->installForce = '強制安裝';
+$lang->extension->uninstall    = '卸載';
+$lang->extension->activate     = '激活';
+$lang->extension->deactivate   = '禁用';
+$lang->extension->obtain       = '獲得插件';
+$lang->extension->download     = '下載插件';
+$lang->extension->downloadAB   = '下載';
+$lang->extension->upload       = '上傳插件';
+$lang->extension->erase        = '清除';
 
+$lang->extension->installed   = '已安裝';
+$lang->extension->deactivated = '已禁用';
+$lang->extension->available   = '可安裝';
+
+$lang->extension->id          = '編號';
+$lang->extension->name        = '名稱';
+$lang->extension->code        = '英文名';
+$lang->extension->version     = '版本';
+$lang->extension->author      = '作者';
+$lang->extension->license     = '授權';
+$lang->extension->desc        = '描述';
+$lang->extension->site        = '官網';
+$lang->extension->addedTime   = '添加時間';
+$lang->extension->updatedTime = '更新時間';
+$lang->extension->downloads   = '下載量';
+$lang->extension->public      = '直接下載';
+$lang->extension->compatible  = '兼容性';
+
+$lang->extension->publicList[0] = '手工下載';
+$lang->extension->publicList[1] = '直接下載';
+
+$lang->extension->compatibleList[0] = '不兼容';
+$lang->extension->compatibleList[1] = '兼容';
+
+$lang->extension->byDownloads   = '最多下載';
+$lang->extension->byAddedTime   = '最新添加';
+$lang->extension->byUpdatedTime = '最近更新';
+$lang->extension->bySearch      = '搜索';
+$lang->extension->byCategory    = '分類瀏覽';
+
+$lang->extension->installFailed            = '安裝失敗，錯誤原因如下:';
+$lang->extension->installFinished          = '恭喜您，插件順利的安裝成功！';
+$lang->extension->refreshPage              = '刷新頁面';
+$lang->extension->uninstallFinished        = '插件已經成功卸載';
+$lang->extension->deactivateFinished       = '插件已經成功禁用';
+$lang->extension->activateFinished         = '插件已經成功激活';
+$lang->extension->eraseFinished            = '插件已經成功清除';
+$lang->extension->unremovedFiles           = '有一些檔案或目錄未能刪除，需要手工刪除';
+$lang->extension->executeCommands          = '<h3>執行下面的命令來修正這些問題：</h3>';
+$lang->extension->successDownloadedPackage = '成功下載插件';
+$lang->extension->successCopiedFiles       = '成功拷貝檔案';
+$lang->extension->successInstallDB         = '成功安裝資料庫';
+$lang->extension->viewInstalled            = '查看已安裝插件';
+$lang->extension->viewAvailable            = '查看可安裝插件';
+$lang->extension->viewDeactivated          = '查看已禁用插件';
+
+$lang->extension->errorGetModules              = '從www.zentao.net獲得插件分類失敗。可能是因為網絡方面的原因，請檢查後重新刷新頁面。';
+$lang->extension->errorGetExtensions           = '從www.zentao.net獲得插件分類失敗。可能是因為網絡方面的原因，您可以到<a href="http://www.zentao.net/extension/" target="_blank">www.zentao.net</a>手工下載插件，然後上傳安裝。';
+$lang->extension->errorDownloadPathNotFound    = '插件下載存儲路徑<strong>%s</strong>不存在。<br />linux下面請執行命令：<strong>mkdir -p %s</strong>來修正。';
+$lang->extension->errorDownloadPathNotWritable = '插件下載存儲路徑<strong>%s</strong>不可寫。<br />linux下面請執行命令：<strong>sudo chmod 777 %s</strong>來修正。';
+$lang->extension->errorPackageFileExists       = '下載路徑已經有一個名為的<strong>%s</strong>附件。<h3>重新安裝，<a href="%s">請點擊此連結</a></h3>';
+$lang->extension->errorDownloadFailed          = '下載失敗，請重新下載。如果多次重試還不行，請嘗試手工下載，然後通過上傳功能上傳。';
+$lang->extension->errorMd5Checking             = '下載檔案不完整，請重新下載。如果多次重試還不行，請嘗試手工下載，然後通過上傳功能上傳。';
+$lang->extension->errorExtracted               = '包檔案<strong> %s </strong>解壓縮失敗，可能不是一個有效的zip檔案。錯誤信息如下：<br />%s';
+$lang->extension->errorCheckIncompatible       = '該插件與禪道版本不兼容，安裝後可能無法使用。。<h3>您可以選擇 <a href="%s">強制安裝</a> 或者 <a href="#" onclick=parent.location.href="%s">取消安裝</a></h3>';
+$lang->extension->errorFileConflicted          = '有以下安裝檔案衝突：<br />%s <h3>您可以選擇 <a href="%s">覆蓋安裝</a> 或者 <a href="#" onclick=parent.location.href="%s">取消安裝</a></h3>';
+$lang->extension->errorPackageNotFound         = '包檔案 <strong>%s </strong>沒有找到，可能是因為自動下載失敗。您可以嘗試再次下載。';
+$lang->extension->errorTargetPathNotWritable   = '目標路徑 <strong>%s </strong>不可寫。';
+$lang->extension->errorTargetPathNotExists     = '目標路徑 <strong>%s </strong>不存在。';
+$lang->extension->errorInstallDB               = '執行資料庫語句失敗。錯誤信息如下：%s';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index dbf291d03c..c499a65cc9 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 1522 2011-03-08 05:43:21Z wwccss $
+ * @version     $Id: zh-tw.php 1735 2011-04-30 02:51:16Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->group->common             = '權限分組';
@@ -40,4 +40,13 @@ $lang->group->outside  = '組外用戶';
 $lang->group->copyOptions['copyPriv'] = '複製權限';
 $lang->group->copyOptions['copyUser'] = '複製用戶';
 
+$lang->group->versions['']      = '顯示各版本新增權限';
+$lang->group->versions['1.0.1'] = '禪道1.0.1';
+$lang->group->versions['1.1']   = '禪道1.1';
+$lang->group->versions['1.2']   = '禪道1.2';
+$lang->group->versions['1.3']   = '禪道1.3';
+$lang->group->versions['1.4']   = '禪道1.4';
+$lang->group->versions['1.5']   = '禪道1.5';
+$lang->group->versions['2.0']   = '禪道2.0';
+
 include (dirname(__FILE__) . '/resource.php');
diff --git a/module/index/lang/en.php b/module/index/lang/en.php
index 130569b59e..35089f3fd5 100644
--- a/module/index/lang/en.php
+++ b/module/index/lang/en.php
@@ -30,4 +30,4 @@ $lang->index->myBug    = 'My Bug';
 
 $lang->index->firstUsingTip = "The first time to use zentao? See our <a href='http://www.zentao.net/help-read-79236.html' target='_blank'>help document</a> first.
                                or start using zentao by <a href='%s'>createing a product</a> or <a href='%s'>createing a project</a>。";
-$lang->index->noProjectsTip = "目前还没有进行中的项目，<a href='%s'>马上创建一个项目吧</a>，或者修改已有的项目，将其状态改为<i class='strong'>进行中</i>";
+$lang->index->noProjectsTip = "No running projects yet, you can <a href='%s'>create one now</a> or modify existings to <i class='strong'>running</i>.";
diff --git a/module/index/lang/zh-tw.php b/module/index/lang/zh-tw.php
index 93a9d8621d..1d46df48d1 100644
--- a/module/index/lang/zh-tw.php
+++ b/module/index/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 1555 2011-03-11 13:31:07Z wwccss $
+ * @version     $Id: zh-tw.php 1719 2011-04-27 06:51:50Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->index->common = '首頁';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 3e15e3da8d..798bfa5312 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -12,6 +12,7 @@ $lang->my->story       = '我的需求';
 $lang->my->project     = '我的項目';
 $lang->my->team        = '我的團隊';
 $lang->my->profile     = '我的檔案';
+$lang->my->dynamic     = '我的動態';
 $lang->my->editProfile = '更新信息';
 
 $lang->my->taskMenu->assignedToMe = '指派給我';
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index c81346c6ed..70d08a054f 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     product
- * @version     $Id: zh-tw.php 1429 2011-02-21 14:35:26Z wwccss $
+ * @version     $Id: zh-tw.php 1828 2011-05-02 06:07:58Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->product->common = '產品視圖';
@@ -49,6 +49,7 @@ $lang->product->whitelist = '分組白名單';
 $lang->product->moduleStory = '按模組瀏覽';
 $lang->product->searchStory = '搜索';
 $lang->product->allStory    = '全部需求';
+$lang->product->allProduct  = '全部產品';
 
 $lang->product->statusList['']       = '';
 $lang->product->statusList['normal'] = '正常';
@@ -57,3 +58,5 @@ $lang->product->statusList['closed'] = '結束';
 $lang->product->aclList['open']    = '預設設置(有產品視圖權限，即可訪問)';
 $lang->product->aclList['private'] = '私有項目(只有項目團隊成員才能訪問)';
 $lang->product->aclList['custom']  = '自定義白名單(團隊成員和白名單的成員可以訪問)';
+
+$lang->product->storySummary = "本頁共 <strong>%s</strong> 個需求，預計 <strong>%s</strong> 個工時。";
diff --git a/module/productplan/lang/zh-tw.php b/module/productplan/lang/zh-tw.php
index 213125a854..c3b4349385 100644
--- a/module/productplan/lang/zh-tw.php
+++ b/module/productplan/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     productplan
- * @version     $Id: zh-tw.php 1429 2011-02-21 14:35:26Z wwccss $
+ * @version     $Id: zh-tw.php 1795 2011-05-01 08:37:26Z liukmqd@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->productplan->common    = '產品計劃';
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 4336a50eee..329a15fa29 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 1558 2011-03-11 15:14:33Z wwccss $
+ * @version     $Id: zh-tw.php 1830 2011-05-02 06:50:14Z wwccss $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -88,6 +88,7 @@ $lang->project->finishedByMe        = '由我完成';
 $lang->project->statusWait          = '未開始';
 $lang->project->statusDoing         = '進行中';
 $lang->project->statusDone          = '已完成';
+$lang->project->statusClosed        = '已關閉';
 $lang->project->delayed             = '已延期';
 $lang->project->groups['story']     = '需求分組';
 $lang->project->groups['status']    = '狀態分組';
@@ -111,9 +112,10 @@ $lang->project->allProject          = '所有項目';
 $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->stats          = '總共預計<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->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 = '點擊查看大圖';
 $lang->project->howToUpdateBurn= "<a href='%s' class='helplink'><i>如何更新?</i></a>";
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index e90089a0fc..d1b94f0d65 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -6,23 +6,25 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     story
- * @version     $Id: zh-tw.php 1429 2011-02-21 14:35:26Z wwccss $
+ * @version     $Id: zh-tw.php 1839 2011-05-02 09:22:34Z wwccss $
  * @link        http://www.zentao.net
  */
-$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->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->export      = "導出數據";
+$lang->story->reportChart = "統計報表";
 
 $lang->story->common         = '需求';
 $lang->story->id             = '編號';
@@ -32,6 +34,7 @@ $lang->story->release        = '發佈計劃';
 $lang->story->bug            = '相關bug';
 $lang->story->title          = '需求名稱';
 $lang->story->spec           = '需求描述';
+$lang->story->verify         = '驗收標準';
 $lang->story->type           = '需求類型 ';
 $lang->story->pri            = '優先順序';
 $lang->story->estimate       = '預計工時';
@@ -113,6 +116,7 @@ $lang->story->legendProjectAndTask = '項目任務';
 $lang->story->legendLinkStories    = '相關需求';
 $lang->story->legendChildStories   = '細分需求';
 $lang->story->legendSpec           = '需求描述';
+$lang->story->legendVerify         = '驗收標準';
 $lang->story->legendHistory        = '歷史記錄';
 $lang->story->legendVersion        = '歷史版本';
 $lang->story->legendMisc           = '其他相關';
@@ -142,3 +146,47 @@ $lang->story->action->linked2plan         = array('main' => '$date, 由 <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> 移除。'); 
+
+/* 統計報表。*/
+$lang->story->report->common        = '統計報表';
+$lang->story->report->select        = '請選擇報表類型';
+$lang->story->report->create        = '生成報表';
+$lang->story->report->selectAll     = '全選';
+$lang->story->report->selectReverse = '反選';
+
+$lang->story->report->charts['storysPerProduct']        = '產品需求數量';
+$lang->story->report->charts['storysPerModule']         = '模組需求數量';
+$lang->story->report->charts['storysPerPlan']           = '計划進行統計';
+$lang->story->report->charts['storysPerStatus']         = '狀態進行統計';
+$lang->story->report->charts['storysPerStage']          = '所處階段進行統計';
+$lang->story->report->charts['storysPerPri']            = '優先順序進行統計';
+$lang->story->report->charts['storysPerEstimate']       = '預計工時進行統計';
+$lang->story->report->charts['storysPerOpenedBy']       = '由誰創建來進行統計';
+$lang->story->report->charts['storysPerAssignedTo']     = '當前指派來進行統計';
+$lang->story->report->charts['storysPerClosedReason']   = '關閉原因來進行統計';
+$lang->story->report->charts['storysPerChange']         = '變更次數來進行統計';
+
+$lang->story->report->options->swf                     = 'pie2d';
+$lang->story->report->options->width                   = 'auto';
+$lang->story->report->options->height                  = 300;
+$lang->story->report->options->graph->baseFontSize     = 12;
+$lang->story->report->options->graph->showNames        = 1;
+$lang->story->report->options->graph->formatNumber     = 1;
+$lang->story->report->options->graph->decimalPrecision = 0;
+$lang->story->report->options->graph->animation        = 0;
+$lang->story->report->options->graph->rotateNames      = 0;
+$lang->story->report->options->graph->yAxisName        = 'COUNT';
+$lang->story->report->options->graph->pieRadius        = 100; // 餅圖直徑。
+$lang->story->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
+
+$lang->story->report->storysPerProduct->graph->xAxisName      = '產品';
+$lang->story->report->storysPerModule->graph->xAxisName       = '模組';
+$lang->story->report->storysPerPlan->graph->xAxisName         = '產品計劃';
+$lang->story->report->storysPerStatus->graph->xAxisName       = '狀態';
+$lang->story->report->storysPerStage->graph->xAxisName        = '所處階段';
+$lang->story->report->storysPerPri->graph->xAxisName          = '優先順序';
+$lang->story->report->storysPerOpenedBy->graph->xAxisName     = '由誰創建';
+$lang->story->report->storysPerAssignedTo->graph->xAxisName   = '當前指派';
+$lang->story->report->storysPerClosedReason->graph->xAxisName = '關閉原因';
+$lang->story->report->storysPerEstimate->graph->xAxisName     = '預計時間';
+$lang->story->report->storysPerChange->graph->xAxisName       = '變更次數';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index a416f826c4..4159655589 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 1539 2011-03-10 02:29:19Z yidong@cnezsoft.com $
+ * @version     $Id: zh-tw.php 1792 2011-05-01 08:31:08Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 $lang->task->index     = "任務一覽";
@@ -22,40 +22,44 @@ $lang->task->close     = "關閉任務";
 $lang->task->batchClose= "批量關閉";
 $lang->task->cancel    = "取消任務";
 $lang->task->activate  = "激活任務";
+$lang->task->export    = "導出數據";
+$lang->task->reportChart        = "報表統計";
 $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->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->statusCustom = '狀態排序';
-$lang->task->desc         = '任務描述';
-$lang->task->assignedTo   = '指派給';
-$lang->task->assignedDate = '指派日期';
-$lang->task->openedBy     = '由誰創建';
-$lang->task->openedDate   = '創建日期';
-$lang->task->finishedBy   = '由誰完成';
-$lang->task->finishedDate = '完成時間';
-$lang->task->canceledBy   = '由誰取消';
-$lang->task->canceledDate = '取消時間';
-$lang->task->closedBy     = '由誰關閉';
-$lang->task->closedDate   = '關閉時間';
-$lang->task->closedReason = '關閉原因';
-$lang->task->lastEdited   = '最後編輯';
+$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->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->statusCustom   = '狀態排序';
+$lang->task->desc           = '任務描述';
+$lang->task->assignedTo     = '指派給';
+$lang->task->assignedDate   = '指派日期';
+$lang->task->openedBy       = '由誰創建';
+$lang->task->openedDate     = '創建日期';
+$lang->task->finishedBy     = '由誰完成';
+$lang->task->finishedDate   = '完成時間';
+$lang->task->canceledBy     = '由誰取消';
+$lang->task->canceledDate   = '取消時間';
+$lang->task->closedBy       = '由誰關閉';
+$lang->task->closedDate     = '關閉時間';
+$lang->task->closedReason   = '關閉原因';
+$lang->task->lastEditedBy   = '最後修改';
+$lang->task->lastEditedDate = '最後修改日期';
+$lang->task->lastEdited     = '最後編輯';
 
 $lang->task->statusList['']        = '';
 $lang->task->statusList['wait']    = '未開始';
@@ -111,3 +115,53 @@ $lang->task->copyStoryTitle      = "同需求";
 $lang->task->afterSubmit         = "添加之後";
 $lang->task->successSaved        = "成功添加，";
 $lang->task->delayWarning        = " <strong class='delayed f-14px'> 延期%s天 </strong>";
+
+/* 統計報表。*/
+$lang->task->report->common        = '統計報表';
+$lang->task->report->select        = '請選擇報表類型';
+$lang->task->report->create        = '生成報表';
+$lang->task->report->selectAll     = '全選';
+$lang->task->report->selectReverse = '反選';
+
+$lang->task->report->charts['tasksPerProject']      = '項目任務數統計';
+$lang->task->report->charts['tasksPerAssignedTo']   = '指派給統計';
+$lang->task->report->charts['tasksPerType']         = '任務類型統計';
+$lang->task->report->charts['tasksPerPri']          = '優先順序統計';
+$lang->task->report->charts['tasksPerStatus']       = '任務狀態統計';
+$lang->task->report->charts['tasksPerDeadline']     = '截止日期統計';
+$lang->task->report->charts['tasksPerEstimate']     = '預計時間統計';
+$lang->task->report->charts['tasksPerLeft']         = '剩餘時間統計';
+$lang->task->report->charts['tasksPerConsumed']     = '消耗時間統計';
+$lang->task->report->charts['tasksPerFinishedBy']   = '由誰完成統計';
+$lang->task->report->charts['tasksPerClosedReason'] = '關閉原因統計';
+$lang->task->report->charts['finishedTasksPerDay']  = '每天完成統計';
+
+$lang->task->report->options->swf                     = 'pie2d';
+$lang->task->report->options->width                   = 'auto';
+$lang->task->report->options->height                  = 300;
+$lang->task->report->options->graph->baseFontSize     = 12;
+$lang->task->report->options->graph->showNames        = 1;
+$lang->task->report->options->graph->formatNumber     = 1;
+$lang->task->report->options->graph->decimalPrecision = 0;
+$lang->task->report->options->graph->animation        = 0;
+$lang->task->report->options->graph->rotateNames      = 0;
+$lang->task->report->options->graph->yAxisName        = 'COUNT';
+$lang->task->report->options->graph->pieRadius        = 100; // 餅圖直徑。
+$lang->task->report->options->graph->showColumnShadow = 0;   // 是否顯示柱狀圖陰影。
+
+$lang->task->report->tasksPerProject->graph->xAxisName     = '項目';
+$lang->task->report->tasksPerAssignedTo->graph->xAxisName  = '用戶';
+$lang->task->report->tasksPerType->graph->xAxisName        = '類型';
+$lang->task->report->tasksPerPri->graph->xAxisName         = '優先順序';
+$lang->task->report->tasksPerStatus->graph->xAxisName      = '狀態';
+$lang->task->report->tasksPerDeadline->graph->xAxisName    = '日期';
+$lang->task->report->tasksPerEstimate->graph->xAxisName    = '時間';
+$lang->task->report->tasksPerLeft->graph->xAxisName        = '時間';
+$lang->task->report->tasksPerConsumed->graph->xAxisName    = '時間';
+$lang->task->report->tasksPerFinishedBy->graph->xAxisName  = '用戶';
+$lang->task->report->tasksPerClosedReason->graph->xAxisName = '關閉原因';
+
+$lang->task->report->finishedTasksPerDay->swf         = 'column2d';
+$lang->task->report->finishedTasksPerDay->height      = 400;
+$lang->task->report->finishedTasksPerDay->graph->xAxisName   = '日期';
+$lang->task->report->finishedTasksPerDay->graph->rotateNames = '1';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index 193e961c38..9c1347e2b4 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     testcase
- * @version     $Id: zh-tw.php 1429 2011-02-21 14:35:26Z wwccss $
+ * @version     $Id: zh-tw.php 1739 2011-04-30 05:47:41Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->testcase->id             = '用例編號';
@@ -54,6 +54,7 @@ $lang->testcase->view           = "用例詳情";
 $lang->testcase->edit           = "編輯用例";
 $lang->testcase->delete         = "刪除用例";
 $lang->testcase->browse         = "用例列表";
+$lang->testcase->export         = "導出數據";
 $lang->testcase->confirmStoryChange = '確認需求變動';
 
 $lang->testcase->deleteStep     = '刪除';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index fedfe4497c..6e2429e7f4 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -6,7 +6,7 @@
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     upgrade
- * @version     $Id: zh-tw.php 1577 2011-03-13 01:40:10Z yidong@cnezsoft.com $
+ * @version     $Id: zh-tw.php 1781 2011-05-01 06:46:59Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->upgrade->common  = '升級';
@@ -24,10 +24,11 @@ $lang->upgrade->warnningContent = <<<EOT
    要將上面紅色的部分分別替換成對應的用戶名和禪道系統的資料庫名。<br />
    比如： mysqldump -u root -p zentao >zentao.bak
 EOT;
-$lang->upgrade->setStatusFile = '基于安全考慮，升級之間需要檢查這個檔案：<strong>%s</strong><br />
+$lang->upgrade->setStatusFile = '<p>基于安全考慮，升級之間需要檢查這個檔案：<strong>%s</strong><br />
                                  該檔案不存在或者已經過期，請用下面的命令來創建或者更新它。<br />
                                  linux下面的命令：<strong>touch %s;</strong> <br />
-                                 windows下面的命令：<strong>echo ok > %s</strong>';
+                                 windows下面的命令：<strong>echo ok > %s</strong></p>
+                                 我已經完成上面的工作，<a href="upgrade.php">繼續更新</a>';
 $lang->upgrade->selectVersion = '選擇版本';
 $lang->upgrade->noteVersion   = "務必選擇正確的版本，否則會造成數據丟失。";
 $lang->upgrade->fromVersion   = '原來的版本';
@@ -48,3 +49,4 @@ $lang->upgrade->fromVersions['1_1']       = '1.1';
 $lang->upgrade->fromVersions['1_2']       = '1.2';
 $lang->upgrade->fromVersions['1_3']       = '1.3';
 $lang->upgrade->fromVersions['1_4']       = '1.4';
+$lang->upgrade->fromVersions['1_5']       = '1.5';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 198a4fc8c2..4be6e3a6c8 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 1519 2011-03-07 14:49:57Z wwccss $
+ * @version     $Id: zh-tw.php 1772 2011-05-01 05:49:49Z wwccss $
  * @link        http://www.zentao.net
  */
 $lang->user->common        = '用戶';
@@ -38,6 +38,7 @@ $lang->user->bug         = '用戶Bug';
 $lang->user->todo        = '用戶TODO';
 $lang->user->story       = '用戶需求';
 $lang->user->team        = '用戶團隊';
+$lang->user->dynamic     = '用戶動態';
 $lang->user->editProfile = '修改信息';
 
 $lang->user->errorDeny   = "抱歉，您無權訪問『<b>%s</b>』模組的『<b>%s</b>』功能。請聯繫管理員獲取權限。點擊後退返回上頁。";