+ init the english language package.

2010-02-23 06:05:08 +00:00
parent 90c13dd685
commit 7ae1d0feab
31 changed files with 1771 additions and 287 deletions
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * The action module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @package     bug
+ * @version     $Id$
+ * @link        http://www.zentao.cn
+ */
+$lang->action->desc->common    = '$date, <strong>$action</strong> by <strong>$actor</strong>';
+$lang->action->desc->extra     = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>';
+$lang->action->desc->opened    = '$date, 由 <strong>$actor</strong> 创建。';
+$lang->action->desc->changed   = '$date, 由 <strong>$actor</strong> 变更。';
+$lang->action->desc->edited    = '$date, 由 <strong>$actor</strong> 编辑。';
+$lang->action->desc->closed    = '$date, 由 <strong>$actor</strong> 关闭。';
+$lang->action->desc->commented = '$date, 由 <strong>$actor</strong> 发表评论。';
+$lang->action->desc->activated = '$date, 由 <strong>$actor</strong> 激活。';
+$lang->action->desc->diff1     = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />';
+$lang->action->desc->diff2     = '修改了 <strong><i>%s</i></strong>，区别为：<blockquote>%s</blockquote>';
+
+$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  = '解决了';
+$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     = '　';
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * The admin module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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   = '浏览分组';
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The bug module en file of ZenTaoMS.
+ * The bug module english file of ZenTaoMS.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -21,43 +21,149 @@
 * @version     $Id$
 * @link        http://www.zentao.cn
 */
-$lang['page']['common']        = 'bug';
-$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['bug']['id']             = 'id';
-$lang['bug']['product']        = 'product';
-$lang['bug']['module']         = 'module';
-$lang['bug']['path']           = 'path';
-$lang['bug']['project']        = 'project';
-$lang['bug']['sprint']         = 'sprint';
-$lang['bug']['story']          = 'story';
-$lang['bug']['task']           = 'task';
-$lang['bug']['title']          = 'title';
-$lang['bug']['severity']       = 'severity';
-$lang['bug']['type']           = 'type';
-$lang['bug']['os']             = 'os';
-$lang['bug']['browser']        = 'browser';
-$lang['bug']['machine']        = 'machine';
-$lang['bug']['found']          = 'found';
-$lang['bug']['steps']          = 'steps';
-$lang['bug']['status']         = 'status';
-$lang['bug']['mailto']         = 'mailto';
-$lang['bug']['openedBy']       = 'openedBy';
-$lang['bug']['openedDate']     = 'openedDate';
-$lang['bug']['openedBuild']    = 'openedBuild';
-$lang['bug']['assignedTo']     = 'assignedTo';
-$lang['bug']['assignedDate']   = 'assignedDate';
-$lang['bug']['resolvedBy']     = 'resolvedBy';
-$lang['bug']['resolution']     = 'resolution';
-$lang['bug']['resolvedBuild']  = 'resolvedBuild';
-$lang['bug']['resolvedDate']   = 'resolvedDate';
-$lang['bug']['closedBy']       = 'closedBy';
-$lang['bug']['closedDate']     = 'closedDate';
-$lang['bug']['lastEditedBy']   = 'lastEditedBy';
-$lang['bug']['lastEditedDate'] = 'lastEditedDate';
-$lang['bug']['field1']         = 'field1';
-$lang['bug']['field2']         = 'field2';
-$lang['bug']['feild3']         = 'feild3';
+$lang->bug->common         = '缺陷管理';
+$lang->bug->index          = '首页';
+$lang->bug->create         = '创建Bug';
+$lang->bug->edit           = '编辑Bug';
+$lang->bug->browse         = 'Bug列表';
+$lang->bug->view           = 'Bug详情';
+$lang->bug->resolve        = '解决Bug';
+$lang->bug->close          = '关闭Bug';
+$lang->bug->activate       = '激活Bug';
+$lang->bug->ajaxGetUserBugs = '接口:我的Bug';
+
+$lang->bug->selectProduct  = '请选择产品';
+$lang->bug->byModule       = '按模块';
+$lang->bug->assignToMe     = '指派给我';
+$lang->bug->openedByMe     = '由我创建';
+$lang->bug->resolvedByMe   = '由我解决';
+$lang->bug->assignToNull   = '未指派';
+$lang->bug->longLifeBugs   = '久未处理';
+$lang->bug->postponedBugs  = '被延期';
+$lang->bug->allBugs        = '所有Bug';
+$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                 = '由谁解决';
+
+$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  = '解决';
+$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']    = '代码错误';
+$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'] = "不予解决";
+
+$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     = '解决者';
+$lang->bug->resolution     = '解决方案';
+$lang->bug->resolvedBuild  = '解决版本';
+$lang->bug->resolvedDate   = '解决日期';
+$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, 由 <strong>$actor</strong> 解决，方案为 <strong>$extra</strong>。', 'extra' => $lang->bug->resolutionList);
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * The build module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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      = '描述';
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * The common english language file of ZenTaoMS.
+ * The common simplified chinese file of ZenTaoMS.
 *
