From 7ae1d0feaba76201ca4a3c41638c082eacbe6935 Mon Sep 17 00:00:00 2001
From: wangchunsheng
Date: Tue, 23 Feb 2010 06:05:08 +0000
Subject: [PATCH] + init the english language package.
---
bin/copylang.php | 13 +-
config/config.php | 2 +-
module/action/lang/en.php | 47 +++++++
module/admin/lang/en.php | 33 +++++
module/bug/lang/en.php | 188 ++++++++++++++++++++------
module/build/lang/en.php | 42 ++++++
module/common/lang/en.php | 235 ++++++++++++++++-----------------
module/company/lang/en.php | 44 +++---
module/convert/lang/en.php | 77 +++++++++++
module/dept/lang/en.php | 35 +++++
module/file/lang/en.php | 25 ++++
module/group/lang/en.php | 202 ++++++++++++++++++++++++++++
module/index/lang/en.php | 12 +-
module/install/lang/en.php | 99 ++++++++++++++
module/my/lang/en.php | 12 ++
module/product/lang/en.php | 55 ++++++++
module/productplan/lang/en.php | 44 ++++++
module/project/lang/en.php | 102 ++++++++++++++
module/qa/lang/en.php | 25 ++++
module/release/lang/en.php | 30 +++--
module/report/lang/en.php | 24 ++++
module/search/lang/en.php | 43 ++++++
module/story/lang/en.php | 143 ++++++++++++++++----
module/story/lang/zh-cn.php | 2 +-
module/task/lang/en.php | 82 ++++++++++++
module/testcase/lang/en.php | 117 ++++++++++++----
module/testtask/lang/en.php | 61 +++++++++
module/todo/lang/en.php | 79 +++++++++++
module/tree/lang/en.php | 39 ++++++
module/upgrade/lang/en.php | 47 +++++++
module/user/lang/en.php | 99 +++++++++-----
31 files changed, 1771 insertions(+), 287 deletions(-)
create mode 100644 module/action/lang/en.php
create mode 100644 module/admin/lang/en.php
create mode 100644 module/build/lang/en.php
create mode 100644 module/convert/lang/en.php
create mode 100644 module/dept/lang/en.php
create mode 100644 module/file/lang/en.php
create mode 100644 module/group/lang/en.php
create mode 100644 module/install/lang/en.php
create mode 100644 module/my/lang/en.php
create mode 100644 module/product/lang/en.php
create mode 100644 module/productplan/lang/en.php
create mode 100644 module/project/lang/en.php
create mode 100644 module/qa/lang/en.php
create mode 100644 module/report/lang/en.php
create mode 100644 module/search/lang/en.php
create mode 100644 module/task/lang/en.php
create mode 100644 module/testtask/lang/en.php
create mode 100644 module/todo/lang/en.php
create mode 100644 module/tree/lang/en.php
create mode 100644 module/upgrade/lang/en.php
diff --git a/bin/copylang.php b/bin/copylang.php
index bb1290c434..8f7d1a34ce 100755
--- a/bin/copylang.php
+++ b/bin/copylang.php
@@ -1,12 +1,17 @@
#!/usr/bin/env php
diff --git a/config/config.php b/config/config.php
index 0050a00aab..d0cd836d8b 100644
--- a/config/config.php
+++ b/config/config.php
@@ -34,7 +34,7 @@ $config->methodVar = 'f'; // requestType=GET:
$config->viewVar = 't'; // requestType=GET: 模板变量名。
$config->views = ',html,'; // 支持的视图列表。
-$config->langs = 'zh-cn'; // 支持的语言列表。
+$config->langs = 'en'; // 支持的语言列表。
$config->themes = 'default'; // 支持的主题列表。
$config->super2OBJ = true; // 是否通过对象来访问全局变量。
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
new file mode 100644
index 0000000000..557f6e25e4
--- /dev/null
+++ b/module/action/lang/en.php
@@ -0,0 +1,47 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package bug
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->action->desc->common = '$date, $action by $actor';
+$lang->action->desc->extra = '$date, $action as $extra by $actor';
+$lang->action->desc->opened = '$date, 鐢 $actor 鍒涘缓銆';
+$lang->action->desc->changed = '$date, 鐢 $actor 鍙樻洿銆';
+$lang->action->desc->edited = '$date, 鐢 $actor 缂栬緫銆';
+$lang->action->desc->closed = '$date, 鐢 $actor 鍏抽棴銆';
+$lang->action->desc->commented = '$date, 鐢 $actor 鍙戣〃璇勮銆';
+$lang->action->desc->activated = '$date, 鐢 $actor 婵娲汇';
+$lang->action->desc->diff1 = '淇敼浜 %s锛屾棫鍊间负 "%s"锛屾柊鍊间负 "%s"銆
';
+$lang->action->desc->diff2 = '淇敼浜 %s锛屽尯鍒负锛%s
';
+
+$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 = '瑙e喅浜';
+$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->space = '銆';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
new file mode 100644
index 0000000000..b5b6806297
--- /dev/null
+++ b/module/admin/lang/en.php
@@ -0,0 +1,33 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package admin
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->admin->common = '鍚庡彴绠$悊';
+$lang->admin->index = '鍚庡彴绠$悊棣栭〉';
+$lang->admin->company = '鍏徃绠$悊';
+$lang->admin->user = '鐢ㄦ埛绠$悊';
+$lang->admin->group = '鍒嗙粍绠$悊';
+$lang->admin->welcome = '娆㈣繋浣跨敤绂呴亾绠$悊杞欢鍚庡彴绠$悊绯荤粺';
+
+$lang->admin->browseCompany = '娴忚鍏徃';
+$lang->admin->browseUser = '娴忚鐢ㄦ埛';
+$lang->admin->browseGroup = '娴忚鍒嗙粍';
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 3d123482fb..4340460c4d 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -1,6 +1,6 @@
bug->common = '缂洪櫡绠$悊';
+$lang->bug->index = '棣栭〉';
+$lang->bug->create = '鍒涘缓Bug';
+$lang->bug->edit = '缂栬緫Bug';
+$lang->bug->browse = 'Bug鍒楄〃';
+$lang->bug->view = 'Bug璇︽儏';
+$lang->bug->resolve = '瑙e喅Bug';
+$lang->bug->close = '鍏抽棴Bug';
+$lang->bug->activate = '婵娲籅ug';
+$lang->bug->ajaxGetUserBugs = '鎺ュ彛:鎴戠殑Bug';
+
+$lang->bug->selectProduct = '璇烽夋嫨浜у搧';
+$lang->bug->byModule = '鎸夋ā鍧';
+$lang->bug->assignToMe = '鎸囨淳缁欐垜';
+$lang->bug->openedByMe = '鐢辨垜鍒涘缓';
+$lang->bug->resolvedByMe = '鐢辨垜瑙e喅';
+$lang->bug->assignToNull = '鏈寚娲';
+$lang->bug->longLifeBugs = '涔呮湭澶勭悊';
+$lang->bug->postponedBugs = '琚欢鏈';
+$lang->bug->allBugs = '鎵鏈塀ug';
+$lang->bug->moduleBugs = '鎸夋ā鍧楁祻瑙';
+$lang->bug->byQuery = '鎼滅储';
+
+$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 = '鐢辫皝瑙e喅';
+
+$lang->bug->confirmChangeProduct = '淇敼浜у搧浼氬鑷寸浉搴旂殑椤圭洰銆侀渶姹傚拰浠诲姟鍙戠敓鍙樺寲锛岀‘瀹氬悧锛';
+
+$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->buttonEdit = '缂栬緫';
+$lang->bug->buttonActivate = '婵娲';
+$lang->bug->buttonResolve = '瑙e喅';
+$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;
+
+/* Define the OS list. */
+$lang->bug->osList['all'] = '鍏ㄩ儴';
+$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['unix'] = 'Unix';
+$lang->bug->osList['others'] = '鍏朵粬';
+
+/* Define the OS list. */
+$lang->bug->browserList['all'] = '鍏ㄩ儴';
+$lang->bug->browserList['ie6'] = 'IE6';
+$lang->bug->browserList['ie7'] = 'IE7';
+$lang->bug->browserList['ie8'] = 'IE8';
+$lang->bug->browserList['firefox2'] = 'firefox2';
+$lang->bug->browserList['firefx3'] = 'firefox3';
+$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'] = '浠g爜閿欒';
+$lang->bug->typeList['interface'] = '鐣岄潰浼樺寲';
+$lang->bug->typeList['designchange'] = '璁捐鍙樻洿';
+$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'] = "涓嶄簣瑙e喅";
+
+$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 = '瑙e喅鑰';
+$lang->bug->resolution = '瑙e喅鏂规';
+$lang->bug->resolvedBuild = '瑙e喅鐗堟湰';
+$lang->bug->resolvedDate = '瑙e喅鏃ユ湡';
+$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->tblStep = "[姝ラ]\n";
+$lang->bug->tblResult = "[缁撴灉]\n";
+$lang->bug->tblExpect = "[鏈熸湜]\n";
+
+$lang->bug->action->resolved = array('main' => '$date, 鐢 $actor 瑙e喅锛屾柟妗堜负 $extra銆', 'extra' => $lang->bug->resolutionList);
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
new file mode 100644
index 0000000000..7f7d7e674b
--- /dev/null
+++ b/module/build/lang/en.php
@@ -0,0 +1,42 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package build
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$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 = '鎻忚堪';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 2acf280bdb..854bd642b2 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -1,8 +1,8 @@
zentaoMS = 'ZenTaoPMS';
-$lang->logout = 'Logout';
-$lang->login = 'Login';
-$lang->currentPos = 'Current POS';
-$lang->arrow = '>>';
+$lang->zentaoMS = '绂呴亾绠$悊';
+$lang->logout = '閫鍑虹郴缁';
+$lang->login = '鐧诲綍';
+$lang->currentPos = '褰撳墠浣嶇疆锛';
+$lang->arrow = ' 禄 ';
$lang->colon = '::';
-$lang->reset = 'Reset';
-$lang->edit = 'Edit';
-$lang->delete = 'Delete';
-$lang->close = 'Close';
-$lang->activate = 'Activate';
-$lang->delete = 'Delete';
-$lang->save = 'Save';
-$lang->actions = 'Actions';
-$lang->comment = 'Comment';
-$lang->history = 'History';
-$lang->welcome = "Welcome to use %s{$lang->colon}{$lang->zentaoMS}";
-$lang->zentaoSite = "Official Site";
-$lang->myControl = "Dashboard";
-$lang->sponser = "PUJIA donated";
-$lang->at = ' at ';
-$lang->feature = 'Feature';
-$lang->year = 'Year';
-$lang->downArrow = '↓';
-$lang->goback = 'Go Back';
-$lang->selectAll = '全选';
-$lang->attatch = '附件';
-$lang->reverse = '(切换顺序)';
-$lang->addFiles = '上传了附件 ';
+$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 = "鏅姞璧炲姪";
+$lang->at = ' 浜 ';
+$lang->feature = '鏈潵';
+$lang->year = '骞';
+$lang->downArrow = '鈫';
+$lang->goback = '杩斿洖';
+$lang->selectAll = '鍏ㄩ';
+$lang->attatch = '闄勪欢';
+$lang->reverse = '锛堝垏鎹㈤『搴忥級';
+$lang->addFiles = '涓婁紶浜嗛檮浠 ';
-/* 主导航菜单。*/
-$lang->menu->index = 'Home|index|index';
-$lang->menu->my = 'Dashboard|my|index';
-$lang->menu->product = 'Product View|product|index';
-$lang->menu->project = 'Project View|project|index';
-$lang->menu->qa = 'QA View|qa|index';
-$lang->menu->company = 'Org View|company|index';
-$lang->menu->admin = 'Admin|admin|index';
+/* 涓诲鑸彍鍗曘*/
+$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->index->menu->product = '浏览产品|product|browse';
-$lang->index->menu->project = '浏览项目|project|browse';
+/* 棣栭〉鑿滃崟璁剧疆銆*/
+$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->project = '我的项目|my|project|';
-$lang->my->menu->story = '我的需求|my|story|';
-$lang->my->menu->bug = '我的Bug|my|bug|';
-$lang->my->menu->profile = array('link' => '我的档案|my|profile|', 'alias' => 'editprofile');
+$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->profile = array('link' => '鎴戠殑妗f|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->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->create = array('link' => '新增产品|product|create', 'float' => 'right');
+$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->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->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->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->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->create = array('link' => '新增项目|project|create', 'float' => 'right');
+$lang->project->menu->create = array('link' => '鏂板椤圭洰|project|create', 'float' => 'right');
$lang->task->menu = $lang->project->menu;
$lang->build->menu = $lang->project->menu;
-/* QA视图菜单设置。*/
+/* 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->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->bug->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s');
+$lang->bug->menu->bug = array('link' => '缂洪櫡绠$悊|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active', '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->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s');
+$lang->testcase->menu->bug = array('link' => '缂洪櫡绠$悊|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active');
+$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', '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->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->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->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->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->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->project = '项目列表|user|project|account=%s';
-$lang->user->menu->bug = 'Bug列表|user|bug|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->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->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->upgrade = array('link' => '升级|upgrade|index', 'subModule' => 'upgrade');
-$lang->admin->menu->createCompany = array('link' => '新增公司|company|create', '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->menugroup->release = 'product';
$lang->menugroup->story = 'product';
$lang->menugroup->productplan = 'product';
@@ -168,25 +167,25 @@ $lang->menugroup->people = 'company';
$lang->menugroup->dept = 'company';
$lang->menugroup->todo = 'my';
-/* 错误提示信息。*/
-$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->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->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->int = array("銆%s銆忓簲褰撴槸鏁板瓧銆", "銆%s銆忓簲褰撲粙浜庛%s-%s銆忎箣闂淬");
+$lang->error->float = "銆%s銆忓簲褰撴槸鏁板瓧锛屽彲浠ユ槸灏忔暟銆";
+$lang->error->email = "銆%s銆忓簲褰撲负鍚堟硶鐨凟MAIL銆";
+$lang->error->date = "銆%s銆忓簲褰撲负鍚堟硶鐨勬棩鏈熴";
+$lang->error->account = "銆%s銆忓簲褰撲负鍚堟硶鐨勭敤鎴峰悕銆";
+$lang->error->passwordsame = "涓ゆ瀵嗙爜搴斿綋鐩哥瓑銆";
+$lang->error->passwordrule = "瀵嗙爜搴旇绗﹀悎瑙勫垯銆";
-/* 分页信息。*/
-$lang->pager->noRecord = "暂时没有记录";
-$lang->pager->digest = "共%s条记录,每页 %s条,页面:%s/%s ";
-$lang->pager->first = "首页";
-$lang->pager->pre = "上页";
-$lang->pager->next = "下页";
-$lang->pager->last = "末页";
+/* 鍒嗛〉淇℃伅銆*/
+$lang->pager->noRecord = "鏆傛椂娌℃湁璁板綍";
+$lang->pager->digest = "鍏%s鏉¤褰,姣忛〉 %s鏉★紝椤甸潰锛%s/%s ";
+$lang->pager->first = "棣栭〉";
+$lang->pager->pre = "涓婇〉";
+$lang->pager->next = "涓嬮〉";
+$lang->pager->last = "鏈〉";
$lang->pager->locate = "GO!";
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index f7b7814b05..8c978082d1 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -1,6 +1,6 @@
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->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] = '鍏佽';
diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php
new file mode 100644
index 0000000000..4bc0885551
--- /dev/null
+++ b/module/convert/lang/en.php
@@ -0,0 +1,77 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package convert
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->convert->common = '浠庡叾浠栫郴缁熷鍏';
+$lang->convert->next = '涓嬩竴姝';
+$lang->convert->pre = '杩斿洖';
+$lang->convert->reload = '鍒锋柊';
+$lang->convert->error = '閿欒 ';
+
+$lang->convert->start = '寮濮嬭浆鎹';
+$lang->convert->desc = <<娆㈣繋浣跨敤绯荤粺杞崲鍚戝锛屾湰绋嬪簭浼氬府鍔╂偍灏嗗叾浠栫郴缁熺殑鏁版嵁杞崲鍒扮閬撻」鐩鐞嗙郴缁熶腑銆
+杞崲瀛樺湪涓瀹氱殑椋庨櫓锛岃浆鎹箣鍓嶏紝鎴戜滑寮虹儓寤鸿鎮ㄥ浠芥暟鎹簱鍙婄浉搴旂殑鏁版嵁鏂囦欢锛屽苟淇濊瘉杞崲鐨勬椂鍊欙紝娌℃湁鍏朵粬浜鸿繘琛屾搷浣溿
+EOT;
+
+$lang->convert->selectSource = '閫夋嫨鏉ユ簮绯荤粺鍙婄増鏈';
+$lang->convert->source = '鏉ユ簮绯荤粺';
+$lang->convert->version = '鐗堟湰';
+$lang->convert->mustSelectSource = "蹇呴』閫夋嫨涓涓潵婧愩";
+
+$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.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->actions = '鍘嗗彶璁板綍';
+$lang->convert->bugfree->files = '闄勪欢';
+
+$lang->convert->errorConnectDB = '鏁版嵁搴撹繛鎺ュけ璐 ';
+$lang->convert->errorFileNotExits = '鏂囦欢 %s 涓嶅瓨鍦';
+$lang->convert->errorUserExists = '鐢ㄦ埛 %s 宸插瓨鍦';
+$lang->convert->errorCopyFailed = '鏂囦欢 %s 鎷疯礉澶辫触';
diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php
new file mode 100644
index 0000000000..bd81f19689
--- /dev/null
+++ b/module/dept/lang/en.php
@@ -0,0 +1,35 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package dept
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$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 = " 鎮ㄧ‘瀹氬垹闄よ閮ㄩ棬鍚楋紵";
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
new file mode 100644
index 0000000000..43d3f07715
--- /dev/null
+++ b/module/file/lang/en.php
@@ -0,0 +1,25 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package file
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->file->common = '闄勪欢';
+$lang->file->label = '鏍囬锛';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
new file mode 100644
index 0000000000..45f6b9ae3b
--- /dev/null
+++ b/module/group/lang/en.php
@@ -0,0 +1,202 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package group
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->group->common = '鏉冮檺鍒嗙粍';
+$lang->group->browse = '娴忚鍒嗙粍';
+$lang->group->create = '鏂板鍒嗙粍';
+$lang->group->edit = '缂栬緫鍒嗙粍';
+$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 = '鍏ㄩ';
+
+/* 鎵鏈塺esource鍒楄〃銆*/
+$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->project = 'project';
+$lang->resource->my->profile = 'profile';
+$lang->resource->my->editProfile = 'editProfile';
+
+$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->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->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->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->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->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';
+$lang->resource->build->ajaxGetProductBuilds = 'ajaxGetProductBuilds';
+$lang->resource->build->ajaxGetProjectBuilds = 'ajaxGetProjectBuilds';
+
+$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';
+
+$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->testtask->index = 'index';
+$lang->resource->testtask->create = 'create';
+$lang->resource->testtask->browse = 'browse';
+$lang->resource->testtask->view = 'view';
+$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->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->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->delete = 'delete';
+$lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu';
+
+$lang->resource->search->buildForm = 'buildForm';
+$lang->resource->search->buildQuery = 'buildQuery';
+
+$lang->resource->admin->index = 'index';
+$lang->resource->admin->browseCompany = 'browseCompany';
diff --git a/module/index/lang/en.php b/module/index/lang/en.php
index 669d3bd46f..fd5b94d5c6 100644
--- a/module/index/lang/en.php
+++ b/module/index/lang/en.php
@@ -1,6 +1,8 @@
* @package ZenTaoMS
* @version $Id$
- * @link http://www.zentao.cn/
+ * @link http://www.zentao.cn
*/
-$lang['welcome'] = 'Welcome to ZenTaoMS system!';
+$lang->index->common = '棣栭〉';
+$lang->index->index = '棣栭〉';
+$lang->index->ping = '鎺ュ彛:鍚屾session';
+$lang->index->latest = '鏈鏂板姩鎬';
+$lang->index->action = '%s, %s %s %s %s';
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
new file mode 100644
index 0000000000..1b3043385a
--- /dev/null
+++ b/module/install/lang/en.php
@@ -0,0 +1,99 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package install
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->install->common = '瀹夎';
+$lang->install->next = '涓嬩竴姝';
+$lang->install->pre = '杩斿洖';
+$lang->install->reload = '鍒锋柊';
+$lang->install->error = '閿欒 ';
+
+$lang->install->start = '寮濮嬪畨瑁';
+$lang->install->welcome = '娆㈣繋浣跨敤绂呴亾椤圭洰绠$悊杞欢锛';
+$lang->install->desc = <<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閰嶇疆鏂囦欢锛屽姞杞絇DO鎵╁睍銆';
+$lang->install->pdoMySQL = 'PDO_MySQL鎵╁睍';
+$lang->install->pdoMySQLFail = '淇敼PHP閰嶇疆鏂囦欢锛屽姞杞絧do_mysql鎵╁睍銆';
+$lang->install->tmpRoot = '涓存椂鏂囦欢鐩綍';
+$lang->install->dataRoot = '涓婁紶鏂囦欢鐩綍';
+$lang->install->mkdir = '闇瑕佸垱寤虹洰褰%s銆
linux涓嬮潰鍛戒护涓猴細
mkdir -p %s
';
+$lang->install->chmod = '闇瑕佷慨鏀圭洰褰 "%s" 鐨勬潈闄愩
linux涓嬮潰鍛戒护涓猴細
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->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 = '鎷疯礉涓婇潰鏂囨湰妗嗕腑鐨勫唴瀹癸紝灏嗗叾淇濆瓨鍒 " %s "涓';
+$lang->install->errorNotSaveConfig = '杩樻病鏈変繚瀛橀厤缃枃浠';
+
+$lang->install->getPriv = '璁剧疆甯愬彿';
+$lang->install->company = '鍏徃鍚嶇О';
+$lang->install->pms = 'PMS鍦板潃';
+$lang->install->pmsNote = '鍗抽氳繃浠涔堝湴鍧鍙互璁块棶鍒扮閬撻」鐩鐞嗭紝璁剧疆鍩熷悕鎴栬匢P鍦板潃鍗冲彲锛屼笉闇瑕乭ttp';
+$lang->install->account = '绠$悊鍛樺笎鍙';
+$lang->install->password = '绠$悊鍛樺瘑鐮';
+$lang->install->errorEmptyPassword = '瀵嗙爜涓嶈兘涓虹┖';
+
+$lang->install->success = "瀹夎鎴愬姛锛佽鍒犻櫎install.php锛岀櫥褰曠閬撶鐞嗙郴缁燂紝璁剧疆鐢ㄦ埛鍙婂垎缁勶紒";
+
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
new file mode 100644
index 0000000000..abc7bd3d68
--- /dev/null
+++ b/module/my/lang/en.php
@@ -0,0 +1,12 @@
+my->common = '鎴戠殑鍦扮洏';
+$lang->my->index = '棣栭〉';
+$lang->my->profile = '鎴戠殑妗f';
+$lang->my->project = '鎴戠殑椤圭洰';
+$lang->my->task = '鎴戠殑浠诲姟';
+$lang->my->bug = '鎴戠殑Bug';
+$lang->my->todo = '鎴戠殑TODO';
+$lang->my->story = '鎴戠殑闇姹';
+$lang->my->team = '鎴戠殑鍥㈤槦';
+$lang->my->editProfile = '鏇存柊淇℃伅';
+$lang->my->profile = '鎴戠殑妗f';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
new file mode 100644
index 0000000000..b0ea9d045d
--- /dev/null
+++ b/module/product/lang/en.php
@@ -0,0 +1,55 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package product
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->product->common = '浜у搧瑙嗗浘';
+$lang->product->index = "浜у搧棣栭〉";
+$lang->product->browse = "娴忚浜у搧";
+$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 = '浜у搧浠e彿涓嶈兘涓虹┖';
+
+$lang->product->id = '缂栧彿';
+$lang->product->company = '鎵灞炲叕鍙';
+$lang->product->name = '浜у搧鍚嶇О';
+$lang->product->code = '浜у搧浠e彿';
+$lang->product->order = '鎺掑簭';
+$lang->product->status = '鐘舵';
+$lang->product->desc = '浜у搧鎻忚堪';
+
+$lang->product->moduleStory = '鎸夋ā鍧楁祻瑙';
+$lang->product->searchStory = '鎼滅储';
+$lang->product->allStory = '鍏ㄩ儴闇姹';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
new file mode 100644
index 0000000000..f1d2eacc98
--- /dev/null
+++ b/module/productplan/lang/en.php
@@ -0,0 +1,44 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package productplan
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$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 = '缁撴潫鏃ユ湡';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
new file mode 100644
index 0000000000..7360294c80
--- /dev/null
+++ b/module/project/lang/en.php
@@ -0,0 +1,102 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package project
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$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 = '浣滀负鐩綍';
+$lang->project->type = '椤圭洰绫诲瀷';
+$lang->project->parent = '涓婄骇椤圭洰';
+$lang->project->name = '椤圭洰鍚嶇О';
+$lang->project->code = '椤圭洰浠e彿';
+$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->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銆忓伐鏃
宸茬粡娑堣椼%s銆忓伐鏃
棰勮鍓╀綑銆%s銆忓伐鏃';
+$lang->project->oneLineStats = "椤圭洰銆%s銆, 浠e彿涓恒%s銆, 鐩稿叧浜у搧涓恒%s銆忥紝銆%s銆忓紑濮嬶紝銆%s銆忕粨鏉燂紝鎬婚璁°%s銆忓伐鏃讹紝宸叉秷鑰椼%s銆忓伐鏃讹紝棰勮鍓╀綑銆%s銆忓伐鏃躲";
+
+$lang->project->statusList->wait = '鏈紑濮';
+$lang->project->statusList->doing = '杩涜涓';
+$lang->project->statusList->done = '宸插畬鎴';
+
+$lang->team->account = '鐢ㄦ埛';
+$lang->team->role = '瑙掕壊';
+$lang->team->joinDate = '鍔犵洘鏃';
+$lang->team->workingHour = '宸ユ椂/澶';
+
+$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;
diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php
new file mode 100644
index 0000000000..a04fac4e3f
--- /dev/null
+++ b/module/qa/lang/en.php
@@ -0,0 +1,25 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package company
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->qa->common = 'QA瑙嗗浘';
+$lang->qa->index = "QA棣栭〉";
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index c56af01c11..a24ab5cb6b 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -1,6 +1,6 @@
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 = '鎻忚堪';
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
new file mode 100644
index 0000000000..da8ecd67f2
--- /dev/null
+++ b/module/report/lang/en.php
@@ -0,0 +1,24 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package report
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->report->common = '鎶ヨ〃';
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
new file mode 100644
index 0000000000..d7d4e33f11
--- /dev/null
+++ b/module/search/lang/en.php
@@ -0,0 +1,43 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package search
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->search->common = '鎼滅储';
+$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->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'] = '鎴栬';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 9ec52ca95a..167ee1612b 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -1,6 +1,6 @@
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->bugs = "Bug";
+$lang->story->linkStory = 'Link Story';
+
+$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->statusList[''] = '';
+$lang->story->statusList['draft'] = 'Draft';
+$lang->story->statusList['active'] = 'Active';
+$lang->story->statusList['closed'] = 'Closed';
+$lang->story->statusList['changed'] = '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[3] = '涓鑸';
+$lang->story->priList[1] = '鏈楂';
+$lang->story->priList[2] = '杈冮珮';
+$lang->story->priList[4] = '鏈浣';
+
+$lang->story->legendBasicInfo = '鍩烘湰淇℃伅';
+$lang->story->legendLifeTime = 'Story鐨勪竴鐢';
+$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->legendHistory = '鍘嗗彶璁板綍';
+$lang->story->legendVersion = '鍘嗗彶鐗堟湰';
+$lang->story->legendMisc = '鍏朵粬鐩稿叧';
+
+$lang->story->specTemplate = "寤鸿鍙傝冪殑妯℃澘锛
浣滀负涓鍚<鏌愮绫诲瀷鐨勭敤鎴>
鎴戝笇鏈<杈炬垚鏌愪簺鐩殑>
杩欐牱鍙互<寮鍙戠殑浠峰>";
+$lang->story->needNotReview = '涓嶉渶瑕佽瘎瀹';
+$lang->story->confirmDelete = "鎮ㄧ‘璁ゅ垹闄よStory鍚?";
+$lang->story->errorFormat = 'Story鏁版嵁鏈夎';
+$lang->story->errorEmptyTitle = '鏍囬涓嶈兘涓虹┖';
+$lang->story->mustChooseResult = '蹇呴』閫夋嫨璇勫缁撴灉';
+$lang->story->mustChoosePreVersion = '蹇呴』閫夋嫨鍥炴函鐨勭増鏈';
+$lang->story->ajaxGetProjectStories = '鎺ュ彛:鑾峰彇椤圭洰Story鍒楄〃';
+$lang->story->ajaxGetProductStories = '鎺ュ彛:鑾峰彇浜у搧Story鍒楄〃';
+
+$lang->story->action->reviewed = array('main' => '$date, 鐢 $actor 璁板綍璇勫缁撴灉锛岀粨鏋滀负 $extra銆', 'extra' => $lang->story->reviewResultList);
+$lang->story->action->closed = array('main' => '$date, 鐢 $actor 鍏抽棴锛屽師鍥犱负 $extra銆', 'extra' => $lang->story->reasonList);
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index bb7633afe5..0b4e01aaa5 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -38,7 +38,7 @@ $lang->story->common = '闇姹';
$lang->story->id = '缂栧彿';
$lang->story->product = '鎵灞炰骇鍝';
$lang->story->module = '鎵灞炴ā鍧';
-$lang->story->replease = '鍙戝竷璁″垝';
+$lang->story->release = '鍙戝竷璁″垝';
$lang->story->bug = '鐩稿叧bug';
$lang->story->title = '闇姹傚悕绉';
$lang->story->spec = '闇姹傛弿杩';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
new file mode 100644
index 0000000000..ad166d3f26
--- /dev/null
+++ b/module/task/lang/en.php
@@ -0,0 +1,82 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package task
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->task->index = "浠诲姟涓瑙";
+$lang->task->create = "鏂板浠诲姟";
+$lang->task->import = "瀵煎叆涔嬪墠鏈畬浠诲姟";
+$lang->task->edit = "鏇存柊浠诲姟";
+$lang->task->delete = "鍒犻櫎浠诲姟";
+$lang->task->view = "鏌ョ湅浠诲姟";
+
+$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->estimate = '鏈鍒濋璁';
+$lang->task->left = '棰勮鍓╀綑';
+$lang->task->consumed = '宸叉秷鑰';
+$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['misc'] = '鍏朵粬';
+
+$lang->task->priList[3] = '涓鑸';
+$lang->task->priList[1] = '鏈楂';
+$lang->task->priList[2] = '杈冮珮';
+$lang->task->priList[4] = '鏈浣';
+
+$lang->task->afterChoices['continueAdding'] = '缁х画涓鸿闇姹傛坊鍔犱换鍔';
+$lang->task->afterChoices['toTastList'] = '杩斿洖浠诲姟鍒楄〃';
+$lang->task->afterChoices['toStoryList'] = '杩斿洖闇姹傚垪琛';
+
+$lang->task->buttonEdit = '缂栬緫';
+$lang->task->buttonBackToList = '杩斿洖';
+
+$lang->task->legendBasic = '鍩烘湰淇℃伅';
+$lang->task->legendDesc = '浠诲姟鎻忚堪';
+$lang->task->legendAction = '鎿嶄綔';
+
+$lang->task->ajaxGetUserTasks = "鎺ュ彛:鎴戠殑浠诲姟";
+$lang->task->ajaxGetProjectTasks = "鎺ュ彛:椤圭洰浠诲姟";
+$lang->task->confirmDelete = "鎮ㄧ‘瀹氳鍒犻櫎杩欎釜浠诲姟鍚楋紵";
+$lang->task->copyStoryTitle = "鍚岄渶姹";
+$lang->task->afterSubmit = "娣诲姞涔嬪悗";
+$lang->task->successSaved = "鎴愬姛娣诲姞锛";
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 5e6fbafcb1..26cc2c5715 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -1,6 +1,6 @@
- * @package case
+ * @package testcase
* @version $Id$
* @link http://www.zentao.cn
*/
-$lang['page']['common'] = 'case';
-$lang['page']['index'] = "{$lang['page']['common']}/index";
-$lang['page']['create'] = "{$lang['page']['common']}/create";
-$lang['page']['read'] = "{$lang['page']['common']}/read";
-$lang['page']['update'] = "{$lang['page']['common']}/update";
-$lang['page']['delete'] = "{$lang['page']['common']}/delete";
-$lang['case']['id'] = 'id';
-$lang['case']['product'] = 'product';
-$lang['case']['module'] = 'module';
-$lang['case']['path'] = 'path';
-$lang['case']['story'] = 'story';
-$lang['case']['title'] = 'title';
-$lang['case']['pri'] = 'pri';
-$lang['case']['type'] = 'type';
-$lang['case']['status'] = 'status';
-$lang['case']['frequency'] = 'frequency';
-$lang['case']['order'] = 'order';
-$lang['case']['openedBy'] = 'openedBy';
-$lang['case']['openedDate'] = 'openedDate';
-$lang['case']['lastEditedBy'] = 'lastEditedBy';
-$lang['case']['lastEditedDate'] = 'lastEditedDate';
-$lang['case']['field1'] = 'field1';
-$lang['case']['field2'] = 'field2';
-$lang['case']['feidl3'] = 'feidl3';
-$lang['case']['version'] = 'version';
+$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->case = $lang->testcase; // 鐢ㄤ簬DAO妫鏌ユ椂浣跨敤銆傚洜涓篶ase鏄郴缁熷叧閿瓧锛屾墍浠ユ棤娉曞畾涔夎妯″潡涓篶ase锛屽彧鑳戒娇鐢╰estcase锛屼絾琛ㄨ繕鏄娇鐢ㄧ殑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->browse = "鐢ㄤ緥鍒楄〃";
+
+$lang->testcase->deleteStep = '锝';
+$lang->testcase->insertBefore = '锛嬧啈';
+$lang->testcase->insertAfter = '锛嬧啌';
+
+$lang->testcase->selectProduct = '璇烽夋嫨浜у搧';
+$lang->testcase->byModule = '鎸夋ā鍧';
+$lang->testcase->assignToMe = '鎸囨淳缁欐垜';
+$lang->testcase->openedByMe = '鐢辨垜鍒涘缓';
+$lang->testcase->allCases = '鎵鏈塁ase';
+$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->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->statusList[''] = '';
+$lang->testcase->statusList['normal'] = '姝e父';
+$lang->testcase->statusList['blocked'] = 'Blocked';
+
+$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 = '杩斿洖';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
new file mode 100644
index 0000000000..637c05802f
--- /dev/null
+++ b/module/testtask/lang/en.php
@@ -0,0 +1,61 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package testtask
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->testtask->index = "娴嬭瘯浠诲姟棣栭〉";
+$lang->testtask->create = "鍒涘缓娴嬭瘯浠诲姟";
+$lang->testtask->delete = "鍒犻櫎娴嬭瘯浠诲姟";
+$lang->testtask->view = "娴嬭瘯浠诲姟璇︽儏";
+$lang->testtask->edit = "缂栬緫娴嬭瘯浠诲姟";
+$lang->testtask->browse = "娴嬭瘯浠诲姟鍒楄〃";
+$lang->testtask->linkCase = "鍏宠仈鐢ㄤ緥";
+$lang->testtask->unlinkCase = "绉婚櫎";
+$lang->testtask->batchAssign = "鎵归噺鎸囨淳";
+$lang->testtask->runCase = "鎵ц";
+$lang->testtask->results = "缁撴灉";
+$lang->testtask->createBug = "鍒涘缓Bug";
+$lang->testtask->assign = '鎸囨淳';
+
+$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 = '鍏ㄩ儴閫氳繃';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
new file mode 100644
index 0000000000..45c6c385e0
--- /dev/null
+++ b/module/todo/lang/en.php
@@ -0,0 +1,79 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package todo
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->todo->common = 'TODO';
+$lang->todo->index = "todo涓瑙";
+$lang->todo->create = "鏂板TODO";
+$lang->todo->edit = "鏇存柊TODO";
+$lang->todo->view = "TODO璇︽儏";
+$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->date = '鏃ユ湡';
+$lang->todo->begin = '寮濮嬫椂闂';
+$lang->todo->end = '缁撴潫鏃堕棿';
+$lang->todo->beginAndEnd = '璧锋鏃堕棿';
+$lang->todo->type = '绫诲瀷';
+$lang->todo->pri = '浼樺厛绾';
+$lang->todo->name = '鍚嶇О';
+$lang->todo->status = '鐘舵';
+$lang->todo->desc = '鎻忚堪';
+$lang->todo->private = '绉佷汉浜嬪姟';
+
+$lang->todo->week = '鏄熸湡';
+$lang->todo->today = '浠婂ぉ';
+$lang->todo->weekDateList = '涓,浜,涓,鍥,浜,鍏,澶';
+$lang->todo->dayInFeature = '鏆備笉鎸囧畾';
+
+$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 = '鎵鏈塗ODO';
+$lang->todo->allUndone = '涔嬪墠鏈畬';
+$lang->todo->todayTodos = '浠婃棩瀹夋帓';
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
new file mode 100644
index 0000000000..1b71e50070
--- /dev/null
+++ b/module/tree/lang/en.php
@@ -0,0 +1,39 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package tree
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->tree->common = '妯″潡缁存姢';
+$lang->tree->add = "娣诲姞";
+$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 = " 鎮ㄧ‘瀹氬垹闄よ妯″潡鍚楋紵";
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
new file mode 100644
index 0000000000..84907a3804
--- /dev/null
+++ b/module/upgrade/lang/en.php
@@ -0,0 +1,47 @@
+.
+ *
+ * @copyright Copyright 2009-2010 Chunsheng Wang
+ * @author Chunsheng Wang
+ * @package upgrade
+ * @version $Id$
+ * @link http://www.zentao.cn
+ */
+$lang->upgrade->common = '鍗囩骇';
+$lang->upgrade->result = '鍗囩骇缁撴灉';
+$lang->upgrade->fail = '鍗囩骇澶辫触';
+$lang->upgrade->success = '鍗囩骇鎴愬姛';
+$lang->upgrade->tohome = '杩斿洖棣栭〉';
+$lang->upgrade->warnning= '璀﹀憡';
+$lang->upgrade->warnningContent = <<
+澶囦唤鏂规硶锛
+1. 鍙互閫氳繃phpMyAdmin杩涜澶囦唤銆
+2. 浣跨敤mysql鍛戒护琛岀殑宸ュ叿銆
+ # mysqldump -u username -p dbname > filename
+ 瑕佸皢涓婇潰绾㈣壊鐨勯儴鍒嗗垎鍒浛鎹㈡垚瀵瑰簲鐨勭敤鎴峰悕鍜岀閬撶郴缁熺殑鏁版嵁搴撳悕銆
+ 姣斿锛 mysqldump -u root -p zentao >zentao.bak
+EOT;
+$lang->upgrade->selectVersion = '閫夋嫨鐗堟湰';
+$lang->upgrade->noteVersion = "鍔″繀閫夋嫨姝g‘鐨勭増鏈紝鍚﹀垯浼氶犳垚鏁版嵁涓㈠け銆";
+$lang->upgrade->fromVersion = '鍘熸潵鐨勭増鏈';
+$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';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 1c5034a01a..15a1a17119 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -1,6 +1,6 @@
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->editProfile = "淇敼涓汉淇℃伅";
+$lang->user->editPassword = "淇敼瀵嗙爜";
+$lang->user->deny = "璁块棶鍙楅檺";
+$lang->user->confirmDelete = "鎮ㄧ‘璁ゅ垹闄よUser鍚楋紵";
+$lang->user->confirmActivate = "鎮ㄧ‘璁ゆ縺娲昏User鍚楋紵";
+$lang->user->relogin = "閲嶆柊鐧诲綍";
+$lang->user->asGuest = "娓稿璁块棶";
+$lang->user->goback = "杩斿洖鍓嶄竴椤";
+$lang->user->allUsers = '鍏ㄩ儴User';
+
+$lang->user->profile = 'User妗f';
+$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->editProfile = '淇敼淇℃伅';
+
+$lang->user->welcom = "娆㈣繋浣跨敤%s鍏徃椤圭洰绠$悊绯荤粺";
+$lang->user->errorDeny = "鎶辨瓑锛屾偍鏃犳潈璁块棶銆%s銆忔ā鍧楃殑銆%s銆忓姛鑳姐傝鑱旂郴绠$悊鍛樿幏鍙栨潈闄愩傜偣鍑诲悗閫杩斿洖涓婇〉銆";
+
+$lang->user->gendarList->m = '鐢';
+$lang->user->gendarList->f = '濂';
+$lang->user->statusList['active'] = '姝e父';
+$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->msn = 'MSN';
+$lang->user->qq = 'QQ';
+$lang->user->yahoo = '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';