From c03f800fe47183ef17d2d601f3c3e8e81cf3461d Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Tue, 6 Dec 2011 06:13:19 +0000
Subject: [PATCH]  * convert the language to zh-tw.

---
 module/action/lang/zh-tw.php |  3 ++-
 module/bug/lang/zh-tw.php    | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 7d1453ce1f..3c626724dd 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 2377 2011-11-29 13:24:37Z wwccss $
+ * @version     $Id: zh-tw.php 2385 2011-12-05 09:23:40Z shiyangyangwork@yahoo.cn $
  * @link        http://www.zentao.net
  */
 $lang->action->common   = '系統日誌';
@@ -63,6 +63,7 @@ $lang->action->desc->activated   = '$date, 由 <strong>$actor</strong> 激活。
 $lang->action->desc->moved       = '$date, 由 <strong>$actor</strong> 移動，之前為 "$extra"' . "\n";
 $lang->action->desc->confirmed   = '$date, 由 <strong>$actor</strong> 確認需求變動，最新版本為<strong>#$extra</strong>' . "\n";
 $lang->action->desc->bugconfirmed= '$date, 由 <strong>$actor</strong> 確認Bug' . "\n";
+$lang->action->desc->frombug     = '$date, 由 <strong>$actor</strong> Bug轉化而來，Bug編號為 <strong>$extra</strong>。';
 $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> 提交代碼，版本為<strong>#$extra</strong>' . "\n";
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index e02dd903ef..c0882e345d 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 2380 2011-11-30 07:46:01Z shiyangyangwork@yahoo.cn $
+ * @version     $Id: zh-tw.php 2390 2011-12-06 06:12:29Z wwccss $
  * @link        http://www.zentao.net
  */
 /* 欄位列表。*/
@@ -173,6 +173,10 @@ $lang->bug->osList['win2003'] = 'Windows 2003';
 $lang->bug->osList['win2008'] = 'Windows 2008';
 $lang->bug->osList['winnt']   = 'Windows NT';
 $lang->bug->osList['win98']   = 'Windows 98';
+$lang->bug->osList['adriod']  = 'Andriod';
+$lang->bug->osList['ios']     = 'IOS';
+$lang->bug->osList['wp7']     = 'WP7';
+$lang->bug->osList['symbian'] = 'Symbian';
 $lang->bug->osList['linux']   = 'Linux';
 $lang->bug->osList['freebsd'] = 'FreeBSD';
 $lang->bug->osList['mac']     = 'Mac OS';
@@ -182,19 +186,22 @@ $lang->bug->osList['others']  = '其他';
 $lang->bug->browserList['']         = '';
 $lang->bug->browserList['all']      = '全部';
 $lang->bug->browserList['ie']       = 'IE系列';
+$lang->bug->browserList['ie8']      = 'IE8';
+$lang->bug->browserList['ie9']      = 'IE9';
 $lang->bug->browserList['ie6']      = 'IE6';
 $lang->bug->browserList['ie7']      = 'IE7';
-$lang->bug->browserList['ie8']      = 'IE8';
+$lang->bug->browserList['chrome']   = 'chrome';
 $lang->bug->browserList['firefox']  = 'firefox系列';
 $lang->bug->browserList['firefox2'] = 'firefox2';
-$lang->bug->browserList['firefox3']  = 'firefox3';
-$lang->bug->browserList['firefox4']  = 'firefox4';
+$lang->bug->browserList['firefox3'] = 'firefox3';
+$lang->bug->browserList['firefox4'] = 'firefox4';
 $lang->bug->browserList['opera']    = 'opera系列';
 $lang->bug->browserList['opera9']   = 'opera9';
 $lang->bug->browserList['oprea10']  = 'opera10';
 $lang->bug->browserList['oprea11']  = 'opera11';
 $lang->bug->browserList['safari']   = 'safari';
-$lang->bug->browserList['chrome']   = 'chrome';
+$lang->bug->browserList['maxthon']  = '傲游';
+$lang->bug->browserList['uc']       = 'UC';
 $lang->bug->browserList['other']    = '其他';
 
 $lang->bug->typeList['']             = '';
@@ -301,3 +308,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>。');
+$lang->bug->action->totask   = array('main' => '$date, 由 <strong>$actor</strong> 導入為<strong>任務</strong>，編號為 <strong>$extra</strong>。');