- * All items used commonly should be defined here.
+ * This file should be UTF-8 encoded.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -23,134 +23,133 @@
 * @version     $Id$
 * @link        http://www.zentao.cn
 */
-$lang->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    = "<a href='http://www.pujia.com' target='_blank'>PUJIA donated</a>";
-$lang->at         = ' at ';
-$lang->feature    = 'Feature';
-$lang->year       = 'Year';
-$lang->downArrow  = '<EFBFBD><EFBFBD>';
-$lang->goback     = 'Go Back';
-$lang->selectAll  = 'ȫѡ';
-$lang->attatch    = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
-$lang->reverse    = '<EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>˳<EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
-$lang->addFiles   = '<EFBFBD>ϴ<EFBFBD><EFBFBD>˸<EFBFBD><EFBFBD><EFBFBD> ';
+$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    = "<a href='http://www.pujia.com' target='_blank'>普加赞助</a>";
+$lang->at         = ' 于 ';
+$lang->feature    = '未来';
+$lang->year       = '年';
+$lang->downArrow  = '↓';
+$lang->goback     = '返回';
+$lang->selectAll  = '全选';
+$lang->attatch    = '附件';
+$lang->reverse    = '（切换顺序）';
+$lang->addFiles   = '上传了附件 ';

-/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD>*/
-$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';

-/* <EFBFBD><EFBFBD>ҳ<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
-$lang->index->menu->product = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ|product|browse';
-$lang->index->menu->project = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ|project|browse';
+/* 首页菜单设置。*/
+$lang->index->menu->product = '浏览产品|product|browse';
+$lang->index->menu->project = '浏览项目|project|browse';

-/* <EFBFBD>ҵĵ<EFBFBD><EFBFBD>̲˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
+/* 我的地盘菜单设置。*/
 $lang->my->menu->account  = '%s' . $lang->arrow;
-$lang->my->menu->todo     = array('link' => '<EFBFBD>ҵ<EFBFBD>TODO|my|todo|', 'subModule' => 'todo');
-$lang->my->menu->task     = '<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|my|task|';
-$lang->my->menu->project  = '<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD>Ŀ|my|project|';
-$lang->my->menu->story    = '<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|my|story|';
-$lang->my->menu->bug      = '<EFBFBD>ҵ<EFBFBD>Bug|my|bug|';
-$lang->my->menu->profile  = array('link' => '<EFBFBD>ҵĵ<EFBFBD><EFBFBD><EFBFBD>|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' => '我的档案|my|profile|', 'alias' => 'editprofile');
 $lang->todo->menu         = $lang->my->menu;

-/* <EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD>ͼ<EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
+/* 产品视图设置。*/
 $lang->product->menu->list   = '%s';
