From 3b509b7681cab7e37e12d446f606692fef4f5faa Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Fri, 4 Mar 2011 09:06:00 +0000
Subject: [PATCH]  * add win2003, win2008, mac, firefox4, opera11 to the bug
 option.  * fix the firefx3 error.

---
 db/update1.4.sql          | 2 ++
 module/bug/lang/en.php    | 7 ++++++-
 module/bug/lang/zh-cn.php | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/db/update1.4.sql b/db/update1.4.sql
index b92f142eec..fc0cf8dab5 100644
--- a/db/update1.4.sql
+++ b/db/update1.4.sql
@@ -1,2 +1,4 @@
 -- 2011-2-16 change the length of the desc field.
 ALTER TABLE `zt_build` CHANGE `desc` `desc` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+-- 2011i-3-4  fix the error of bug's browse: 
+UPDATE zt_bug set browser='firefox3' where browser='firefx3';
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 36c63a1acb..b4652729e1 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -156,10 +156,13 @@ $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['win2003'] = 'Windows 2003';
+$lang->bug->osList['win2008'] = 'Windows 2008';
 $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['mac']     = 'Mac OS';
 $lang->bug->osList['unix']    = 'Unix';
 $lang->bug->osList['others']  = 'Others';
 
@@ -171,10 +174,12 @@ $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['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['other']    = 'Others';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 04a3dc1e4b..0ca040ba4e 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -156,10 +156,13 @@ $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['win2003'] = 'Windows 2003';
+$lang->bug->osList['win2008'] = 'Windows 2008';
 $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['mac']     = 'Mac OS';
 $lang->bug->osList['unix']    = 'Unix';
 $lang->bug->osList['others']  = '其他';
 
@@ -171,10 +174,12 @@ $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['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['other']    = '其他';