-$lang->product->menu->story  = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>|product|browse|productID=%s',     'subModule' => 'story');
-$lang->product->menu->plan   = array('link' => '<EFBFBD>ƻ<EFBFBD><EFBFBD>б<EFBFBD>|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->product->menu->release= array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->menu->roadmap= '·<EFBFBD><EFBFBD>ͼ|product|roadmap|productID=%s';
-$lang->product->menu->edit   = '<EFBFBD>༭<EFBFBD><EFBFBD>Ʒ|product|edit|productID=%s';
-$lang->product->menu->delete = array('link' => 'ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ|product|delete|productID=%s', 'target' => 'hiddenwin');
-$lang->product->menu->module = 'ά<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD>|tree|browse|productID=%s&view=product';
-$lang->product->menu->create = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ|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;

-/* <EFBFBD><EFBFBD>Ŀ<EFBFBD><EFBFBD>ͼ<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
+/* 项目视图菜单设置。*/
 $lang->project->menu->list   = '%s';
-$lang->project->menu->task   = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>|project|task|projectID=%s', 'subModule' => 'task');
-$lang->project->menu->story  = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>|project|story|projectID=%s', 'alias' => 'linkstory');
-$lang->project->menu->bug    = 'Bug<EFBFBD>б<EFBFBD>|project|bug|projectID=%s';
-$lang->project->menu->build  = array('link' => 'Build<EFBFBD>б<EFBFBD>|project|build|projectID=%s', 'subModule' => 'build');
-$lang->project->menu->burn   = 'ȼ<EFBFBD><EFBFBD>ͼ|project|burn|projectID=%s';
-$lang->project->menu->team   = array('link' => '<EFBFBD>Ŷӳ<EFBFBD>Ա|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   = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ|project|view|projectID=%s';
-$lang->project->menu->edit   = '<EFBFBD>༭<EFBFBD><EFBFBD>Ŀ|project|edit|projectID=%s';
-$lang->project->menu->delete = array('link' => 'ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ|project|delete|projectID=%s', 'target' => 'hiddenwin');
-$lang->project->menu->product= '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ|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' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ|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<EFBFBD><EFBFBD>ͼ<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
+/* QA视图菜单设置。*/
 $lang->bug->menu->product  = '%s';
-$lang->bug->menu->bug      = array('link' => 'ȱ<EFBFBD>ݹ<EFBFBD><EFBFBD><EFBFBD>|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active', 'subModule' => 'tree');
-$lang->bug->menu->testcase = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->bug->menu->testtask = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|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' => 'ȱ<EFBFBD>ݹ<EFBFBD><EFBFBD><EFBFBD>|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active');
-$lang->testcase->menu->testcase = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|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' => 'ȱ<EFBFBD>ݹ<EFBFBD><EFBFBD><EFBFBD>|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active');
-$lang->testtask->menu->testcase = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
-$lang->testtask->menu->testtask = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|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');

-/* <EFBFBD><EFBFBD>֯<EFBFBD>ṹ<EFBFBD><EFBFBD>ͼ<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
-$lang->company->menu->browseUser  = array('link' => '<EFBFBD>û<EFBFBD><EFBFBD>б<EFBFBD>|company|browse', 'subModule' => 'user');
-$lang->company->menu->dept        = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ά<EFBFBD><EFBFBD>|dept|browse', 'subModule' => 'dept');
-$lang->company->menu->browseGroup = array('link' => 'Ȩ<EFBFBD>޷<EFBFBD><EFBFBD><EFBFBD>|group|browse', 'subModule' => 'group');
-$lang->company->menu->addGroup    = array('link' => '<EFBFBD><EFBFBD><EFBFBD>ӷ<EFBFBD><EFBFBD><EFBFBD>|group|create', 'float' => 'right');
-$lang->company->menu->addUser     = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>|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;

-/* <EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
+/* 用户信息菜单设置。*/
 $lang->user->menu->account  = '%s' . $lang->arrow;
-$lang->user->menu->todo     = array('link' => 'TODO<EFBFBD>б<EFBFBD>|user|todo|account=%s', 'subModule' => 'todo');
-$lang->user->menu->task     = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>|user|task|account=%s';
-$lang->user->menu->project  = '<EFBFBD><EFBFBD>Ŀ<EFBFBD>б<EFBFBD>|user|project|account=%s';
-$lang->user->menu->bug      = 'Bug<EFBFBD>б<EFBFBD>|user|bug|account=%s';
-$lang->user->menu->profile  = array('link' => '<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>Ϣ|user|profile|account=%s', 'alias' => 'edit');
-$lang->user->menu->browse   = array('link' => '<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|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');

-/* <EFBFBD><EFBFBD>̨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
-$lang->admin->menu->browseCompany = array('link' => '<EFBFBD><EFBFBD>˾<EFBFBD><EFBFBD><EFBFBD><EFBFBD>|admin|browsecompany', 'subModule' => 'company');
-//$lang->admin->menu->convert       = array('link' => '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD><EFBFBD>|convert|index', 'subModule' => 'convert');
-$lang->admin->menu->upgrade       = array('link' => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>|upgrade|index',           'subModule' => 'upgrade');
-$lang->admin->menu->createCompany = array('link' => '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˾|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;

-/*<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>*/
+/*菜单设置：分组设置。*/
 $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';

-/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD>*/
-$lang->error->companyNotFound = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s û<>ж<EFBFBD>Ӧ<EFBFBD>Ĺ<EFBFBD>˾<EFBFBD><CBBE>";
-$lang->error->length          = array("<EFBFBD><EFBFBD>%s<><73><EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6>Ϊ<EFBFBD><CEAA>%s<><73>", "<EFBFBD><EFBFBD>%s<><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%s<><73><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>С<EFBFBD>ڡ<EFBFBD>%s<><73><EFBFBD><EFBFBD>");
-$lang->error->reg             = "<EFBFBD><EFBFBD>%s<><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD>ʽ<EFBFBD><CABD>Ӧ<EFBFBD><D3A6>Ϊ:<3A><>%s<><73><EFBFBD><EFBFBD>";
-$lang->error->unique          = "<EFBFBD><EFBFBD>%s<><73><EFBFBD>Ѿ<EFBFBD><D1BE>С<EFBFBD>%s<><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>ˡ<EFBFBD>";
-$lang->error->notempty        = "<EFBFBD><EFBFBD>%s<><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>ա<EFBFBD>";
-$lang->error->int             = array("<EFBFBD><EFBFBD>%s<><73>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֡<EFBFBD>", "<EFBFBD><EFBFBD>%s<><73>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD>%s-%s<><73>֮<EFBFBD>䡣");
-$lang->error->float           = "<EFBFBD><EFBFBD>%s<><73>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֣<EFBFBD><D6A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD>";
-$lang->error->email           = "<EFBFBD><EFBFBD>%s<><73>Ӧ<EFBFBD><D3A6>Ϊ<EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD>EMAIL<EFBFBD><EFBFBD>";
-$lang->error->date            = "<EFBFBD><EFBFBD>%s<><73>Ӧ<EFBFBD><D3A6>Ϊ<EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD>";
-$lang->error->account         = "<EFBFBD><EFBFBD>%s<><73>Ӧ<EFBFBD><D3A6>Ϊ<EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>";
-$lang->error->passwordsame    = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD>";
-$lang->error->passwordrule    = "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>÷<EFBFBD><EFBFBD>Ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
+/* 错误提示信息。*/
+$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    = "密码应该符合规则。";

-/* <EFBFBD><EFBFBD>ҳ<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD>*/
-$lang->pager->noRecord  = "<EFBFBD><EFBFBD>ʱû<EFBFBD>м<EFBFBD>¼";
-$lang->pager->digest    = "<EFBFBD><EFBFBD><strong>%s</strong><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼,ÿҳ <strong>%s</strong><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD>棺<strong>%s/%s</strong> ";
-$lang->pager->first     = "<EFBFBD><EFBFBD>ҳ";
-$lang->pager->pre       = "<EFBFBD><EFBFBD>ҳ";
-$lang->pager->next      = "<EFBFBD><EFBFBD>ҳ";
-$lang->pager->last      = "ĩҳ";
+/* 分页信息。*/
+$lang->pager->noRecord  = "暂时没有记录";
+$lang->pager->digest    = "共<strong>%s</strong>条记录,每页 <strong>%s</strong>条，页面：<strong>%s/%s</strong> ";
+$lang->pager->first     = "首页";
+$lang->pager->pre       = "上页";
+$lang->pager->next      = "下页";
+$lang->pager->last      = "末页";
 $lang->pager->locate    = "GO!";
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The company module en file of ZenTaoMS.
+ * The company module english file of ZenTaoMS.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -21,19 +21,29 @@
 * @version     $Id$
 * @link        http://www.zentao.cn
 */
-$lang['page']['common']      = 'company';
-$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['company']['id']       = 'id';
-$lang['company']['name']     = 'name';
-$lang['company']['phpone']   = 'phpone';
-$lang['company']['fax']      = 'fax';
-$lang['company']['address']  = 'address';
-$lang['company']['zipcode']  = 'zipcode';
-$lang['company']['website']  = 'website';
-$lang['company']['backyard'] = 'backyard';
-$lang['company']['pms']      = 'pms';
-$lang['company']['guest']    = 'guest';
+$lang->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] = '允许';
--- a/module/convert/lang/en.php
+++ b/module/convert/lang/en.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * The convert module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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
+<p>欢迎使用系统转换向导，本程序会帮助您将其他系统的数据转换到禅道项目管理系统中。</p>
+<strong>转换存在一定的风险，转换之前，我们强烈建议您备份数据库及相应的数据文件，并保证转换的时候，没有其他人进行操作。</strong>
+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 拷贝失败';
--- a/module/dept/lang/en.php
+++ b/module/dept/lang/en.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * The dept module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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 = " 您确定删除该部门吗？";
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * The file module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @package     file
+ * @version     $Id$
+ * @link        http://www.zentao.cn
+ */
+$lang->file->common = '附件';
+$lang->file->label  = '标题：';
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * The group module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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 = '全选';
+
+/* 所有resource列表。*/
+$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';
--- a/module/index/lang/en.php
+++ b/module/index/lang/en.php
@@ -1,6 +1,8 @@
 <?php
 /**
- * The index module english file of ZenTaoMS.
+ * The index module simplified chinese file of ZenTaoMS.
+ *
+ * This file should be UTF-8 encoded.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -19,6 +21,10 @@
 * @author      Chunsheng Wang <wwccss@263.net>
 * @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 <i>%s</i> %s <strong>%s</strong>';
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * The install module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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    = <<<EOT
+禅道项目管理软件(ZenTaoPMS)是一款国产的，基于LGPL协议，开源免费的项目管理软件，它集产品管理、项目管理、测试管理于一体，同时还包含了事务管理、组织管理等诸多功能，是中小型企业项目管理的首选。
+
+禅道项目管理软件使用PHP + MySQL开发，基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。
+EOT;
+
+$lang->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配置文件，加载PDO扩展。';
+$lang->install->pdoMySQL     = 'PDO_MySQL扩展';
+$lang->install->pdoMySQLFail = '修改PHP配置文件，加载pdo_mysql扩展。';
+$lang->install->tmpRoot      = '临时文件目录';
+$lang->install->dataRoot     = '上传文件目录';
+$lang->install->mkdir        = '<p>需要创建目录%s。<br /> linux下面命令为：<br /> mkdir -p %s</p>';
+$lang->install->chmod        = '需要修改目录 "%s" 的权限。<br />linux下面命令为：<br />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  = '即通过什么地址可以访问到禅道项目管理，设置域名或者IP地址即可，不需要http';
+$lang->install->account  = '管理员帐号';
+$lang->install->password = '管理员密码';
+$lang->install->errorEmptyPassword = '密码不能为空';
+
+$lang->install->success = "安装成功！请删除install.php，登录禅道管理系统，设置用户及分组！";
+
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -0,0 +1,12 @@
+<?php
+$lang->my->common      = '我的地盘';
+$lang->my->index       = '首页';
+$lang->my->profile     = '我的档案';
+$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     = '我的档案';
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * The product module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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 = '产品代号不能为空';
+
+$lang->product->id      = '编号';
+$lang->product->company = '所属公司';
+$lang->product->name    = '产品名称';
+$lang->product->code    = '产品代号';
+$lang->product->order   = '排序';
+$lang->product->status  = '状态';
+$lang->product->desc    = '产品描述';
+
+$lang->product->moduleStory = '按模块浏览';
+$lang->product->searchStory = '搜索';
+$lang->product->allStory    = '全部需求';
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * The productplan module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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     = '结束日期';
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * The project module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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         = '项目代号';
+$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』工时<br />已经消耗『%s』工时<br />预计剩余『%s』工时';
+$lang->project->oneLineStats = "项目『%s』, 代号为『%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;
--- a/module/qa/lang/en.php
+++ b/module/qa/lang/en.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * The qa module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @package     company
+ * @version     $Id$
+ * @link        http://www.zentao.cn
+ */
+$lang->qa->common  = 'QA视图';
+$lang->qa->index   = "QA首页";
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The release module en file of ZenTaoMS.
+ * The release module english file of ZenTaoMS.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -21,16 +21,18 @@
 * @version     $Id$
 * @link        http://www.zentao.cn
 */
-$lang['page']['common']         = 'release';
-$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['release']['id']          = 'id';
-$lang['release']['product']     = 'product';
-$lang['release']['name']        = 'name';
-$lang['release']['desc']        = 'desc';
-$lang['release']['status']      = 'status';
-$lang['release']['planDate']    = 'planDate';
-$lang['release']['releaseDate'] = 'releaseDate';
+$lang->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      = '描述';
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * The report module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @package     report
+ * @version     $Id$
+ * @link        http://www.zentao.cn
+ */
+$lang->report->common = '报表';
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * The search module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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']          = '或者';
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The story module en file of ZenTaoMS.
+ * The story module english file of ZenTaoMS.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -21,31 +21,116 @@
 * @version     $Id$
 * @link        http://www.zentao.cn
 */
-$lang['page']['common']          = 'story';
-$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['story']['id']             = 'id';
-$lang['story']['product']        = 'product';
-$lang['story']['module']         = 'module';
-$lang['story']['replease']       = 'replease';
-$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']['mailto']         = 'mailto';
-$lang['story']['openedBy']       = 'openedBy';
-$lang['story']['openedDate']     = 'openedDate';
-$lang['story']['assignedTo']     = 'assignedTo';
-$lang['story']['assignedDate']   = 'assignedDate';
-$lang['story']['lastEditedBy']   = 'lastEditedBy';
-$lang['story']['lastEditedDate'] = 'lastEditedDate';
-$lang['story']['closedBy']       = 'closedBy';
-$lang['story']['closedDate']     = 'closedDate';
-$lang['story']['version']        = 'version';
-$lang['story']['attatchment']    = 'attatchment';
+$lang->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          = "建议参考的模板：<br />作为一名<<i class='red'>某种类型的用户</i>><br />我希望<<i class='red'>达成某些目的</i>><br />这样可以<<i class='red'>开发的价值</i>>";
+$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, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => $lang->story->reviewResultList);
+$lang->story->action->closed   = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong>。', 'extra' => $lang->story->reasonList);
--- 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           = '需求描述';
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * The task module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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        = "成功添加，";
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The case module en file of ZenTaoMS.
+ * The testcase module english file of ZenTaoMS.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -17,32 +17,95 @@
 *
 * @copyright   Copyright 2009-2010 Chunsheng Wang
 * @author      Chunsheng Wang <wwccss@263.net>
- * @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检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的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       = '所有Case';
+$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']   = '正常';
+$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   = '返回';
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * The testtask module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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       = '全部通过';
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * The todo module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *                                                                             
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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  = '所有TODO';
+$lang->todo->allUndone     = '之前未完';
+$lang->todo->todayTodos    = '今日安排';
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * The tree module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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 = " 您确定删除该模块吗？";
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * The upgrade module english file of ZenTaoMS.
+ *
+ * ZenTaoMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * ZenTaoMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.  
+ *
+ * @copyright   Copyright 2009-2010 Chunsheng Wang
+ * @author      Chunsheng Wang <wwccss@263.net>
+ * @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 = <<<EOT
+警告！升级有危险，请先备份数据库，以防万一。<br />
+备份方法：<br />
+1. 可以通过phpMyAdmin进行备份。<br />
+2. 使用mysql命令行的工具。<br />
+   # mysqldump -u <span class='red'>username</span> -p <span class='red'>dbname</span> > <span class='red'>filename</span> <br />
+   要将上面红色的部分分别替换成对应的用户名和禅道系统的数据库名。<br />
+   比如： mysqldump -u root -p zentao >zentao.bak
+EOT;
+$lang->upgrade->selectVersion = '选择版本';
+$lang->upgrade->noteVersion   = "务必选择正确的版本，否则会造成数据丢失。";
+$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';
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The user module en file of ZenTaoMS.
+ * The user module english file of ZenTaoMS.
 *
 * ZenTaoMS is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
@@ -21,34 +21,69 @@
 * @version     $Id$
 * @link        http://www.zentao.cn
 */
-$lang['page']['common']    = 'user';
-$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['user']['id']        = 'id';
-$lang['user']['company']   = 'company';
-$lang['user']['division']  = 'division';
-$lang['user']['account']   = 'account';
-$lang['user']['password']  = 'password';
-$lang['user']['realname']  = 'realname';
-$lang['user']['nickname']  = 'nickname';
-$lang['user']['avatar']    = 'avatar';
-$lang['user']['birthyear'] = 'birthyear';
-$lang['user']['birthday']  = 'birthday';
-$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';
-$lang['user']['visits']    = 'visits';
-$lang['user']['ip']        = 'ip';
-$lang['user']['login']     = 'login';
+$lang->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档案';
+$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 = "抱歉，您无权访问『<b>%s</b>』模块的『<b>%s</b>』功能。请联系管理员获取权限。点击后退返回上页。";
+
+$lang->user->gendarList->m = '男';
+$lang->user->gendarList->f = '女';
+$lang->user->statusList['active'] = '正常';
+$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';