From a069e2465d9cee27dc1b2854688dd094da23841e Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Mon, 2 Aug 2010 10:20:01 +0000
Subject: [PATCH]  + add english language.

---
 config/config.php               |   5 +-
 module/action/lang/en.php       | 130 ++++++-------
 module/admin/lang/en.php        |  16 +-
 module/api/lang/en.php          |   8 +-
 module/bug/control.php          |   2 +-
 module/bug/lang/en.php          | 334 ++++++++++++++++----------------
 module/bug/lang/zh-cn.php       |   6 +-
 module/bug/view/browse.html.php |   2 +-
 module/bug/view/edit.html.php   |  18 +-
 module/bug/view/view.html.php   |   8 +-
 module/build/lang/en.php        |  32 +--
 module/common/lang/en.php       | 323 +++++++++++++++++-------------
 module/common/lang/zh-cn.php    |   3 +-
 module/company/lang/en.php      |  50 ++---
 module/convert/lang/en.php      |  87 +++++----
 module/dept/lang/en.php         |  24 +--
 module/file/lang/en.php         |  10 +-
 module/group/lang/en.php        |  48 ++---
 module/index/lang/en.php        |   8 +-
 module/install/lang/en.php      | 145 +++++++-------
 module/misc/lang/en.php         |  84 ++++----
 module/my/lang/en.php           |  20 +-
 module/product/lang/en.php      |  69 ++++---
 module/productplan/lang/en.php  |  40 ++--
 module/project/lang/en.php      | 189 +++++++++---------
 module/qa/lang/en.php           |   6 +-
 module/release/lang/en.php      |  24 +--
 module/report/lang/en.php       |  12 +-
 module/search/lang/en.php       |  44 ++---
 module/story/lang/en.php        | 224 ++++++++++-----------
 module/task/lang/en.php         | 140 ++++++-------
 module/testcase/lang/en.php     | 184 +++++++++---------
 module/testtask/lang/en.php     |  82 ++++----
 module/todo/lang/en.php         | 108 +++++------
 module/tree/lang/en.php         |  45 +++--
 module/upgrade/lang/en.php      |  34 ++--
 module/user/lang/en.php         | 122 ++++++------
 37 files changed, 1373 insertions(+), 1313 deletions(-)

diff --git a/config/config.php b/config/config.php
index 386c991251..1547528db5 100644
--- a/config/config.php
+++ b/config/config.php
@@ -42,8 +42,9 @@ $config->views       = ',html,json,csv,'; // 支持的视图列表。
 $config->themes      = 'default,blue';    // 支持的主题列表。
 
 /* 支持的语言列表。*/
-$config->langs['zh-cn'] = 'Chinese Simplified';
-$config->langs['zh-tw'] = 'Chinese Traditional';
+$config->langs['zh-cn'] = '中文简体';
+$config->langs['zh-tw'] = '中文繁體';
+$config->langs['en']    = 'English';
 
 /* 默认参数设定。*/
 $config->default->view   = 'html';             // 默认的视图格式。
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 7f1203c199..0b245dbad6 100644
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The action module english file of ZenTaoMS.
+ * 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
@@ -21,79 +21,79 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->action->common   = '系统日志';
-$lang->action->trash    = '回收站';
-$lang->action->undelete = '还原';
+$lang->action->common   = 'Logs';
+$lang->action->trash    = 'Trash';
+$lang->action->undelete = 'Restore';
 
-$lang->action->objectType = '对象类型';
-$lang->action->objectID   = '对象ID';
-$lang->action->objectName = '对象名称';
-$lang->action->actor      = '操作者';
-$lang->action->date       = '日期';
+$lang->action->objectType = 'Object';
+$lang->action->objectID   = 'ID';
+$lang->action->objectName = 'Name';
+$lang->action->actor      = 'Actor';
+$lang->action->date       = 'Date';
 
-$lang->action->objectTypes['product']     = '产品';
-$lang->action->objectTypes['story']       = '需求';
-$lang->action->objectTypes['productplan'] = '产品计划';
-$lang->action->objectTypes['release']     = '发布';
-$lang->action->objectTypes['project']     = '项目';
-$lang->action->objectTypes['task']        = '任务';
+$lang->action->objectTypes['product']     = 'PRODUCT';
+$lang->action->objectTypes['story']       = 'STORY';
+$lang->action->objectTypes['productplan'] = 'PLAN';
+$lang->action->objectTypes['release']     = 'RELEASE';
+$lang->action->objectTypes['project']     = 'PROJECT';
+$lang->action->objectTypes['task']        = 'TASK';
 $lang->action->objectTypes['build']       = 'Build';
 $lang->action->objectTypes['bug']         = 'Bug';
-$lang->action->objectTypes['case']        = '用例';
-$lang->action->objectTypes['testtask']    = '测试任务';
-$lang->action->objectTypes['user']        = '用户';
+$lang->action->objectTypes['case']        = 'Case';
+$lang->action->objectTypes['testtask']    = 'Test Task';
+$lang->action->objectTypes['user']        = 'User';
 
-/* 用来描述操作历史记录。*/
+/* 用来描述操作历史记录.*/
 $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->deleted   = '$date, 由 <strong>$actor</strong> 删除。';
-$lang->action->desc->erased    = '$date, 由 <strong>$actor</strong> 删除。';
-$lang->action->desc->undeleted = '$date, 由 <strong>$actor</strong> 还原。';
-$lang->action->desc->commented = '$date, 由 <strong>$actor</strong> 发表评论。';
-$lang->action->desc->activated = '$date, 由 <strong>$actor</strong> 激活。';
-$lang->action->desc->moved     = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"';
-$lang->action->desc->confirmed = '$date, 由 <strong>$actor</strong> 确认需求变动，最新版本为<strong>#$extra</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->desc->opened    = '$date, Opened by <strong>$actor</strong>.';
+$lang->action->desc->changed   = '$date, Changed by <strong>$actor</strong>.';
+$lang->action->desc->edited    = '$date, Edited by <strong>$actor</strong>.';
+$lang->action->desc->closed    = '$date, Closed by <strong>$actor</strong>.';
+$lang->action->desc->deleted   = '$date, Deleted by <strong>$actor</strong>.';
+$lang->action->desc->erased    = '$date, Erased by <strong>$actor</strong>.';
+$lang->action->desc->undeleted = '$date, Restored by <strong>$actor</strong>.';
+$lang->action->desc->commented = '$date, Commented by <strong>$actor</strong>.';
+$lang->action->desc->activated = '$date, Activated by <strong>$actor</strong>.';
+$lang->action->desc->moved     = '$date, Moved by <strong>$actor</strong>, previouse is "$extra"';
+$lang->action->desc->confirmed = '$date, Confirmed by <strong>$actor</strong>, version is<strong>#$extra</strong>';
+$lang->action->desc->diff1     = 'Changed <strong><i>%s</i></strong>, old is "%s", new is "%s".<br />';
+$lang->action->desc->diff2     = 'Changed <strong><i>%s</i></strong>, the diff is：<blockquote>%s</blockquote>';
 
-/* 用来显示动态信息。*/
-$lang->action->label->opened              = '创建了';
-$lang->action->label->changed             = '变更了';
-$lang->action->label->edited              = '编辑了';
-$lang->action->label->closed              = '关闭了';
-$lang->action->label->deleted             = '删除了';
-$lang->action->label->erased              = '删除了';
-$lang->action->label->undeleted           = '还原了';
-$lang->action->label->commented           = '评论了';
-$lang->action->label->activated           = '激活了';
-$lang->action->label->resolved            = '解决了';
-$lang->action->label->reviewed            = '评审了';
-$lang->action->label->moved               = '移动了';
-$lang->action->label->confirmed           = '确认了需求，';
-$lang->action->label->linked2plan         = '关联计划';
-$lang->action->label->unlinkedfromplan    = '移除计划';
-$lang->action->label->linked2project      = '关联项目';
-$lang->action->label->unlinkedfromproject = '移除项目';
-$lang->action->label->marked              = '编辑了';
-$lang->action->label->login               = '登录系统';
-$lang->action->label->logout              = "退出登录";
+/* 用来显示动态信息.*/
+$lang->action->label->opened              = 'opened';
+$lang->action->label->changed             = 'changed';
+$lang->action->label->edited              = 'edited';
+$lang->action->label->closed              = 'closed';
+$lang->action->label->deleted             = 'deleted';
+$lang->action->label->erased              = 'deleted';
+$lang->action->label->undeleted           = 'restore';
+$lang->action->label->commented           = 'commented';
+$lang->action->label->activated           = 'activated';
+$lang->action->label->resolved            = 'resoved';
+$lang->action->label->reviewed            = 'reviewed';
+$lang->action->label->moved               = 'moded';
+$lang->action->label->confirmed           = 'confirmed,';
+$lang->action->label->linked2plan         = 'link to plan';
+$lang->action->label->unlinkedfromplan    = 'unlink from plan';
+$lang->action->label->linked2project      = 'link to project';
+$lang->action->label->unlinkedfromproject = 'unlik from project';
+$lang->action->label->marked              = 'edited';
+$lang->action->label->login               = 'login';
+$lang->action->label->logout              = "logout";
 
-/* 用来生成相应对象的链接。*/
-$lang->action->label->product     = '产品|product|view|productID=%s';
-$lang->action->label->productplan = '计划|productplan|view|productID=%s';
-$lang->action->label->release     = '发布|release|view|productID=%s';
-$lang->action->label->story       = '需求|story|view|storyID=%s';
-$lang->action->label->project     = '项目|project|view|projectID=%s';
-$lang->action->label->task        = '任务|task|view|taskID=%s';
-$lang->action->label->build       = 'Build|build|view|buildID=%s';
-$lang->action->label->bug         = 'Bug|bug|view|bugID=%s';
-$lang->action->label->case        = '用例|testcase|view|caseID=%s';
-$lang->action->label->testtask    = '测试任务|testtask|view|caseID=%s';
+/* 用来生成相应对象的链接.*/
+$lang->action->label->product     = 'product|product|view|productID=%s';
+$lang->action->label->productplan = 'plan|productplan|view|productID=%s';
+$lang->action->label->release     = 'release|release|view|productID=%s';
+$lang->action->label->story       = 'story|story|view|storyID=%s';
+$lang->action->label->project     = 'project|project|view|projectID=%s';
+$lang->action->label->task        = 'task|task|view|taskID=%s';
+$lang->action->label->build       = 'build|build|view|buildID=%s';
+$lang->action->label->bug         = 'bug|bug|view|bugID=%s';
+$lang->action->label->case        = 'case|testcase|view|caseID=%s';
+$lang->action->label->testtask    = 'test task|testtask|view|caseID=%s';
 $lang->action->label->todo        = 'todo|todo|view|todoID=%s';
-$lang->action->label->user        = '用户';
+$lang->action->label->user        = 'user';
 
 $lang->action->label->space     = '　';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 6a7e1a4cda..8683c3bb08 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The admin module english file of ZenTaoMS.
+ * 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
@@ -21,11 +21,11 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->admin->common  = '后台管理';
-$lang->admin->index   = '后台管理首页';
-$lang->admin->company = '公司管理';
-$lang->admin->user    = '用户管理';
-$lang->admin->group   = '分组管理';
-$lang->admin->welcome = '欢迎使用禅道管理软件后台管理系统';
+$lang->admin->common  = 'Admin';
+$lang->admin->index   = 'Index';
+$lang->admin->company = 'Company';
+$lang->admin->user    = 'User';
+$lang->admin->group   = 'Group';
+$lang->admin->welcome = 'Welcome to ZenTaoPMS.';
 
-$lang->admin->browseCompany = '浏览公司';
+$lang->admin->browseCompany = 'Browse Company';
diff --git a/module/api/lang/en.php b/module/api/lang/en.php
index c0c922cf25..d93fd8b9bc 100644
--- a/module/api/lang/en.php
+++ b/module/api/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The api module english file of ZenTaoMS.
+ * The api 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
@@ -18,8 +18,8 @@
  * @copyright   Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     api
- * @version     $Id: english.php 824 2010-05-02 15:32:06Z wwccss $
+ * @version     $Id: English.php 824 2010-05-02 15:32:06Z wwccss $
  * @link        http://www.zentaoms.com
  */
-$lang->api->common   = 'API接口';
-$lang->api->getModel = '超级model调用接口';
+$lang->api->common   = 'API';
+$lang->api->getModel = 'Super Model API';
diff --git a/module/bug/control.php b/module/bug/control.php
index ff759a5b04..627a5e9993 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -254,7 +254,7 @@ class bug extends control
         $caseID     = 0;
         $runID      = 0;
         $title      = '';
-        $steps      = '';
+        $steps      = $this->lang->bug->tplStep . $this->lang->bug->tplResult . $this->lang->bug->tplExpect;
         $os         = '';
         $browser    = '';
         $assignedTo = '';
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 18c140f99f..17773c9eaa 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The bug module english 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
@@ -22,120 +22,126 @@
  * @link        http://www.zentaoms.com
  */
 /* 字段列表。*/
-$lang->bug->common         = '缺陷管理';
-$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->severityAB     = '级别';
-$lang->bug->pri            = '优先级';
-$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->openedByAB     = '创建';
-$lang->bug->openedDate     = '创建日期';
-$lang->bug->openedBuild    = '影响版本';
-$lang->bug->assignedTo     = '指派给';
-$lang->bug->assignedDate   = '指派日期';
-$lang->bug->resolvedBy     = '解决者';
-$lang->bug->resolution     = '解决方案';
-$lang->bug->resolutionAB   = '方案';
-$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->keywords       = '关键词';
-$lang->bug->lastEditedByAB   = '修改者';
-$lang->bug->lastEditedDateAB = '修改日期';
+$lang->bug->common         = 'Bug';
+$lang->bug->id             = 'ID';
+$lang->bug->product        = 'Product';
+$lang->bug->module         = 'Module';
+$lang->bug->path           = 'Path';
+$lang->bug->project        = 'Project';
+$lang->bug->story          = 'Story';
+$lang->bug->storyVersion   = 'Story Version';
+$lang->bug->task           = 'Task';
+$lang->bug->title          = 'Title';
+$lang->bug->severity       = 'Severity';
+$lang->bug->severityAB     = 'S';
+$lang->bug->pri            = 'Priority';
+$lang->bug->type           = 'Type';
+$lang->bug->os             = 'OS';
+$lang->bug->hardware       = 'Hardware';
+$lang->bug->browser        = 'Browser';
+$lang->bug->machine        = 'Machine';
+$lang->bug->found          = 'How found';
+$lang->bug->steps          = 'Steps';
+$lang->bug->status         = 'Status';
+$lang->bug->mailto         = 'Mailto';
+$lang->bug->openedBy       = 'Opened By';
+$lang->bug->openedByAB     = 'Opened';
+$lang->bug->openedDate     = 'Opened date';
+$lang->bug->openedBuild    = 'Opened Build';
+$lang->bug->assignedTo     = 'Assigned';
+$lang->bug->assignedDate   = 'Assigned Date';
+$lang->bug->resolvedBy     = 'Resolved By';
+$lang->bug->resolution     = 'Resolution';
+$lang->bug->resolutionAB   = 'Resolution';
+$lang->bug->resolvedBuild  = 'Resolved Build';
+$lang->bug->resolvedDate   = 'Resolved Date';
+$lang->bug->closedBy       = 'Closed By';
+$lang->bug->closedDate     = 'Closed Date';
+$lang->bug->duplicateBug   = 'Duplicate';
+$lang->bug->lastEditedBy   = 'Last Edited By';
+$lang->bug->lastEditedDate = 'Last Edited Date';
+$lang->bug->linkBug        = 'Related';
+$lang->bug->case           = 'Case';
+$lang->bug->files          = 'Files';
+$lang->bug->keywords       = 'Keywords';
+$lang->bug->lastEditedByAB   = 'Edited';
+$lang->bug->lastEditedDateAB = 'Edited Date';
 
 /* 方法列表。*/
-$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->reportChart    = '报表统计';
-$lang->bug->delete         = '删除Bug';
-$lang->bug->ajaxGetUserBugs    = '接口:我的Bug';
-$lang->bug->confirmStoryChange = '确认需求变动';
+$lang->bug->index          = 'Index';
+$lang->bug->create         = 'Create Bug';
+$lang->bug->edit           = 'Edite Bug';
+$lang->bug->browse         = 'Browse Bug';
+$lang->bug->view           = 'Bug Info';
+$lang->bug->resolve        = 'Resolve Bug';
+$lang->bug->close          = 'Close Bug';
+$lang->bug->activate       = 'Activate Bug';
+$lang->bug->reportChart    = 'Report';
+$lang->bug->delete         = 'Delete Bug';
+$lang->bug->customFields   = 'Custom Fields';
+$lang->bug->restoreDefault = 'Default';
+$lang->bug->ajaxGetUserBugs    = 'API: My Bugs';
+$lang->bug->confirmStoryChange = 'Confirm Story Change';
 
 /* 查询条件列表。*/
-$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->needConfirm    = '需求有变动的Bug';
-$lang->bug->allProduct     = '所有产品';
+$lang->bug->selectProduct  = 'Select product';
+$lang->bug->byModule       = 'By Module';
+$lang->bug->assignToMe     = 'Assgined to me';
+$lang->bug->openedByMe     = 'My Opened';
+$lang->bug->resolvedByMe   = 'My Resolved';
+$lang->bug->assignToNull   = 'Assgined empty';
+$lang->bug->longLifeBugs   = 'Long life';
+$lang->bug->postponedBugs  = 'Postponed';
+$lang->bug->allBugs        = 'All bug';
+$lang->bug->moduleBugs     = 'By module';
+$lang->bug->byQuery        = 'Search';
+$lang->bug->needConfirm    = 'Story changed';
+$lang->bug->allProduct     = 'All products';
 
 /* 页面标签。*/
-$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->lblProductAndModule         = 'Product&Module';
+$lang->bug->lblProjectAndTask           = 'Project&Task';
+$lang->bug->lblStory                    = 'Story';
+$lang->bug->lblTypeAndSeverity          = 'Type&Severity';
+$lang->bug->lblSystemBrowserAndHardware = 'OS&Browser';
+$lang->bug->lblAssignedTo               = 'Assigned to';
+$lang->bug->lblMailto                   = 'Mailto';
+$lang->bug->lblLastEdited               = 'Last edited';
+$lang->bug->lblResolved                 = 'Resoved';
+$lang->bug->lblAllFields                = 'All Fields';
+$lang->bug->lblCustomFields             = 'Custom Fields';
 
 /* legend列表。*/
-$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->legendBasicInfo   = 'Basic info';
+$lang->bug->legendMailto      = 'Mailto';
+$lang->bug->legendAttatch     = 'Files';
+$lang->bug->legendLinkBugs    = 'Related bug';
+$lang->bug->legendPrjStoryTask= 'Project, story & task';
+$lang->bug->legendCases       = 'Related case';
+$lang->bug->legendSteps       = 'Steps';
+$lang->bug->legendAction      = 'Action';
+$lang->bug->legendHistory     = 'History';
+$lang->bug->legendComment     = 'Comment';
+$lang->bug->legendLife        = 'Lifetime';
+$lang->bug->legendMisc        = 'Misc';
 
 /* 功能按钮。*/
-$lang->bug->buttonCopy     = '复制';
-$lang->bug->buttonEdit     = '编辑';
-$lang->bug->buttonActivate = '激活';
-$lang->bug->buttonResolve  = '解决';
-$lang->bug->buttonClose    = '关闭';
-$lang->bug->buttonToList   = '返回';
+$lang->bug->buttonCopy     = 'Copy';
+$lang->bug->buttonEdit     = 'Edit';
+$lang->bug->buttonActivate = 'Activate';
+$lang->bug->buttonResolve  = 'Resolve';
+$lang->bug->buttonClose    = 'Close';
+$lang->bug->buttonToList   = 'Back';
 
 /* 交互提示。*/
-$lang->bug->confirmChangeProduct = '修改产品会导致相应的项目、需求和任务发生变化，确定吗？';
-$lang->bug->confirmDelete        = '您确认要删除该Bug吗？';
+$lang->bug->confirmChangeProduct = 'Change product will change project, task and story also, are you sure?';
+$lang->bug->confirmDelete        = 'Are you sure to delete this bug?';
+$lang->bug->setTemplateTitle     = 'Please input the template title:';
 
 /* 模板。*/
-$lang->bug->tblStep        = "[步骤]\n";
-$lang->bug->tblResult      = "[结果]\n";
-$lang->bug->tblExpect      = "[期望]\n";
+$lang->bug->tplStep        = "[b][Steps][/b]\n\n";
+$lang->bug->tplResult      = "[b][Result][/b]\n\n";
+$lang->bug->tplExpect      = "[b][Expect][/b]\n\n";
 
 /* 各个字段取值列表。*/
 $lang->bug->severityList[3] = '3';
@@ -150,7 +156,7 @@ $lang->bug->priList[2] = '2';
 $lang->bug->priList[4] = '4';
 
 $lang->bug->osList['']        = '';
-$lang->bug->osList['all']     = '全部';
+$lang->bug->osList['all']     = 'All';
 $lang->bug->osList['windows'] = 'Windows';
 $lang->bug->osList['winxp']   = 'Windows XP';
 $lang->bug->osList['win7']    = 'Windows 7';
@@ -164,69 +170,69 @@ $lang->bug->osList['unix']    = 'Unix';
 $lang->bug->osList['others']  = '其他';
 
 $lang->bug->browserList['']         = '';
-$lang->bug->browserList['all']      = '全部';
-$lang->bug->browserList['ie']       = 'IE系列';
+$lang->bug->browserList['all']      = 'All';
+$lang->bug->browserList['ie']       = 'IE';
 $lang->bug->browserList['ie6']      = 'IE6';
 $lang->bug->browserList['ie7']      = 'IE7';
 $lang->bug->browserList['ie8']      = 'IE8';
-$lang->bug->browserList['firefox']  = 'firefox系列';
-$lang->bug->browserList['firefox2'] = 'firefox2';
-$lang->bug->browserList['firefx3']  = 'firefox3';
-$lang->bug->browserList['opera']    = 'opera系列';
+$lang->bug->browserList['firefox']  = 'Firefox';
+$lang->bug->browserList['firefox2'] = 'Firefox2';
+$lang->bug->browserList['firefx3']  = 'Firefox3';
+$lang->bug->browserList['opera']    = 'opera';
 $lang->bug->browserList['opera9']   = 'opera9';
 $lang->bug->browserList['oprea10']  = 'opera10';
 $lang->bug->browserList['safari']   = 'safari';
 $lang->bug->browserList['chrome']   = 'chrome';
-$lang->bug->browserList['other']    = '其他';
+$lang->bug->browserList['other']    = 'Others';
 
 $lang->bug->typeList['']             = '';
-$lang->bug->typeList['codeerror']    = '代码错误';
-$lang->bug->typeList['interface']    = '界面优化';
-$lang->bug->typeList['designchange'] = '设计变更';
-$lang->bug->typeList['newfeature']   = '新增需求';
-$lang->bug->typeList['designdefect'] = '设计缺陷';
-$lang->bug->typeList['config']       = '配置相关';
-$lang->bug->typeList['install']      = '安装部署';
-$lang->bug->typeList['security']     = '安全相关';
-$lang->bug->typeList['performance']  = '性能问题';
-$lang->bug->typeList['standard']     = '标准规范';
-$lang->bug->typeList['automation']   = '测试脚本';
-$lang->bug->typeList['trackthings']  = '事务跟踪';
-$lang->bug->typeList['Others']       = '其他';
+$lang->bug->typeList['codeerror']    = 'Code error';
+$lang->bug->typeList['interface']    = 'Interface';
+$lang->bug->typeList['designchange'] = 'Design change';
+$lang->bug->typeList['newfeature']   = 'New feature';
+$lang->bug->typeList['designdefect'] = 'Design defect';
+$lang->bug->typeList['config']       = 'Config';
+$lang->bug->typeList['install']      = 'Install';
+$lang->bug->typeList['security']     = 'Security';
+$lang->bug->typeList['performance']  = 'Performance';
+$lang->bug->typeList['standard']     = 'Standard';
+$lang->bug->typeList['automation']   = 'Automation';
+$lang->bug->typeList['trackthings']  = 'Tracking';
+$lang->bug->typeList['Others']       = 'Others';
 
 $lang->bug->statusList['']         = '';
-$lang->bug->statusList['active']   = '激活';
-$lang->bug->statusList['resolved'] = '已解决';
-$lang->bug->statusList['closed']   = '已关闭';
+$lang->bug->statusList['active']   = 'Active';
+$lang->bug->statusList['resolved'] = 'Resolved';
+$lang->bug->statusList['closed']   = '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->resolutionList['bydesign']   = 'By defisn';
+$lang->bug->resolutionList['duplicate']  = 'Duplicate';
+$lang->bug->resolutionList['external']   = 'External';
+$lang->bug->resolutionList['fixed']      = 'Fixed';
+$lang->bug->resolutionList['notrepro']   = 'Not reproduct';
+$lang->bug->resolutionList['postponed']  = 'Postponed';
+$lang->bug->resolutionList['willnotfix'] = "Won't fix";
 
 /* 统计报表。*/
-$lang->bug->report->common        = '统计报表';
-$lang->bug->report->select        = '请选择报表类型';
-$lang->bug->report->create        = '生成报表';
-$lang->bug->report->selectAll     = '全选';
-$lang->bug->report->selectReverse = '反选';
+$lang->bug->report->common        = 'Report';
+$lang->bug->report->select        = 'Select';
+$lang->bug->report->create        = 'Create';
+$lang->bug->report->selectAll     = 'All';
+$lang->bug->report->selectReverse = 'Reverse';
 
-$lang->bug->report->charts['bugsPerProject']     = '项目Bug数量';
-$lang->bug->report->charts['bugsPerModule']      = '模块Bug数量';
-$lang->bug->report->charts['openedBugsPerDay']   = '每天新增Bug数';
-$lang->bug->report->charts['resolvedBugsPerDay'] = '每天解决Bug数';
-$lang->bug->report->charts['closedBugsPerDay']   = '每天关闭的Bug数';
-$lang->bug->report->charts['openedBugsPerUser']  = '每人提交的Bug数';
-$lang->bug->report->charts['resolvedBugsPerUser']= '每人解决的Bug数';
-$lang->bug->report->charts['closedBugsPerUser']  = '每人关闭的Bug数';
-$lang->bug->report->charts['bugsPerSeverity']    = 'Bug严重程度统计';
-$lang->bug->report->charts['bugsPerResolution']  = 'Bug解决方案统计';
-$lang->bug->report->charts['bugsPerStatus']      = 'Bug状态统计';
-$lang->bug->report->charts['bugsPerType']        = 'Bug类型统计';
+$lang->bug->report->charts['bugsPerProject']     = 'Project bugs';
+$lang->bug->report->charts['bugsPerModule']      = 'Module bugs';
+$lang->bug->report->charts['openedBugsPerDay']   = 'Opened bugs per day';
+$lang->bug->report->charts['resolvedBugsPerDay'] = 'Resolved bugs per day';
+$lang->bug->report->charts['closedBugsPerDay']   = 'Closed bugs per day';
+$lang->bug->report->charts['openedBugsPerUser']  = 'Opened bugs per user';
+$lang->bug->report->charts['resolvedBugsPerUser']= 'Resoved bugs per user';
+$lang->bug->report->charts['closedBugsPerUser']  = 'Closed bugs per user';
+$lang->bug->report->charts['bugsPerSeverity']    = 'Severigy';
+$lang->bug->report->charts['bugsPerResolution']  = 'Resolution';
+$lang->bug->report->charts['bugsPerStatus']      = 'Status';
+$lang->bug->report->charts['bugsPerType']        = 'Type';
 //$lang->bug->report->charts['bugLiveDays']        = 'Bug处理时间统计';
 //$lang->bug->report->charts['bugHistories']       = 'Bug处理步骤统计';
 
@@ -243,34 +249,34 @@ $lang->bug->report->options->graph->yAxisName        = 'COUNT';
 $lang->bug->report->options->graph->pieRadius        = 100; // 饼图直径。
 $lang->bug->report->options->graph->showColumnShadow = 0;   // 是否显示柱状图阴影。
 
-$lang->bug->report->bugsPerProject->graph->xAxisName     = '项目';
-$lang->bug->report->bugsPerModule->graph->xAxisName      = '模块';
+$lang->bug->report->bugsPerProject->graph->xAxisName     = 'Project';
+$lang->bug->report->bugsPerModule->graph->xAxisName      = 'Module';
 
 $lang->bug->report->openedBugsPerDay->swf                = 'column2d';
 $lang->bug->report->openedBugsPerDay->height             = 400;
-$lang->bug->report->openedBugsPerDay->graph->xAxisName   = '日期';
+$lang->bug->report->openedBugsPerDay->graph->xAxisName   = 'Date';
 $lang->bug->report->openedBugsPerDay->graph->rotateNames = 1;
 
 $lang->bug->report->resolvedBugsPerDay->swf              = 'column2d';
 $lang->bug->report->resolvedBugsPerDay->height           = 400;
-$lang->bug->report->resolvedBugsPerDay->graph->xAxisName = '日期';
+$lang->bug->report->resolvedBugsPerDay->graph->xAxisName = 'Date';
 $lang->bug->report->resolvedBugsPerDay->graph->rotateNames = 1;
 
 $lang->bug->report->closedBugsPerDay->swf                = 'column2d';
 $lang->bug->report->closedBugsPerDay->height             = 400;
-$lang->bug->report->closedBugsPerDay->graph->xAxisName   = '日期';
+$lang->bug->report->closedBugsPerDay->graph->xAxisName   = 'Date';
 $lang->bug->report->closedBugsPerDay->graph->rotateNames = 1;
 
-$lang->bug->report->openedBugsPerUser->graph->xAxisName  = '用户';
-$lang->bug->report->resolvedBugsPerUser->graph->xAxisName= '用户';
-$lang->bug->report->closedBugsPerUser->graph->xAxisName  = '用户';
+$lang->bug->report->openedBugsPerUser->graph->xAxisName  = 'User';
+$lang->bug->report->resolvedBugsPerUser->graph->xAxisName= 'User';
+$lang->bug->report->closedBugsPerUser->graph->xAxisName  = 'User';
 
-$lang->bug->report->bugsPerSeverity->graph->xAxisName    = '严重程度';
-$lang->bug->report->bugsPerResolution->graph->xAxisName  = '解决方案';
-$lang->bug->report->bugsPerStatus->graph->xAxisName      = '状态';
-$lang->bug->report->bugsPerType->graph->xAxisName        = '类型';
-$lang->bug->report->bugLiveDays->graph->xAxisName        = '处理时间';
-$lang->bug->report->bugHistories->graph->xAxisName       = '处理步骤';
+$lang->bug->report->bugsPerSeverity->graph->xAxisName    = 'Severity';
+$lang->bug->report->bugsPerResolution->graph->xAxisName  = 'Resolution';
+$lang->bug->report->bugsPerStatus->graph->xAxisName      = 'Status';
+$lang->bug->report->bugsPerType->graph->xAxisName        = 'Type';
+$lang->bug->report->bugLiveDays->graph->xAxisName        = 'Live days';
+$lang->bug->report->bugHistories->graph->xAxisName       = 'Histories';
 
 /* 操作记录。*/
-$lang->bug->action->resolved = array('main' => '$date, 由 <strong>$actor</strong> 解决，方案为 <strong>$extra</strong>。', 'extra' => $lang->bug->resolutionList);
+$lang->bug->action->resolved = array('main' => '$date, Resolved by <strong>$actor</strong>, resolution is <strong>$extra</strong>.', 'extra' => $lang->bug->resolutionList);
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 37e765db68..42569c698d 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -139,9 +139,9 @@ $lang->bug->confirmDelete        = '您确认要删除该Bug吗？';
 $lang->bug->setTemplateTitle     = '请输入bug模板标题（保存之前请先填写bug重现步骤）：';
 
 /* 模板。*/
-$lang->bug->tblStep        = "[步骤]\n";
-$lang->bug->tblResult      = "[结果]\n";
-$lang->bug->tblExpect      = "[期望]\n";
+$lang->bug->tplStep        = "[b][步骤][/b]\n\n";
+$lang->bug->tplResult      = "[b][结果][/b]\n\n";
+$lang->bug->tplExpect      = "[b][期望][/b]\n\n";
 
 /* 各个字段取值列表。*/
 $lang->bug->severityList[3] = '3';
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 7cf3885710..243fb55778 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -100,7 +100,7 @@ $(document).ready(function()
           <th class='w-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
           <th class='w-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
           <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-          <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
+          <th class='w-120px {sorter:false}'><?php echo $lang->actions;?></th>
           <?php endif;?>
         </tr>
         </thead>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index d8e666b94e..59db23de99 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -27,9 +27,9 @@
 <?php include '../../common/view/alert.html.php';?>
 <?php include '../../common/view/xheditor.html.php';?>
 <style>
-#product, #module, #project, #story, #task, #resolvedBuild{width:230px}
-.select-3 {width:230px}
-.text-3   {width:225px}
+#product, #module, #project, #story, #task, #resolvedBuild{width:220px}
+.select-3 {width:220px}
+.text-3   {width:215px}
 </style>
 <script language='Javascript'>
 changeProductConfirmed = false;
@@ -192,7 +192,7 @@ $(function() {
       <legend><?php echo $lang->bug->legendBasicInfo;?></legend>
       <table class='table-1 a-left' cellpadding='0' cellspacing='0'>
         <tr>
-          <td class='rowhead'><?php echo $lang->bug->product;?></td>
+          <td class='rowhead w-p20'><?php echo $lang->bug->product;?></td>
           <td>
             <?php echo html::select('product', $products, $productID, "onchange=loadAll(this.value);");?>
           </td>
@@ -243,7 +243,7 @@ $(function() {
       <legend><?php echo $lang->bug->legendPrjStoryTask;?></legend>
       <table class='table-1 a-left'>
         <tr>
-          <td class='rowhead'><?php echo $lang->bug->project;?></td>
+          <td class='rowhead w-p20'><?php echo $lang->bug->project;?></td>
           <td><span id='projectIdBox'><?php echo html::select('project', $projects, $bug->project, 'class=select-3 onchange=loadProjectRelated(this.value)');?></span></td>
         </tr>
         <tr>
@@ -261,7 +261,7 @@ $(function() {
       <legend><?php echo $lang->bug->legendLife;?></legend>
       <table class='table-1 a-left'>
         <tr>
-          <td class='rowhead'><?php echo $lang->bug->openedBy;?></td>
+          <td class='rowhead w-p20'><?php echo $lang->bug->openedBy;?></td>
           <td><?php echo $users[$bug->openedBy];?></td>
         </tr>
         <tr>
@@ -269,7 +269,7 @@ $(function() {
           <td><span id='openedBuildBox'><?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class=select-3');?></span></td>
         </tr>
         <tr>
-          <td width='40%' class='rowhead'><?php echo $lang->bug->resolvedBy;?></td>
+          <td class='rowhead'><?php echo $lang->bug->resolvedBy;?></td>
           <td><?php echo html::select('resolvedBy', $users, $bug->resolvedBy, 'class=select-3');?></td>
         </tr>
         <tr>
@@ -289,7 +289,7 @@ $(function() {
           <td><?php echo html::input('duplicateBug', $bug->duplicateBug, 'class=text-3');?></td>
         </tr>
         <tr>
-          <td width='40%' class='rowhead'><?php echo $lang->bug->closedBy;?></td>
+          <td class='rowhead'><?php echo $lang->bug->closedBy;?></td>
           <td><?php echo html::select('closedBy', $users, $bug->closedBy, 'class=select-3');?></td>
         </tr>
         <tr>
@@ -302,7 +302,7 @@ $(function() {
       <legend><?php echo $lang->bug->legendMisc;?></legend>
       <table class='table-1 a-left'>
         <tr>
-          <td class='rowhead'><?php echo $lang->bug->mailto;?></td>
+          <td class='rowhead w-p20'><?php echo $lang->bug->mailto;?></td>
           <td><?php echo html::input('mailto', $bug->mailto, 'class="text-3"');?></td>
         </tr>
         <tr>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 2980e13d95..4b3e942305 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -81,7 +81,7 @@
       <legend><?php echo $lang->bug->legendBasicInfo;?></legend>
       <table class='table-1 a-left'>
         <tr valign='middle'>
-          <th class='w-p20 rowhead'><?php echo $lang->bug->product;?></th>
+          <th class='rowhead'><?php echo $lang->bug->product;?></th>
           <td><?php if(!common::printLink('bug', 'browse', "productID=$bug->product", $productName)) echo $productName;?>
         </tr>
         <tr>
@@ -135,7 +135,7 @@
       <legend><?php echo $lang->bug->legendLife;?></legend>
       <table class='table-1 a-left fixed'>
         <tr>
-          <th class='rowhead w-p20'><?php echo $lang->bug->openedBy;?></th>
+          <th class='rowhead'><?php echo $lang->bug->openedBy;?></th>
           <td> <?php echo $users[$bug->openedBy] . $lang->at . $bug->openedDate;?></td>
         </tr>
         <tr>
@@ -186,7 +186,7 @@
       <legend><?php echo $lang->bug->legendPrjStoryTask;?></legend>
       <table class='table-1 a-left fixed'>
         <tr>
-          <td class='rowhead w-p20'><?php echo $lang->bug->project;?></td>
+          <td class='rowhead'><?php echo $lang->bug->project;?></td>
           <td><?php if($bug->project) echo html::a($this->createLink('project', 'browse', "projectid=$bug->project"), $bug->projectName);?></td>
         </tr>
         <tr class='nofixed'>
@@ -213,7 +213,7 @@
       <legend><?php echo $lang->bug->legendMisc;?></legend>
       <table class='table-1 a-left fixed'>
         <tr>
-          <td class='rowhead w-p20'><?php echo $lang->bug->mailto;?></td>
+          <td class='rowhead'><?php echo $lang->bug->mailto;?></td>
           <td><?php $mailto = explode(',', str_replace(' ', '', $bug->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
         </tr>
         <tr>
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index b6b8f4dc6d..d4e2bd577d 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The build module english file of ZenTaoMS.
+ * 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
@@ -22,21 +22,21 @@
  * @link        http://www.zentaoms.com
  */
 $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->create    = "Create";
+$lang->build->edit      = "Edit";
+$lang->build->delete    = "Delete";
+$lang->build->view      = "Info";
+$lang->build->ajaxGetProductBuilds = 'API:Product builds';
+$lang->build->ajaxGetProjectBuilds = 'API:Project builds';
 
-$lang->build->confirmDelete = "您确认删除该build吗？";
+$lang->build->confirmDelete = "Are sure to delete this 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      = '描述';
+$lang->build->product   = 'Product';
+$lang->build->project   = 'Project';
+$lang->build->name      = 'Name';
+$lang->build->date      = 'Build date';
+$lang->build->builder   = 'Builder';
+$lang->build->scmPath   = 'Source code path';
+$lang->build->filePath  = 'Pacage file path';
+$lang->build->desc      = 'Desc';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index d7a9d02848..c27d85748f 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -25,169 +25,182 @@
  */
 $lang->arrow        = ' » ';
 $lang->colon        = '::';
-$lang->at           = ' 于 ';
+$lang->at           = ' at ';
 $lang->downArrow    = '↓';
 
-$lang->zentaoMS     = '禅道管理';
-$lang->welcome      = "欢迎使用『%s』{$lang->colon} {$lang->zentaoMS}";
-$lang->myControl    = "我的地盘";
-$lang->currentPos   = '当前位置：';
-$lang->logout       = '退出系统';
-$lang->login        = '登录';
-$lang->aboutZenTao  = '关于禅道';
-$lang->todayIs      = '今天是%s，';
+$lang->zentaoMS     = 'ZenTaoPMS';
+$lang->welcome      = "Welcome to『%s』{$lang->colon} {$lang->zentaoMS}";
+$lang->myControl    = "Dashboard";
+$lang->currentPos   = 'Current';
+$lang->logout       = 'Logout';
+$lang->login        = 'Login';
+$lang->aboutZenTao  = 'About';
+$lang->todayIs      = 'Today is %s，';
 
-$lang->reset        = '重填';
-$lang->edit         = '编辑';
-$lang->copy         = '复制';
-$lang->delete       = '删除';
-$lang->close        = '关闭';
-$lang->link         = '关联';
-$lang->unlink       = '移除';
-$lang->import       = '导入';
-$lang->exportCSV    = '导出csv';
-$lang->setFileName  = '请输入文件名：';
-$lang->activate     = '激活';
-$lang->save         = '保存';
-$lang->confirm      = '确认';
-$lang->preview      = '预览';
-$lang->goback       = '返回';
-$lang->showHelp     = '显示帮助';
+$lang->reset        = 'Reset';
+$lang->edit         = 'Edit';
+$lang->copy         = 'Copy';
+$lang->delete       = 'Delete';
+$lang->close        = 'Close';
+$lang->link         = 'Link';
+$lang->unlink       = 'Unlink';
+$lang->import       = 'Import';
+$lang->exportCSV    = 'Export CSV';
+$lang->setFileName  = 'Please input file name:';
+$lang->activate     = 'Activate';
+$lang->save         = 'Save';
+$lang->confirm      = 'Confirm';
+$lang->preview      = 'Preview';
+$lang->goback       = 'Back';
+$lang->showHelp     = 'Help On';
+$lang->closeHelp    = 'Help Off';
 $lang->go           = 'GO!';
 
-$lang->actions      = '操作';
-$lang->comment      = '备注';
-$lang->history      = '历史记录';
-$lang->attatch      = '附件';
-$lang->reverse      = '（切换顺序）';
-$lang->addFiles     = '上传了附件 ';
-$lang->files        = '附件 ';
+$lang->actions      = 'Actions';
+$lang->comment      = 'Comment';
+$lang->history      = 'History';
+$lang->attatch      = 'Attatch';
+$lang->reverse      = '(Reverse)';
+$lang->addFiles     = 'Add Files';
+$lang->files        = 'Files ';
 
-$lang->selectAll    = '全选';
-$lang->notFound     = '抱歉，您访问的对象并不存在！';
-$lang->showAll      = '++ 全部显示 ++';
-$lang->hideClosed   = '-- 隐藏已结束 --';
+$lang->selectAll    = 'Select All';
+$lang->notFound     = 'Sorry, the object not found.';
+$lang->showAll      = '++ Show All ++';
+$lang->hideClosed   = '-- Hide Closed--';
 
-$lang->feature      = '未来';
-$lang->year         = '年';
-$lang->workingHour  = '工时';
+$lang->feature      = 'Feature';
+$lang->year         = 'Year';
+$lang->workingHour  = 'Hour';
 
 $lang->idAB         = 'ID';
 $lang->priAB        = 'P';
-$lang->statusAB     = '状态';
-$lang->openedByAB   = '创建';
-$lang->assignedToAB = '指派';
-$lang->typeAB       = '类型';
+$lang->statusAB     = 'Status';
+$lang->openedByAB   = 'Open';
+$lang->assignedToAB = 'To';
+$lang->typeAB       = 'Type';
 
 /* 主导航菜单。*/
-$lang->menu->index   = '首页|index|index';
-$lang->menu->my      = '我的地盘|my|index';
-$lang->menu->product = '产品视图|product|index';
-$lang->menu->project = '项目视图|project|index';
-$lang->menu->qa      = 'QA视图|qa|index';
-$lang->menu->company = '组织视图|company|index';
-$lang->menu->admin   = '后台管理|admin|index';
+$lang->menu->index   = 'Index|index|index';
+$lang->menu->my      = 'Dashboard|my|index';
+$lang->menu->product = 'Product|product|index';
+$lang->menu->project = 'Project|project|index';
+$lang->menu->qa      = 'QA|qa|index';
+$lang->menu->doc     = 'Doc|doc|index';
+//$lang->menu->forum   = '讨论视图|doc|index';
+$lang->menu->company = 'Company|company|index';
+$lang->menu->admin   = 'Admin|admin|index';
 
 /* 查询条中可以选择的对象列表。*/
-$lang->searchObjects['bug']         = 'B:Bug';
-$lang->searchObjects['story']       = 'S:需求';
-$lang->searchObjects['task']        = 'T:任务';
-$lang->searchObjects['testcase']    = 'C:用例';
-$lang->searchObjects['project']     = 'P:项目';
-$lang->searchObjects['product']     = 'P:产品';
-$lang->searchObjects['user']        = 'U:用户';
-$lang->searchObjects['build']       = 'B:Build';
-$lang->searchObjects['release']     = 'R:发布';
-$lang->searchObjects['productplan'] = 'P:产品计划';
-$lang->searchObjects['testtask']    = 'T:测试任务';
-$lang->searchTips                   = '输入编号';
+$lang->searchObjects['bug']         = 'Bug';
+$lang->searchObjects['story']       = 'Story';
+$lang->searchObjects['task']        = 'Task';
+$lang->searchObjects['testcase']    = 'Case';
+$lang->searchObjects['project']     = 'Project';
+$lang->searchObjects['product']     = 'Product';
+$lang->searchObjects['user']        = 'User';
+$lang->searchObjects['build']       = 'Build';
+$lang->searchObjects['release']     = 'Release';
+$lang->searchObjects['productplan'] = 'Plan';
+$lang->searchObjects['testtask']    = 'Test Task';
+$lang->searchTips                   = 'Id here';
 
 /* 首页菜单设置。*/
-$lang->index->menu->product = '浏览产品|product|browse';
-$lang->index->menu->project = '浏览项目|project|browse';
+$lang->index->menu->product = 'Products|product|browse';
+$lang->index->menu->project = 'Projects|project|browse';
 
 /* 我的地盘菜单设置。*/
 $lang->my->menu->account  = '%s' . $lang->arrow;
-$lang->my->menu->todo     = array('link' => '我的TODO|my|todo|', 'subModule' => 'todo');
-$lang->my->menu->task     = '我的任务|my|task|';
-$lang->my->menu->bug      = '我的Bug|my|bug|';
-$lang->my->menu->story    = '我的需求|my|story|';
-$lang->my->menu->project  = '我的项目|my|project|';
-$lang->my->menu->profile  = array('link' => '我的档案|my|profile|', 'alias' => 'editprofile');
+$lang->my->menu->todo     = array('link' => 'Todo|my|todo|', 'subModule' => 'todo');
+$lang->my->menu->task     = 'Task|my|task|';
+$lang->my->menu->bug      = 'Bug|my|bug|';
+$lang->my->menu->story    = 'Story|my|story|';
+$lang->my->menu->project  = 'Project|my|project|';
+$lang->my->menu->profile  = array('link' => 'Profile|my|profile|', 'alias' => 'editprofile');
 $lang->todo->menu         = $lang->my->menu;
 
 /* 产品视图设置。*/
 $lang->product->menu->list   = '%s';
-$lang->product->menu->story  = array('link' => '需求列表|product|browse|productID=%s',     'subModule' => 'story');
-$lang->product->menu->plan   = array('link' => '计划列表|productplan|browse|productID=%s', 'subModule' => 'productplan');
-$lang->product->menu->release= array('link' => '发布列表|release|browse|productID=%s',     'subModule' => 'release');
-$lang->product->menu->roadmap= '路线图|product|roadmap|productID=%s';
-$lang->product->menu->view   = '基本信息|product|view|productID=%s';
-$lang->product->menu->edit   = '编辑产品|product|edit|productID=%s';
-$lang->product->menu->module = '维护模块|tree|browse|productID=%s&view=product';
-$lang->product->menu->delete = array('link' => '删除产品|product|delete|productID=%s', 'target' => 'hiddenwin');
-$lang->product->menu->create = array('link' => '新增产品|product|create', 'float' => 'right');
+$lang->product->menu->story  = array('link' => 'Story|product|browse|productID=%s',     'subModule' => 'story');
+$lang->product->menu->plan   = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan');
+$lang->product->menu->release= array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
+$lang->product->menu->roadmap= 'Roadmap|product|roadmap|productID=%s';
+$lang->product->menu->doc    = 'Doc|product|doc|productID=%s';
+$lang->product->menu->view   = 'Info|product|view|productID=%s';
+$lang->product->menu->edit   = 'Edit|product|edit|productID=%s';
+$lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story';
+$lang->product->menu->delete = array('link' => 'Delete|product|delete|productID=%s', 'target' => 'hiddenwin');
+$lang->product->menu->create = array('link' => 'New Product|product|create', 'float' => 'right');
 $lang->story->menu           = $lang->product->menu;
 $lang->productplan->menu     = $lang->product->menu;
 $lang->release->menu         = $lang->product->menu;
 
 /* 项目视图菜单设置。*/
 $lang->project->menu->list      = '%s';
-$lang->project->menu->task      = array('link' => '任务列表|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask');
-$lang->project->menu->story     = array('link' => '需求列表|project|story|projectID=%s');
-$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->product   = '关联产品|project|manageproducts|projectID=%s';
-$lang->project->menu->linkstory = array('link' => '关联需求|project|linkstory|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->task      = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask');
+$lang->project->menu->story     = array('link' => 'Story|project|story|projectID=%s');
+$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      = 'Burn|project|burn|projectID=%s';
+$lang->project->menu->team      = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers');
+$lang->project->menu->doc       = 'Doc|project|doc|porjectID=%s';
+$lang->project->menu->product   = 'Link Product|project|manageproducts|projectID=%s';
+$lang->project->menu->linkstory = array('link' => 'Link Story|project|linkstory|projectID=%s');
+$lang->project->menu->view      = 'Info|project|view|projectID=%s';
+$lang->project->menu->edit      = 'Edit|project|edit|projectID=%s';
+$lang->project->menu->delete    = array('link' => 'Delete|project|delete|projectID=%s', 'target' => 'hiddenwin');
 
-$lang->project->menu->create = array('link' => '新增项目|project|create', 'float' => 'right');
+$lang->project->menu->create = array('link' => 'New Project|project|create', 'float' => 'right');
 $lang->task->menu            = $lang->project->menu;
 $lang->build->menu           = $lang->project->menu;
 
 /* QA视图菜单设置。*/
 $lang->bug->menu->product  = '%s';
-$lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,activate,report', 'subModule' => 'tree');
-$lang->bug->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
-$lang->bug->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s');
+$lang->bug->menu->bug      = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,activate,report', 'subModule' => 'tree');
+$lang->bug->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
+$lang->bug->menu->testtask = array('link' => 'Task|testtask|browse|productID=%s');
 
 $lang->testcase->menu->product  = '%s';
-$lang->testcase->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s');
-$lang->testcase->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
-$lang->testcase->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s');
+$lang->testcase->menu->bug      = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,edit', 'subModule' => 'tree');
+$lang->testcase->menu->testtask = array('link' => 'Task|testtask|browse|productID=%s');
 
 $lang->testtask->menu->product  = '%s';
-$lang->testtask->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s');
-$lang->testtask->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s');
-$lang->testtask->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases');
+$lang->testtask->menu->bug      = array('link' => 'Bug|bug|browse|productID=%s');
+$lang->testtask->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
+$lang->testtask->menu->testtask = array('link' => 'Task|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases');
+
+/* 文档视图菜单设置。*/
+$lang->doc->menu->list    = '%s';
+$lang->doc->menu->browse  = array('link' => 'Doc|doc|browse|libID=%s');
+$lang->doc->menu->edit    = 'Edit Library|doc|editLib|libID=%s';
+$lang->doc->menu->module  = 'Modules|tree|browse|libID=%s&viewType=doc';
+$lang->doc->menu->delete  = array('link' => 'Delete Library|doc|deleteLib|libID=%s', 'target' => 'hiddenwin');
+$lang->doc->menu->create  = array('link' => 'New Library|doc|createLib', 'float' => 'right');
 
 /* 组织结构视图菜单设置。*/
 $lang->company->menu->name        = '%s' . $lang->arrow;
-$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->edit        = array('link' => '公司管理|company|edit');
-$lang->company->menu->addGroup    = array('link' => '添加分组|group|create', 'float' => 'right');
-$lang->company->menu->addUser     = array('link' => '添加用户|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
+$lang->company->menu->browseUser  = array('link' => 'Users|company|browse', 'subModule' => 'user');
+$lang->company->menu->dept        = array('link' => 'Department|dept|browse', 'subModule' => 'dept');
+$lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group');
+$lang->company->menu->edit        = array('link' => 'Company|company|edit');
+$lang->company->menu->addGroup    = array('link' => 'Add Group|group|create', 'float' => 'right');
+$lang->company->menu->addUser     = array('link' => 'Add User|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
 $lang->dept->menu            = $lang->company->menu;
 $lang->group->menu           = $lang->company->menu;
 
 /* 用户信息菜单设置。*/
 $lang->user->menu->account  = '%s' . $lang->arrow;
-$lang->user->menu->todo     = array('link' => 'TODO列表|user|todo|account=%s', 'subModule' => 'todo');
-$lang->user->menu->task     = '任务列表|user|task|account=%s';
+$lang->user->menu->todo     = array('link' => 'Todo|user|todo|account=%s', 'subModule' => 'todo');
+$lang->user->menu->task     = 'Task|user|task|account=%s';
 $lang->user->menu->bug      = 'Bug列表|user|bug|account=%s';
-$lang->user->menu->project  = '项目列表|user|project|account=%s';
-$lang->user->menu->profile  = array('link' => '用户信息|user|profile|account=%s', 'alias' => 'edit');
+$lang->user->menu->project  = 'Project|user|project|account=%s';
+$lang->user->menu->profile  = array('link' => 'Profile|user|profile|account=%s', 'alias' => 'edit');
 $lang->user->menu->browse   = array('link' => '用户管理|company|browse|', 'float' => 'right');
 
 /* 后台管理菜单设置。*/
-$lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action');
-$lang->admin->menu->convert = array('link' => '从其他系统导入|convert|index', 'subModule' => 'convert');
+$lang->admin->menu->trashes = array('link' => 'Trash|action|trash', 'subModule' => 'action');
+$lang->admin->menu->convert = array('link' => 'Import|convert|index', 'subModule' => 'convert');
 $lang->convert->menu        = $lang->admin->menu;
 $lang->upgrade->menu        = $lang->admin->menu;
 $lang->action->menu         = $lang->admin->menu;
@@ -211,43 +224,75 @@ $lang->menugroup->todo        = 'my';
 $lang->menugroup->action      = 'admin';
 
 /* 错误提示信息。*/
-$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->equal           = "『%s』必须为『%s』。";
-$lang->error->int             = array("『%s』应当是数字。", "『%s』应当介于『%s-%s』之间。");
-$lang->error->float           = "『%s』应当是数字，可以是小数。";
-$lang->error->email           = "『%s』应当为合法的EMAIL。";
-$lang->error->date            = "『%s』应当为合法的日期。";
-$lang->error->account         = "『%s』应当为合法的用户名。";
-$lang->error->passwordsame    = "两次密码应当相等。";
-$lang->error->passwordrule    = "密码应该符合规则，长度至少为六位。";
+$lang->error->companyNotFound = "The domain %s does not exist.";
+$lang->error->length          = array("『%s』length should be『%s』", "『%s』length should between『%s』and 『%s』.");
+$lang->error->reg             = "『%s』should like『%s』";
+$lang->error->unique          = "『%s』has『%s』already.";
+$lang->error->notempty        = "『%s』can not be empty.";
+$lang->error->equal           = "『%s』must be『%s』。";
+$lang->error->int             = array("『%s』should be interger", "『%s』should between『%s-%s』.");
+$lang->error->float           = "『%s』should be a interger or float.";
+$lang->error->email           = "『%s』should be email.";
+$lang->error->date            = "『%s』should be date";
+$lang->error->account         = "『%s』should be a valid account.";
+$lang->error->passwordsame    = "Two passwords must be the same";
+$lang->error->passwordrule    = "Password should more than six letters.";
 
 /* 分页信息。*/
-$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->noRecord  = "No records yet.";
+$lang->pager->digest    = "<strong>%s</strong> records, <strong>%s</strong> per page, <strong>%s/%s</strong> ";
+$lang->pager->first     = "First";
+$lang->pager->pre       = "Previous";
+$lang->pager->next      = "Next";
+$lang->pager->last      = "Last";
 $lang->pager->locate    = "GO!";
 
-$lang->zentaoSite     = "官方网站";
-$lang->sponser        = "<a href='http://www.pujia.com' target='_blank'>普加赞助</a>";
-$lang->zentaoKeywords = "开源项目管理软件,项目管理,项目管理软件,pmp,pms,php框架，国产php框架，scrum工具,scrum管理工具,scrum管理软件,敏捷项目管理,禅道";
-$lang->zentaoDESC     = "禅道项目管理软件(ZenTaoPMS)是一款国产的，基于LGPL协议，开源免费的项目管理软件(工具、系统)，同时也是一款scrum管理工具。
-    它集产品管理、项目管理、测试管理于一体，同时还包含了事务管理、组织管理等诸多功能，是中小型企业项目管理的首选。禅道项目管理软件使用PHP + MySQL开发，
-基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。禅道在手，项目无忧！"; 
+$lang->zentaoSite     = "Official Site";
+$lang->sponser        = "<a href='http://www.pujia.com' target='_blank'>PuJia Sponsed</a>";
+$lang->zentaoKeywords = "Open Source Project Management System";
+$lang->zentaoDESC     = "ZenTaoPMS is an open sourced project management system."; 
 
 /* 时间格式设置。*/
 define('DT_DATETIME1',  'Y-m-d H:i:s');
 define('DT_DATETIME2',  'y-m-d H:i');
 define('DT_MONTHTIME1', 'n/d H:i');
-define('DT_MONTHTIME2', 'n月d日 H:i');
+define('DT_MONTHTIME2', 'F j, H:i');
 define('DT_DATE1',     'Y-m-d');
 define('DT_DATE2',     'Ymd');
-define('DT_DATE3',     'Y年m月d日');
+define('DT_DATE3',     'F j, Y ');
 define('DT_TIME1',     'H:i:s');
 define('DT_TIME2',     'H:i');
+
+/* 表情。*/
+$lang->smilies->smile       = 'Smile';
+$lang->smilies->sad         = 'Sad';
+$lang->smilies->wink        = 'Wink';
+$lang->smilies->tongue      = 'Tongue';
+$lang->smilies->shocked     = 'Shocked';
+$lang->smilies->eyesdown    = 'Disappointed';
+$lang->smilies->angry       = 'Angry';
+$lang->smilies->cool        = 'Cool';
+$lang->smilies->indifferent = 'Indifferent';
+$lang->smilies->sick        = 'Sick';
+$lang->smilies->blush       = 'Blush';
+$lang->smilies->angel       = 'Angel';
+$lang->smilies->confused    = 'COnfused';
+$lang->smilies->cry         = 'Cry';
+$lang->smilies->footinmouth = 'Secret';
+$lang->smilies->biggrin     = 'Laugh';
+$lang->smilies->nerd        = 'Nerd';
+$lang->smilies->tired       = 'Tired';
+$lang->smilies->rose        = 'Rose';
+$lang->smilies->kiss        = 'Kiss';
+$lang->smilies->heart       = 'Love';
+$lang->smilies->hug         = 'Hug';
+$lang->smilies->dog         = 'Dog';
+$lang->smilies->deadrose    = 'Dead Rose';
+$lang->smilies->clock       = 'Clock';
+$lang->smilies->brokenheart = 'Broken Heart';
+$lang->smilies->coffee      = 'Coffee';
+$lang->smilies->computer    = 'Computer';
+$lang->smilies->devil       = 'Devil';
+$lang->smilies->thumbsup    = 'Thumb up';
+$lang->smilies->thumbsdown  = 'Hhumb down';
+$lang->smilies->mail        = 'Email';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 691a135248..7ef1b14a95 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -53,6 +53,7 @@ $lang->confirm      = '确认';
 $lang->preview      = '预览';
 $lang->goback       = '返回';
 $lang->showHelp     = '显示帮助';
+$lang->closeHelp    = '关闭帮助';
 $lang->go           = 'GO!';
 
 $lang->actions      = '操作';
@@ -275,7 +276,7 @@ $lang->smilies->angry       = '愤怒';
 $lang->smilies->cool        = '耍酷';
 $lang->smilies->indifferent = '冷漠';
 $lang->smilies->sick        = '病中';
-$lang->smilies->blush       = '尴尬';
+$lang->smilies->blush       = '脸红';
 $lang->smilies->angel       = '天使';
 $lang->smilies->confused    = '困惑';
 $lang->smilies->cry         = '大哭';
diff --git a/module/company/lang/en.php b/module/company/lang/en.php
index 15396c5f86..38f524b00c 100644
--- a/module/company/lang/en.php
+++ b/module/company/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The company module english 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,30 +21,30 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$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->common   = 'Company';
+$lang->company->index    = "Index";
+$lang->company->create   = "Create";
+$lang->company->edit     = "Edit";
+$lang->company->read     = "Info";
+$lang->company->update   = "Update";
+$lang->company->delete   = "Delete";
+$lang->company->browse   = "User";
+$lang->company->depts    = "Dept";
+$lang->company->orgView  = 'Company';
 
-$lang->company->confirmDelete = "您确定删除该公司吗？";
-$lang->company->successSaved  = "成功保存";
+$lang->company->confirmDelete = "Are you sure to delete this company?";
+$lang->company->successSaved  = "Success saved";
 
-$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->id       = 'ID';
+$lang->company->name     = 'Name';
+$lang->company->phone    = 'Phone';
+$lang->company->fax      = 'Fax';
+$lang->company->address  = 'Address';
+$lang->company->zipcode  = 'Zipcode';
+$lang->company->website  = 'Web site';
+$lang->company->backyard = 'Internal Site';
+$lang->company->pms      = 'ZenTaoPMS Site';
+$lang->company->guest    = 'Guest visit';
 
-$lang->company->guestList[0] = '不允许';
-$lang->company->guestList[1] = '允许';
+$lang->company->guestList[0] = 'Allow';
+$lang->company->guestList[1] = 'Deny';
diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php
index 3bfbac5126..c4cc56a5c1 100644
--- a/module/convert/lang/en.php
+++ b/module/convert/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The convert module english file of ZenTaoMS.
+ * 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
@@ -21,59 +21,60 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->convert->common  = '从其他系统导入';
-$lang->convert->next    = '下一步';
-$lang->convert->pre     = '返回';
-$lang->convert->reload  = '刷新';
-$lang->convert->error   = '错误 ';
+$lang->convert->common  = 'Import';
+$lang->convert->next    = 'Next';
+$lang->convert->pre     = 'Back';
+$lang->convert->reload  = 'Reload';
+$lang->convert->error   = 'Eror ';
+
+$lang->convert->start   = 'Begin import';
 
-$lang->convert->start   = '开始转换';
 $lang->convert->desc    = <<<EOT
-<p>欢迎使用系统转换向导，本程序会帮助您将其他系统的数据转换到禅道项目管理系统中。</p>
-<strong>转换存在一定的风险，转换之前，我们强烈建议您备份数据库及相应的数据文件，并保证转换的时候，没有其他人进行操作。</strong>
+<p>Welcome to use this convert wizard which will help you to import other system data to ZenTaoPMS.</p>
+<strong>Importing is dangerous. Be sure to backup your database and other data files and sure nobody is using pms when importing.</strong>
 EOT;
 
-$lang->convert->selectSource     = '选择来源系统及版本';
-$lang->convert->source           = '来源系统';
-$lang->convert->version          = '版本';
-$lang->convert->mustSelectSource = "必须选择一个来源。";
+$lang->convert->selectSource     = 'Select source system and version';
+$lang->convert->source           = 'Source system';
+$lang->convert->version          = 'Version';
+$lang->convert->mustSelectSource = "Must select a source system";
 
 $lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x');
 
-$lang->convert->setting     = '设置';
-$lang->convert->checkConfig = '检查配置';
+$lang->convert->setting     = 'Setting';
+$lang->convert->checkConfig = 'Check setting';
 
-$lang->convert->ok         = '检查通过(√)';
-$lang->convert->fail       = '检查失败(×)';
+$lang->convert->ok         = 'Check passed(√)';
+$lang->convert->fail       = 'Check failed(×)';
 
-$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->settingDB  = 'Set database';
+$lang->convert->dbHost     = 'Database server';
+$lang->convert->dbPort     = 'Server port';
+$lang->convert->dbUser     = 'Database user';
+$lang->convert->dbPassword = 'Database password';
+$lang->convert->dbName     = '%s database';
+$lang->convert->dbPrefix   = '%s table prefix';
+$lang->convert->installPath= '%s installed path';
 
-$lang->convert->checkDB    = '数据库';
-$lang->convert->checkTable = '表';
-$lang->convert->checkPath  = '安装路径';
+$lang->convert->checkDB    = 'Database';
+$lang->convert->checkTable = 'Table';
+$lang->convert->checkPath  = 'Installed path';
 
-$lang->convert->execute    = '执行转换';
-$lang->convert->item       = '转换项';
-$lang->convert->count      = '转换数量';
-$lang->convert->info       = '转换信息';
+$lang->convert->execute    = 'Execute import';
+$lang->convert->item       = 'Imported items';
+$lang->convert->count      = 'Count';
+$lang->convert->info       = 'Info';
 
-$lang->convert->bugfree->users    = '用户';
-$lang->convert->bugfree->projects = '项目';
-$lang->convert->bugfree->modules  = '模块';
+$lang->convert->bugfree->users    = 'User';
+$lang->convert->bugfree->projects = 'Project';
+$lang->convert->bugfree->modules  = 'Module';
 $lang->convert->bugfree->bugs     = 'Bug';
-$lang->convert->bugfree->cases    = '测试用例';
-$lang->convert->bugfree->results  = '测试结果';
-$lang->convert->bugfree->actions  = '历史记录';
-$lang->convert->bugfree->files    = '附件';
+$lang->convert->bugfree->cases    = 'Case';
+$lang->convert->bugfree->results  = 'Result';
+$lang->convert->bugfree->actions  = 'History';
+$lang->convert->bugfree->files    = 'File';
 
-$lang->convert->errorConnectDB     = '数据库连接失败 ';
-$lang->convert->errorFileNotExits  = '文件 %s 不存在';
-$lang->convert->errorUserExists    = '用户 %s 已存在';
-$lang->convert->errorCopyFailed    = '文件 %s 拷贝失败';
+$lang->convert->errorConnectDB     = 'Connect to database server failed.';
+$lang->convert->errorFileNotExits  = 'File %s not exits.';
+$lang->convert->errorUserExists    = 'User %s exits already.';
+$lang->convert->errorCopyFailed    = 'file %s copy failed.';
diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php
index ac25d31324..e0decb3d4f 100644
--- a/module/dept/lang/en.php
+++ b/module/dept/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The dept module english file of ZenTaoMS.
+ * 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
@@ -21,15 +21,15 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$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->common      = 'Department';
+$lang->dept->add         = "Add";
+$lang->dept->addChild    = "Add child department";
+$lang->dept->manageChild = "Child deprtment";
+$lang->dept->delete      = "Delete";
+$lang->dept->browse      = "Manage";
+$lang->dept->manage      = "Manage";
+$lang->dept->updateOrder = "Update order";
+$lang->dept->users       = "Users";
 
-$lang->dept->saveButton    = " 保存 (S) ";
-$lang->dept->confirmDelete = " 您确定删除该部门吗？";
+$lang->dept->saveButton    = " Save (S) ";
+$lang->dept->confirmDelete = "Are you sure to delete this department?"; 
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
index ebf6c30687..f6a793bb0c 100644
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The file module english file of ZenTaoMS.
+ * 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
@@ -21,7 +21,7 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->file->common     = '附件';
-$lang->file->download   = '下载附件';
-$lang->file->export2CSV = '导出CSV';
-$lang->file->label    = '标题：';
+$lang->file->common     = 'File';
+$lang->file->download   = 'Download';
+$lang->file->export2CSV = 'Export CSV';
+$lang->file->label    = 'Title: ';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index a294e430af..9628b32c01 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The group module english file of ZenTaoMS.
+ * 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
@@ -21,31 +21,31 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->group->common       = '权限分组';
-$lang->group->browse       = '浏览分组';
-$lang->group->create       = '新增分组';
-$lang->group->edit         = '编辑分组';
-$lang->group->copy         = '复制分组';
-$lang->group->delete       = '删除分组';
-$lang->group->managePriv   = '权限维护';
-$lang->group->manageMember = '成员维护';
-$lang->group->linkMember   = '关联用户';
-$lang->group->unlinkMember = '移除用户';
-$lang->group->confirmDelete= '您确定删除该用户分组吗？';
-$lang->group->successSaved = '成功保存';
+$lang->group->common       = 'Group';
+$lang->group->browse       = 'Browse';
+$lang->group->create       = 'Create';
+$lang->group->edit         = 'Edit';
+$lang->group->copy         = 'Copy';
+$lang->group->delete       = 'Delete';
+$lang->group->managePriv   = 'Manage priviledge';
+$lang->group->manageMember = 'Manage members';
+$lang->group->linkMember   = 'Add members';
+$lang->group->unlinkMember = 'Remove member';
+$lang->group->confirmDelete= 'Are you sure to delete this group?';
+$lang->group->successSaved = 'Success saved.';
 
-$lang->group->id       = '编号';
-$lang->group->name     = '分组名称';
-$lang->group->desc     = '分组描述';
-$lang->group->users    = '用户列表';
-$lang->group->module   = '模块';
-$lang->group->method   = '方法';
-$lang->group->priv     = '权限';
-$lang->group->checkall = '全选';
-$lang->group->option   = '选项';
+$lang->group->id       = 'Id';
+$lang->group->name     = 'Name';
+$lang->group->desc     = 'Desc';
+$lang->group->users    = 'Users';
+$lang->group->module   = 'Module';
+$lang->group->method   = 'Method';
+$lang->group->priv     = 'Priviledge';
+$lang->group->checkall = 'Select all';
+$lang->group->option   = 'Option';
 
-$lang->group->copyOptions['copyPriv'] = '复制权限';
-$lang->group->copyOptions['copyUser'] = '复制用户';
+$lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
+$lang->group->copyOptions['copyUser'] = 'Copy user';
 
 //---------------------------- 所有resource列表-------------------------*/
 
diff --git a/module/index/lang/en.php b/module/index/lang/en.php
index 4d0634025a..d73c9b75a6 100644
--- a/module/index/lang/en.php
+++ b/module/index/lang/en.php
@@ -23,8 +23,8 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->index->common = '首页';
-$lang->index->index  = '首页';
-$lang->index->ping   = '接口:同步session';
-$lang->index->latest = '最新动态';
+$lang->index->common = 'Index';
+$lang->index->index  = 'Index';
+$lang->index->ping   = 'API: update session';
+$lang->index->latest = 'Latest actions:';
 $lang->index->action = '%s, %s <i>%s</i> %s <strong>%s</strong>。';
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index efdd63b72b..0061326851 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The install module english file of ZenTaoMS.
+ * 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
@@ -21,91 +21,90 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->install->common  = '安装';
-$lang->install->next    = '下一步';
-$lang->install->pre     = '返回';
-$lang->install->reload  = '刷新';
-$lang->install->error   = '错误 ';
+$lang->install->common  = 'Install';
+$lang->install->next    = 'Next';
+$lang->install->pre     = 'Back';
+$lang->install->reload  = 'Reload';
+$lang->install->error   = 'Error ';
 
-$lang->install->start            = '开始安装';
-$lang->install->keepInstalling   = '继续安装当前版本';
-$lang->install->seeLatestRelease = '看看最新的版本';
-$lang->install->welcome          = '欢迎使用禅道项目管理软件！';
+$lang->install->start            = 'Start install';
+$lang->install->keepInstalling   = 'Keep install this version';
+$lang->install->seeLatestRelease = 'See the latest release.';
+$lang->install->welcome          = 'Welcome to use ZenTaoPMS.';
 $lang->install->desc             = <<<EOT
-禅道项目管理软件(ZenTaoPMS)是一款国产的，基于LGPL协议，开源免费的项目管理软件，它集产品管理、项目管理、测试管理于一体，同时还包含了事务管理、组织管理等诸多功能，是中小型企业项目管理的首选。
+ZenTaoPMS is an opensource project management software licensed under LGPL. It has product manage, project mange, testing mange features, also with organization manage and affair manage.
 
-禅道项目管理软件使用PHP + MySQL开发，基于自主的PHP开发框架──ZenTaoPHP而成。第三方开发者或者企业可以非常方便的开发插件或者进行定制。
+ZenTaoPMS is developped by PHH and mysql under the zentaophp framework developped by the same team. Through the framework, ZenTaoPMS can be customed and extended very easily.
 
-禅道项目管理软件由<strong class='red'><a href='http://www.cnezsoft.com' target='_blank'>青岛易软天创网络科技有限公司开发</a></strong>。
-禅道项目管理软件的官方支持网站：<a href='http://www.zentaoms.com' target='_blank'>http://www.zentaoms.com</a>
-官方技术支持QQ群：41408140
+ZenTaoPMS is developped by <strong class='red'><a href='http://www.cnezsoft.com' target='_blank'>Nature EasySoft Network Tecnology Co.ltd, QingDao, China</a></strong>。
+The official website of ZenTaoPMS is <a href='http://www.zentaoms.com' target='_blank'>http://www.zentaoms.com</a>
 
-您现在正在安装的版本是 <strong class='red'>%s</strong>。
+The version of current release is <strong class='red'>%s</strong>。
 EOT;
 
-$lang->install->newReleased= "<strong class='red'>提示</strong>：官网网站已有最新版本，为<strong class='red'>%s</strong>, 发布日期于 %s。";
-$lang->install->choice     = '您可以选择：';
-$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->newReleased= "<strong class='red'>Notice</strong>：There is a new version <strong class='red'>%s</strong>, released on %s。";
+$lang->install->choice     = 'You can ';
+$lang->install->checking   = 'System checking';
+$lang->install->ok         = 'OK(√)';
+$lang->install->fail       = 'Failed(×)';
+$lang->install->loaded     = 'Loaded';
+$lang->install->unloaded   = 'Not loaded';
+$lang->install->exists     = 'Exists ';
+$lang->install->notExists  = 'Not exists ';
+$lang->install->writable   = 'Writable ';
+$lang->install->notWritable= 'Not writable ';
+$lang->install->phpINI     = 'PHP ini file';
+$lang->install->checkItem  = 'Items';
+$lang->install->current    = 'Current';
+$lang->install->result     = 'Result';
+$lang->install->action     = 'How to fix';
 
-$lang->install->phpVersion = 'PHP版本';
-$lang->install->phpFail    = 'PHP版本必须大于5.2.0';
+$lang->install->phpVersion = 'PHP version';
+$lang->install->phpFail    = 'Must > 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->pdo          = 'PDO extension';
+$lang->install->pdoFail      = 'Edit the php.ini file to load PDO extsion.';
+$lang->install->pdoMySQL     = 'PDO_MySQL extension';
+$lang->install->pdoMySQLFail = 'Edit the php.ini file to load PDO_MySQL extsion.';
+$lang->install->tmpRoot      = 'Temp directory';
+$lang->install->dataRoot     = 'Upload directory.';
+$lang->install->mkdir        = '<p>Should creat the directory %s。<br /> Under linux, can try<br /> mkdir -p %s</p>';
+$lang->install->chmod        = 'Should change the permission of "%s".<br />Under linux, can try<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->dbHostNote = '如果localhost无法访问，尝试使用127.0.0.1';
-$lang->install->dbPort     = '服务器端口';
-$lang->install->dbUser     = '数据库用户名';
-$lang->install->dbPassword = '数据库密码';
-$lang->install->dbName     = 'PMS使用的库';
-$lang->install->dbPrefix   = '建表使用的前缀';
-$lang->install->createDB   = '自动创建数据库';
-$lang->install->clearDB    = '清空现有数据';
+$lang->install->settingDB    = 'Set databse';
+$lang->install->webRoot      = 'ZenTaoPMS path';
+$lang->install->requestType  = 'URL type';
+$lang->install->requestTypes['GET']       = 'GET';
+$lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO';
+$lang->install->dbHost     = 'Database host';
+$lang->install->dbHostNote = 'If localhost can connect, try 127.0.0.1';
+$lang->install->dbPort     = 'Host port';
+$lang->install->dbUser     = 'Database user';
+$lang->install->dbPassword = 'Database password';
+$lang->install->dbName     = 'Database name';
+$lang->install->dbPrefix   = 'Table prefix';
+$lang->install->createDB   = 'Auto create database';
+$lang->install->clearDB    = 'Clear data if database exists.';
 
-$lang->install->errorConnectDB     = '数据库连接失败 ';
-$lang->install->errorCreateDB      = '数据库创建失败';
-$lang->install->errorCreateTable   = '创建表失败';
+$lang->install->errorConnectDB     = 'Database connect failed.';
+$lang->install->errorCreateDB      = 'Database create failed.';
+$lang->install->errorCreateTable   = 'Table create failed.';
 
-$lang->install->setConfig  = '生成配置文件';
-$lang->install->key        = '配置项';
-$lang->install->value      = '值';
-$lang->install->saveConfig = '保存配置文件';
-$lang->install->save2File  = '<div class="a-center"><span class="fail">尝试写入配置文件，失败！</span></div>拷贝上面文本框中的内容，将其保存到 "<strong> %s </strong>"中。您以后还可继续修改此配置文件。';
-$lang->install->saved2File = '配置信息已经成功保存到" <strong>%s</strong> "中。您后面还可继续修改此文件。';
+$lang->install->setConfig  = 'Create config file';
+$lang->install->key        = 'Item';
+$lang->install->value      = 'Value';
+$lang->install->saveConfig = 'Save config';
+$lang->install->save2File  = '<div class="a-center"><span class="fail">Try to save the config auto, but failed.</span></div>Copy the text of the textareaand save to "<strong> %s </strong>".';
+$lang->install->saved2File = 'The config file has saved to "<strong>%s</strong> ".';
 $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->getPriv  = 'Set admin';
+$lang->install->company  = 'Company name';
+$lang->install->pms      = 'ZenTaoPMS domain';
+$lang->install->pmsNote  = 'The domain name or ip address of ZenTaoPMS, no http://';
+$lang->install->account  = 'Administrator';
+$lang->install->password = 'Admin password';
+$lang->install->errorEmptyPassword = "Can't be empty";
 
-$lang->install->success = "安装成功！请删除install.php，登录禅道管理系统，设置用户及分组！";
+$lang->install->success = "Success installed, please login into ZenTaoPMS, create groups and grant priviledges.";
 
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 39fdfaa14c..54c8dc0ac0 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The misc module english file of ZenTaoMS.
+ * The misc 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
@@ -18,52 +18,52 @@
  * @copyright   Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
  * @package     misc
- * @version     $Id: english.php 824 2010-05-02 15:32:06Z wwccss $
+ * @version     $Id: English.php 824 2010-05-02 15:32:06Z wwccss $
  * @link        http://www.zentaoms.com
  */
-$lang->misc->common  = '杂项';
-$lang->misc->ping    = '防超时';
+$lang->misc->common  = 'Misc';
+$lang->misc->ping    = 'Keep session';
 
-$lang->misc->zentao->version           = '版本%s';
-$lang->misc->zentao->labels['about']   = '关于禅道';
-$lang->misc->zentao->labels['support'] = '技术支持';
-$lang->misc->zentao->labels['cowin']   = '帮助我们';
-$lang->misc->zentao->labels['service'] = '服务列表';
+$lang->misc->zentao->version           = 'Version %s';
+$lang->misc->zentao->labels['about']   = 'About';
+$lang->misc->zentao->labels['support'] = 'Support';
+$lang->misc->zentao->labels['cowin']   = 'Help us';
+$lang->misc->zentao->labels['service'] = 'Services';
 
-$lang->misc->zentao->about['official']     = "官方网站";
-$lang->misc->zentao->about['project']      = "项目进展";
-$lang->misc->zentao->about['preview']      = "最新预览";
-$lang->misc->zentao->about['changelog']    = "版本历史";
-$lang->misc->zentao->about['license']      = "授权协议";
-$lang->misc->zentao->about['contributors'] = "贡献者";
-$lang->misc->zentao->about['thirdparty']   = "第三方代码";
-$lang->misc->zentao->about['sourcecode']   = "源代码";
+$lang->misc->zentao->about['official']     = "Official site";
+$lang->misc->zentao->about['project']      = "Project";
+$lang->misc->zentao->about['preview']      = "Demo";
+$lang->misc->zentao->about['changelog']    = "Change log";
+$lang->misc->zentao->about['license']      = "License";
+$lang->misc->zentao->about['contributors'] = "Contributors";
+$lang->misc->zentao->about['thirdparty']   = "Thirdparty";
+$lang->misc->zentao->about['sourcecode']   = "Source code";
 
-$lang->misc->zentao->support['manual']     = "用户手册";
-$lang->misc->zentao->support['faq']        = "常见问题";
-$lang->misc->zentao->support['forum']      = "支持论坛";
-$lang->misc->zentao->support['qqgroup']    = "官方QQ群";
-$lang->misc->zentao->support['howask']     = "如何提问";
-$lang->misc->zentao->support['vip']        = "商业支持";
+$lang->misc->zentao->support['manual']     = "Manual";
+$lang->misc->zentao->support['faq']        = "FAQ";
+$lang->misc->zentao->support['forum']      = "Forum";
+$lang->misc->zentao->support['qqgroup']    = "QQ Grup";
+$lang->misc->zentao->support['howask']     = "How to ask";
+$lang->misc->zentao->support['vip']        = "Business";
 
-$lang->misc->zentao->cowin['reportbug']    = "汇报Bug";
-$lang->misc->zentao->cowin['feedback']     = "反馈需求";
-$lang->misc->zentao->cowin['devcode']      = "提交代码";
-$lang->misc->zentao->cowin['doc']          = "完善文档";
-$lang->misc->zentao->cowin['recommend']    = "推荐给朋友";
-$lang->misc->zentao->cowin['addlink']      = "添加友情链接";
-$lang->misc->zentao->cowin['shop']         = "逛逛我们的商店";
-$lang->misc->zentao->cowin['donate']       = "捐助我们";
-$lang->misc->zentao->cowin['cowinmore']    = "更多方式...";
+$lang->misc->zentao->cowin['reportbug']    = "Report bug";
+$lang->misc->zentao->cowin['feedback']     = "Feedback feature";
+$lang->misc->zentao->cowin['devcode']      = "Commit code";
+$lang->misc->zentao->cowin['doc']          = "Write doc";
+$lang->misc->zentao->cowin['recommend']    = "Recommend";
+$lang->misc->zentao->cowin['addlink']      = "Add link";
+$lang->misc->zentao->cowin['shop']         = "Shop";
+$lang->misc->zentao->cowin['donate']       = "Donate";
+$lang->misc->zentao->cowin['cowinmore']    = "More...";
 
-$lang->misc->zentao->service['install']    = '禅道安装服务';
-$lang->misc->zentao->service['fixissue']   = '禅道问题解决';
-$lang->misc->zentao->service['zentaotrain']= '禅道使用培训';
-$lang->misc->zentao->service['idc']        = '禅道在线托管';
-$lang->misc->zentao->service['custom']     = '禅道定制开发';
-$lang->misc->zentao->service['review']     = '禅道点评服务';
-$lang->misc->zentao->service['scrumtrain'] = 'scrum培训';
-$lang->misc->zentao->service['fwtrain']    = '禅道PHP框架培训';
-$lang->misc->zentao->service['servicemore']= '更多服务...';
+$lang->misc->zentao->service['install']    = 'Install service';
+$lang->misc->zentao->service['fixissue']   = 'Issue support';
+$lang->misc->zentao->service['zentaotrain']= 'ZenTao training';
+$lang->misc->zentao->service['idc']        = 'ZenTao online';
+$lang->misc->zentao->service['custom']     = 'custom develop';
+$lang->misc->zentao->service['review']     = 'ZenTao review';
+$lang->misc->zentao->service['scrumtrain'] = 'Scrum training';
+$lang->misc->zentao->service['fwtrain']    = 'ZenTaoPHP training';
+$lang->misc->zentao->service['servicemore']= 'More...';
 
-$lang->misc->copyright = "版权所有 &copy;2009-2010 <a href='http://www.cnezsoft.com' target='_blank'>青岛易软天创网络科技有限公司</a>";
+$lang->misc->copyright = "Copyright &copy;2009-2010 <a href='http://www.cnezsoft.com' target='_blank'>Nature EasySoft Network Tecnology Co.ltd, QingDao, China</a>";
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index f6ed24338f..b555f7666d 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -1,13 +1,13 @@
 <?php
-$lang->my->common = '我的地盘';
+$lang->my->common = 'Dashboard';
 
 /* 方法列表。*/
-$lang->my->index       = '首页';
-$lang->my->todo        = '我的TODO';
-$lang->my->task        = '我的任务';
-$lang->my->bug         = '我的Bug';
-$lang->my->story       = '我的需求';
-$lang->my->project     = '我的项目';
-$lang->my->team        = '我的团队';
-$lang->my->profile     = '我的档案';
-$lang->my->editProfile = '更新信息';
+$lang->my->index       = 'Index';
+$lang->my->todo        = 'Todo';
+$lang->my->task        = 'Task';
+$lang->my->bug         = 'Bug';
+$lang->my->story       = 'Story';
+$lang->my->project     = 'Project';
+$lang->my->team        = 'Team';
+$lang->my->profile     = 'Profile';
+$lang->my->editProfile = 'Edit profile';
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 395cc3936a..c0a4e3ee27 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The product module english file of ZenTaoMS.
+ * 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
@@ -21,40 +21,47 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->product->common = '产品视图';
-$lang->product->index  = "产品首页";
-$lang->product->browse = "浏览产品";
-$lang->product->view   = "产品信息";
-$lang->product->edit   = "编辑产品";
-$lang->product->create = "新增产品";
-$lang->product->read   = "产品详情";
-$lang->product->edit   = "编辑产品";
-$lang->product->delete = "删除产品";
+$lang->product->common = 'Product';
+$lang->product->index  = "Index";
+$lang->product->browse = "Browse";
+$lang->product->view   = "Info";
+$lang->product->edit   = "Edit";
+$lang->product->create = "Create";
+$lang->product->delete = "Delete";
 
-$lang->product->roadmap   = '路线图';
+$lang->product->roadmap   = 'Roadmap';
+$lang->product->doc       = 'Coc';
 
-$lang->product->selectProduct   = "请选择产品";
-$lang->product->saveButton      = " 保存 (S) ";
-$lang->product->confirmDelete   = " 您确定删除该产品吗？";
-$lang->product->ajaxGetProjects = "接口:项目列表";
-$lang->product->ajaxGetPlans    = "接口:计划列表";
+$lang->product->selectProduct   = "Select product";
+$lang->product->saveButton      = " Save (S) ";
+$lang->product->confirmDelete   = " Are you sure to delete this product?";
+$lang->product->ajaxGetProjects = "API: projects of product";
+$lang->product->ajaxGetPlans    = "API: plans of product";
 
-$lang->product->errorFormat    = '产品数据格式不正确';
-$lang->product->errorEmptyName = '产品名称不能为空';
-$lang->product->errorEmptyCode = '产品代号不能为空';
+$lang->product->errorFormat    = 'Error format.';
+$lang->product->errorEmptyName = 'Name can not be empty.';
+$lang->product->errorEmptyCode = 'Code can not be empty';
+$lang->product->accessDenied   = 'Access to this product denined.';
 
-$lang->product->id      = '编号';
-$lang->product->company = '所属公司';
-$lang->product->name    = '产品名称';
-$lang->product->code    = '产品代号';
-$lang->product->order   = '排序';
-$lang->product->status  = '状态';
-$lang->product->desc    = '产品描述';
+$lang->product->id        = 'ID';
+$lang->product->company   = 'Company';
+$lang->product->name      = 'Name';
+$lang->product->code      = 'Code';
+$lang->product->order     = 'Order';
+$lang->product->status    = 'Status';
+$lang->product->desc      = 'Desc';
+$lang->product->bugOwner  = 'Bug Owner';
+$lang->product->acl       = 'Access limitation';
+$lang->product->whitelist = 'Whitelist';
 
-$lang->product->moduleStory = '按模块浏览';
-$lang->product->searchStory = '搜索';
-$lang->product->allStory    = '全部需求';
+$lang->product->moduleStory = 'By module';
+$lang->product->searchStory = 'By search';
+$lang->product->allStory    = 'All story';
 
 $lang->product->statusList['']       = '';
-$lang->product->statusList['normal'] = '正常';
-$lang->product->statusList['closed'] = '结束';
+$lang->product->statusList['normal'] = 'Normal';
+$lang->product->statusList['closed'] = 'Closed';
+
+$lang->product->aclList['open']    = 'Default(Having product module prividge, can visit this product)';
+$lang->product->aclList['private'] = 'Private(Only project team members can visit)';
+$lang->product->aclList['custom']  = 'Whitelist(Project team members and who belongs to the whilelist groups can visit)';
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php
index eecdea26fb..812114db71 100644
--- a/module/productplan/lang/en.php
+++ b/module/productplan/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The productplan module english file of ZenTaoMS.
+ * 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
@@ -21,24 +21,24 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$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->common    = 'Plan';
+$lang->productplan->browse    = "Browse";
+$lang->productplan->index     = "Index";
+$lang->productplan->create    = "Create";
+$lang->productplan->edit      = "Edit";
+$lang->productplan->delete    = "Delete";
+$lang->productplan->view      = "Info";
+$lang->productplan->linkStory       = "Link story";
+$lang->productplan->unlinkStory     = "Remove story";
+$lang->productplan->linkedStories   = 'Stories linked';
+$lang->productplan->unlinkedStories = 'Stories unlinked';
 
-$lang->productplan->confirmDelete      = "您确认删除该计划吗？";
-$lang->productplan->confirmUnlinkStory = "您确认移除该需求吗？";
+$lang->productplan->confirmDelete      = "Are you sure to delete this plan?";
+$lang->productplan->confirmUnlinkStory = "Are you sure to remove this story?";
 
-$lang->productplan->id      = '编号';
-$lang->productplan->product = '产品';
-$lang->productplan->title   = '名称';
-$lang->productplan->desc    = '描述';
-$lang->productplan->begin   = '开始日期';
-$lang->productplan->end     = '结束日期';
+$lang->productplan->id      = 'ID';
+$lang->productplan->product = 'Product';
+$lang->productplan->title   = 'Title';
+$lang->productplan->desc    = 'Desc';
+$lang->productplan->begin   = 'Begin';
+$lang->productplan->end     = 'End';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index f3a69885e7..1fecfbdd03 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The project module english file of ZenTaoMS.
+ * 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
@@ -21,108 +21,109 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-/* 字段列表。*/
-$lang->project->common       = '项目视图';
-$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->acl          = '访问控制';
-$lang->project->teamname     = '团队名称';
-$lang->project->products     = '相关产品';
-$lang->project->childProjects= '子项目';
-$lang->project->whitelist    = '分组白名单';
+/* 字段列表.*/
+$lang->project->common       = 'Project';
+$lang->project->id           = 'ID';
+$lang->project->company      = 'Company';
+$lang->project->iscat        = 'Is category';
+$lang->project->type         = 'Type';
+$lang->project->parent       = 'Parent';
+$lang->project->name         = 'Name';
+$lang->project->code         = 'Code';
+$lang->project->begin        = 'Begin';
+$lang->project->end          = 'End';
+$lang->project->status       = 'Status';
+$lang->project->statge       = 'Statge';
+$lang->project->pri          = 'Priority';
+$lang->project->desc         = 'Desc';
+$lang->project->goal         = 'Goal';
+$lang->project->openedBy     = 'Opened by';
+$lang->project->openedDate   = 'Opened date';
+$lang->project->closedBy     = 'Closed by';
+$lang->project->closedDate   = 'Closed date';
+$lang->project->canceledBy   = 'Canceled by';
+$lang->project->canceledDate = 'Canceled date';
+$lang->project->PO           = 'Product owner';
+$lang->project->PM           = 'Project manager';
+$lang->project->QM           = 'QA manager';
+$lang->project->acl          = 'Access limitation';
+$lang->project->teamname     = 'Team name';
+$lang->project->products     = 'Products';
+$lang->project->childProjects= 'Child projects';
+$lang->project->whitelist    = 'Whitelist';
 
-$lang->team->account     = '用户';
-$lang->team->role        = '角色';
-$lang->team->joinDate    = '加盟日';
-$lang->team->workingHour = '工时/天';
+$lang->team->account     = 'Account';
+$lang->team->role        = 'Role';
+$lang->team->joinDate    = 'Join date';
+$lang->team->workingHour = 'Wokring/Day';
 
-/* 字段取值列表。*/
+/* 字段取值列表.*/
 $lang->project->statusList['']      = '';
-$lang->project->statusList['wait']  = '未开始';
-$lang->project->statusList['doing'] = '进行中';
-$lang->project->statusList['done']  = '已完成';
+$lang->project->statusList['wait']  = 'Waitting';
+$lang->project->statusList['doing'] = 'Doing';
+$lang->project->statusList['done']  = 'Done';
 
-$lang->project->aclList['open']    = '默认设置(有项目视图权限，即可访问)';
-$lang->project->aclList['private'] = '私有项目(只有项目团队成员才能访问)';
-$lang->project->aclList['custom']  = '自定义白名单(团队成员和白名单的成员可以访问)';
+$lang->project->aclList['open']    = 'Default(Having the priviledge of project module can visit this project)';
+$lang->project->aclList['private'] = 'Private(Only team members can visit)';
+$lang->project->aclList['custom']  = 'Whitelist(Team members and who belongs to the whielist grups can visit)';
 
-/* 方法列表。*/
-$lang->project->index          = "项目首页";
-$lang->project->task           = '任务列表';
-$lang->project->groupTask      = '分组浏览任务';
-$lang->project->story          = '需求列表';
-$lang->project->bug            = 'Bug列表';
-$lang->project->build          = 'Build列表';
-$lang->project->burn           = '燃尽图';
-$lang->project->computeBurn    = '更新燃尽图';
-$lang->project->burnData       = '燃尽图数据';
-$lang->project->team           = '团队成员';
-$lang->project->manageProducts = '关联产品';
-$lang->project->linkStory      = '关联需求';
-$lang->project->view           = "基本信息";
-$lang->project->create         = "添加项目";
-$lang->project->delete         = "删除项目";
-$lang->project->browse         = "浏览项目";
-$lang->project->edit           = "编辑项目";
-$lang->project->manageMembers  = '团队管理';
-$lang->project->unlinkMember   = '移除成员';
-$lang->project->unlinkStory    = '移除需求';
-$lang->project->importTask     = '导入之前未完';
+/* 方法列表.*/
+$lang->project->index          = "Index";
+$lang->project->task           = 'Task';
+$lang->project->groupTask      = 'View task by group';
+$lang->project->story          = 'Story';
+$lang->project->bug            = 'Bug';
+$lang->project->build          = 'Build';
+$lang->project->burn           = 'Burndown chart';
+$lang->project->computeBurn    = 'Update burndown';
+$lang->project->burnData       = 'Burndown data';
+$lang->project->team           = 'Team';
+$lang->project->doc            = 'Doc';
+$lang->project->manageProducts = 'Link product';
+$lang->project->linkStory      = 'Link story';
+$lang->project->view           = "Info";
+$lang->project->create         = "Add";
+$lang->project->delete         = "Delete";
+$lang->project->browse         = "Browse";
+$lang->project->edit           = "Edit";
+$lang->project->manageMembers  = 'Manage team members';
+$lang->project->unlinkMember   = 'Remove member';
+$lang->project->unlinkStory    = 'Remove story';
+$lang->project->importTask     = 'Import tasks undone';
 
-/* 分组浏览。*/
-$lang->project->listTask            = '列表方式';
-$lang->project->groupTaskByStory    = '需求分组';
-$lang->project->groupTaskByStatus   = '状态分组';
-$lang->project->groupTaskByPri      = '优先级分组';
-$lang->project->groupTaskByOwner    = '指派给分组';
-$lang->project->groupTaskByEstimate = '预计分组';
-$lang->project->groupTaskByConsumed = '已消耗分组';
-$lang->project->groupTaskByLeft     = '剩余分组';
-$lang->project->groupTaskByType     = '类型分组';
-$lang->project->groupTaskByDeadline = '截止分组';
-$lang->project->listTaskNeedConfrim = '需求变动';
+/* 分组浏览.*/
+$lang->project->listTask            = 'List';
+$lang->project->groupTaskByStory    = 'By story';
+$lang->project->groupTaskByStatus   = 'By status';
+$lang->project->groupTaskByPri      = 'By priority';
+$lang->project->groupTaskByOwner    = 'By owner';
+$lang->project->groupTaskByEstimate = 'By estimate';
+$lang->project->groupTaskByConsumed = 'By consumed';
+$lang->project->groupTaskByLeft     = 'By left';
+$lang->project->groupTaskByType     = 'By type';
+$lang->project->groupTaskByDeadline = 'BY deadline';
+$lang->project->listTaskNeedConfrim = 'Story changed';
 
-/* 页面提示。*/
-$lang->project->selectProject  = "请选择项目";
-$lang->project->beginAndEnd    = '起止时间';
-$lang->project->lblStats       = '工时统计';
-$lang->project->stats          = '总共预计『%s』工时<br />已经消耗『%s』工时<br />预计剩余『%s』工时';
-$lang->project->oneLineStats   = "项目『%s』, 代号为『%s』, 相关产品为『%s』，『%s』开始，『%s』结束，总预计『%s』工时，已消耗『%s』工时，预计剩余『%s』工时。";
-$lang->project->storySummary   = "共『%s』个需求，预计『%s』个工时。";
-$lang->project->wbs            = "分解任务";
-$lang->project->largeBurnChart = '点击查看大图';
+/* 页面提示.*/
+$lang->project->selectProject  = "Select project";
+$lang->project->beginAndEnd    = 'Begian and end';
+$lang->project->lblStats       = 'Stats';
+$lang->project->stats          = 'Total estimate is『%s』hours,<br />confused『%s』hours<br />left『%s』hours';
+$lang->project->oneLineStats   = "Project『%s』, code is『%s』, products is『%s』,begin from『%s』to 『%s』,total estimate『%s』hours,consumed『%s』hours,left『%s』hours.";
+$lang->project->storySummary   = "Total 『%s』stories, estimate『%s』hours.";
+$lang->project->wbs            = "WBS";
+$lang->project->largeBurnChart = 'View large';
 
-/* 交互提示。*/
-$lang->project->confirmDelete         = '您确定删除项目[%s]吗？';
-$lang->project->confirmUnlinkMember   = '您确定从该项目中移除该用户吗？';
-$lang->project->confirmUnlinkStory    = '您确定从该项目中移除该需求吗？';
-$lang->project->errorNoLinkedProducts = '该项目没有关联的产品，系统将转到产品关联页面';
-$lang->project->accessDenied          = '您无权访问该项目！';
+/* 交互提示.*/
+$lang->project->confirmDelete         = 'Are you sure to delete project [%s]?';
+$lang->project->confirmUnlinkMember   = 'Are you sure to remove this user from this project?';
+$lang->project->confirmUnlinkStory    = 'Are you sure to remove the story from this project?';
+$lang->project->errorNoLinkedProducts = 'Thers is no linked products, go to the link page.';
+$lang->project->accessDenied          = 'Access to this project denied.';
 
-/* 统计。*/
-$lang->project->charts->burn->graph->caption      = "燃尽图";
-$lang->project->charts->burn->graph->xAxisName    = "日期";
+/* 统计.*/
+$lang->project->charts->burn->graph->caption      = "Burndown chart";
+$lang->project->charts->burn->graph->xAxisName    = "Date";
 $lang->project->charts->burn->graph->yAxisName    = "HOUR";
 $lang->project->charts->burn->graph->baseFontSize = 12;
 $lang->project->charts->burn->graph->formatNumber = 0;
diff --git a/module/qa/lang/en.php b/module/qa/lang/en.php
index 6787dfb274..b41cd1c545 100644
--- a/module/qa/lang/en.php
+++ b/module/qa/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The qa module english file of ZenTaoMS.
+ * 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
@@ -21,5 +21,5 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->qa->common  = 'QA视图';
-$lang->qa->index   = "QA首页";
+$lang->qa->common  = 'QA';
+$lang->qa->index   = "Index";
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 60c5a696c3..b04252411b 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The release module english 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,18 +21,18 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->release->common    = '发布';
-$lang->release->create    = "创建发布";
-$lang->release->edit      = "编辑发布";
-$lang->release->delete    = "删除发布";
-$lang->release->view      = "发布详情";
-$lang->release->browse    = "浏览发布";
+$lang->release->common    = 'Release';
+$lang->release->create    = "Create";
+$lang->release->edit      = "Edit";
+$lang->release->delete    = "Delete";
+$lang->release->view      = "Info";
+$lang->release->browse    = "Browse";
 
-$lang->release->confirmDelete = "您确认删除该release吗？";
+$lang->release->confirmDelete = "Are sure to delete this release?";
 
 $lang->release->id        = 'ID';
-$lang->release->product   = '产品';
+$lang->release->product   = 'Product';
 $lang->release->build     = 'Build';
-$lang->release->name      = '发布名称';
-$lang->release->date      = '发布日期';
-$lang->release->desc      = '描述';
+$lang->release->name      = 'Name';
+$lang->release->date      = 'Date';
+$lang->release->desc      = 'Desc';
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index 4a0aaeb90c..729875499e 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The report module english file of ZenTaoMS.
+ * 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
@@ -21,11 +21,11 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->report->common     = '报表';
-$lang->report->item       = '条目';
-$lang->report->value      = '值';
-$lang->report->percent    = '百分比';
-$lang->report->undefined  = '未设定';
+$lang->report->common     = 'Report';
+$lang->report->item       = 'Item';
+$lang->report->value      = 'Value';
+$lang->report->percent    = 'Percent';
+$lang->report->undefined  = 'Undefined';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 971286b735..cfa8dca5bd 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The search module english file of ZenTaoMS.
+ * 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
@@ -21,19 +21,19 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->search->common        = '搜索';
-$lang->search->reset         = '重置';
-$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->saveQuery     = '保存查询';
-$lang->search->deleteQuery   = '删除查询';
-$lang->search->setQueryTitle = '请输入查询标题（保存之前请先查询）：';
+$lang->search->common        = 'Search';
+$lang->search->reset         = 'Reset';
+$lang->search->more          = 'More';
+$lang->search->lite          = 'Lite';
+$lang->search->saveQuery     = 'Save';
+$lang->search->myQuery       = 'My queries';
+$lang->search->group1        = '1';
+$lang->search->group2        = '2';
+$lang->search->buildForm     = 'Search form';
+$lang->search->buildQuery    = 'Execut query';
+$lang->search->saveQuery     = 'Save query';
+$lang->search->deleteQuery   = 'Delete query';
+$lang->search->setQueryTitle = 'Please input the title（execute searching before save）：';
 
 $lang->search->operators['=']       = '=';
 $lang->search->operators['!=']      = '!=';
@@ -41,14 +41,14 @@ $lang->search->operators['>']       = '>';
 $lang->search->operators['>=']      = '>=';
 $lang->search->operators['<']       = '<';
 $lang->search->operators['<=']      = '<=';
-$lang->search->operators['include'] = '包含';
+$lang->search->operators['include'] = 'include';
 
-$lang->search->andor['and']         = '并且';
-$lang->search->andor['or']          = '或者';
+$lang->search->andor['and']         = 'And';
+$lang->search->andor['or']          = 'Or';
 
-$lang->search->null = '空';
+$lang->search->null = 'Null';
 
-$lang->userquery->title     = '查询标题';
-$lang->userquery->myQueries = '我的查询';
-$lang->userquery->execut    = '执行';
-$lang->userquery->delete    = '删除';
+$lang->userquery->title     = 'Title';
+$lang->userquery->myQueries = 'My queries';
+$lang->userquery->execut    = 'Execute';
+$lang->userquery->delete    = 'Delete';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 6e356e41e6..45a611e5fa 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The story module english 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,94 +21,94 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->story->browse    = "需求列表";
-$lang->story->create    = "新增需求";
-$lang->story->change    = "变更";
-$lang->story->changed   = '需求变更';
-$lang->story->review    = '评审';
-$lang->story->edit      = "编辑需求";
-$lang->story->close     = '关闭';
-$lang->story->activate  = '激活';
-$lang->story->delete    = "删除需求";
-$lang->story->view      = "需求详情";
-$lang->story->tasks     = "相关任务";
-$lang->story->taskCount = '任务数';
+$lang->story->browse    = "Browse";
+$lang->story->create    = "Create";
+$lang->story->change    = "Change";
+$lang->story->changed   = 'Changed';
+$lang->story->review    = 'Review';
+$lang->story->edit      = "Edit";
+$lang->story->close     = 'Clsoe';
+$lang->story->activate  = 'Activate';
+$lang->story->delete    = "Delete";
+$lang->story->view      = "Info";
+$lang->story->tasks     = "Tasks";
+$lang->story->taskCount = 'Tasks count';
 $lang->story->bugs      = "Bug";
-$lang->story->linkStory = '关联需求';
+$lang->story->linkStory = 'Related story';
 
-$lang->story->common         = '需求';
-$lang->story->id             = '编号';
-$lang->story->product        = '所属产品';
-$lang->story->module         = '所属模块';
-$lang->story->release        = '发布计划';
-$lang->story->bug            = '相关bug';
-$lang->story->title          = '需求名称';
-$lang->story->spec           = '需求描述';
-$lang->story->type           = '需求类型 ';
-$lang->story->pri            = '优先级';
-$lang->story->estimate       = '预计工时';
-$lang->story->estimateAB     = '预计';
-$lang->story->status         = '当前状态';
-$lang->story->stage          = '所处阶段';
-$lang->story->stageAB        = '阶段';
-$lang->story->mailto         = '抄送给';
-$lang->story->openedBy       = '由谁创建';
-$lang->story->openedDate     = '创建日期';
-$lang->story->assignedTo     = '指派给';
-$lang->story->assignedDate   = '指派日期';
-$lang->story->lastEditedBy   = '最后修改';
-$lang->story->lastEditedDate = '最后修改日期';
-$lang->story->lastEdited     = '最后修改';
-$lang->story->closedBy       = '由谁关闭';
-$lang->story->closedDate     = '关闭日期';
-$lang->story->closedReason   = '关闭原因';
-$lang->story->rejectedReason = '拒绝原因';
-$lang->story->reviewedBy     = '由谁评审';
-$lang->story->reviewedDate   = '评审时间';
-$lang->story->version        = '版本号';
-$lang->story->project        = '所属项目';
-$lang->story->plan           = '所属计划';
-$lang->story->planAB         = '计划';
-$lang->story->comment        = '备注';
-$lang->story->linkStories    = '相关需求';
-$lang->story->childStories   = '细分需求';
-$lang->story->duplicateStory = '重复需求';
-$lang->story->reviewResult   = '评审结果';
-$lang->story->preVersion     = '之前版本';
-$lang->story->keywords       = '关键词';
+$lang->story->common         = 'Story';
+$lang->story->id             = 'ID';
+$lang->story->product        = 'Product';
+$lang->story->module         = 'Module';
+$lang->story->release        = 'Release';
+$lang->story->bug            = 'Related Bug';
+$lang->story->title          = 'Title';
+$lang->story->spec           = 'Spec';
+$lang->story->type           = 'Type ';
+$lang->story->pri            = 'Priority';
+$lang->story->estimate       = 'Estimate';
+$lang->story->estimateAB     = 'Estimate';
+$lang->story->status         = 'Status';
+$lang->story->stage          = 'Stage';
+$lang->story->stageAB        = 'Stage';
+$lang->story->mailto         = 'Mailto';
+$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     = 'Last edited';
+$lang->story->closedBy       = 'Closed by';
+$lang->story->closedDate     = 'Closed date';
+$lang->story->closedReason   = 'Closed reason';
+$lang->story->rejectedReason = 'Reject 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->planAB         = 'Plan';
+$lang->story->comment        = 'Comment';
+$lang->story->linkStories    = 'Related story';
+$lang->story->childStories   = 'Child story';
+$lang->story->duplicateStory = 'Duplicate story';
+$lang->story->reviewResult   = 'Reviewed result';
+$lang->story->preVersion     = 'Pre version';
+$lang->story->keywords       = 'Keyword';
 
 $lang->story->statusList['']          = '';
-$lang->story->statusList['draft']     = '草稿';
-$lang->story->statusList['active']    = '激活';
-$lang->story->statusList['closed']    = '已关闭';
-$lang->story->statusList['changed']   = '已变更';
+$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->stageList['wait']       = 'Waitting';
+$lang->story->stageList['planned']    = 'Planned';
+$lang->story->stageList['projected']  = 'Projected';
+$lang->story->stageList['developing'] = 'Developing';
+$lang->story->stageList['developed']  = 'Developed';
+$lang->story->stageList['testing']    = 'Testing';
+$lang->story->stageList['tested']     = 'Tested';
+$lang->story->stageList['verified']   = 'Verified';
+$lang->story->stageList['released']   = '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['done']       = 'Done';
+$lang->story->reasonList['subdivided'] = 'Subdivided';
+$lang->story->reasonList['duplicate']  = 'Duplicate';
+$lang->story->reasonList['postponed']  = 'Postponed';
+$lang->story->reasonList['willnotdo']  = "Won't do";
+$lang->story->reasonList['cancel']     = 'Canceld';
+$lang->story->reasonList['bydesign']   = 'By design';
 //$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->reviewResultList['pass']   = 'Pss';
+$lang->story->reviewResultList['revert'] = 'Revert';
+$lang->story->reviewResultList['clarify']= 'Clarify';
+$lang->story->reviewResultList['reject'] = 'Reject';
 
 $lang->story->priList[]   = '';
 $lang->story->priList[3]  = '3';
@@ -116,41 +116,41 @@ $lang->story->priList[1]  = '1';
 $lang->story->priList[2]  = '2';
 $lang->story->priList[4]  = '4';
 
-$lang->story->legendBasicInfo      = '基本信息';
-$lang->story->legendLifeTime       = '需求的一生';
-$lang->story->legendRelated        = '相关信息';
-$lang->story->legendMailto         = '抄送给';
-$lang->story->legendAttatch        = '附件';
-$lang->story->legendProjectAndTask = '项目任务';
-$lang->story->legendLinkStories    = '相关需求';
-$lang->story->legendChildStories   = '细分需求';
-$lang->story->legendSpec           = '需求描述';
-$lang->story->legendHistory        = '历史记录';
-$lang->story->legendVersion        = '历史版本';
-$lang->story->legendMisc           = '其他相关';
+$lang->story->legendBasicInfo      = 'Basic info';
+$lang->story->legendLifeTime       = 'Life time';
+$lang->story->legendRelated        = 'Related info';
+$lang->story->legendMailto         = 'Maitto';
+$lang->story->legendAttatch        = 'Files';
+$lang->story->legendProjectAndTask = 'Project & task';
+$lang->story->legendLinkStories    = 'Related story';
+$lang->story->legendChildStories   = 'Child story';
+$lang->story->legendSpec           = 'Spec';
+$lang->story->legendHistory        = 'History';
+$lang->story->legendVersion        = 'Versions';
+$lang->story->legendMisc           = 'Misc';
 
-$lang->story->lblChange            = '变更需求';
-$lang->story->lblReview            = '评审需求';
-$lang->story->lblActivate          = '激活需求';
-$lang->story->lblClose             = '关闭需求';
+$lang->story->lblChange            = 'Change';
+$lang->story->lblReview            = 'Review';
+$lang->story->lblActivate          = 'Activate';
+$lang->story->lblClose             = 'Close';
 
-$lang->story->affectedProjects     = '影响的项目';
-$lang->story->affectedBugs         = '影响的Bug';
-$lang->story->affectedCases        = '影响的用例';
+$lang->story->affectedProjects     = 'Affected projects';
+$lang->story->affectedBugs         = 'Affected bugs';
+$lang->story->affectedCases        = 'Affected cases';
 
-$lang->story->specTemplate          = "建议参考的模板：作为一名<<i class='red'>某种类型的用户</i>>，我希望<<i class='red'>达成某些目的</i>>，这样可以<<i class='red'>开发的价值</i>>。";
-$lang->story->needNotReview         = '不需要评审';
-$lang->story->confirmDelete         = "您确认删除该需求吗?";
-$lang->story->errorFormat           = '需求数据有误';
-$lang->story->errorEmptyTitle       = '标题不能为空';
-$lang->story->mustChooseResult      = '必须选择评审结果';
-$lang->story->mustChoosePreVersion  = '必须选择回溯的版本';
-$lang->story->ajaxGetProjectStories = '接口:获取项目需求列表';
-$lang->story->ajaxGetProductStories = '接口:获取产品需求列表';
+$lang->story->specTemplate          = "Recommend template:：As <<i class='red'>a type of user</i>>,I want <<i class='red'>some goals</i>>,so that <<i class='red'>some reason</i>>.";
+$lang->story->needNotReview         = "needn't review";
+$lang->story->confirmDelete         = "Are you sure to delete this story?";
+$lang->story->errorFormat           = 'Error format';
+$lang->story->errorEmptyTitle       = "Title can't be empty";
+$lang->story->mustChooseResult      = 'Must choose s result';
+$lang->story->mustChoosePreVersion  = 'Must select an version to revert';
+$lang->story->ajaxGetProjectStories = 'API:Project stories';
+$lang->story->ajaxGetProductStories = 'API:Product stories';
 
-$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);
-$lang->story->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 关联到计划 <strong>$extra</strong>。'); 
-$lang->story->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 从计划 <strong>$extra</strong> 移除。'); 
-$lang->story->action->linked2project      = array('main' => '$date, 由 <strong>$actor</strong> 关联到项目 <strong>$extra</strong>。'); 
-$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 从项目 <strong>$extra</strong> 移除。'); 
+$lang->story->action->reviewed            = array('main' => '$date, Reviewed by <strong>$actor</strong>, result is <strong>$extra</strong>.', 'extra' => $lang->story->reviewResultList);
+$lang->story->action->closed              = array('main' => '$date, Closed by <strong>$actor</strong>, reason is <strong>$extra</strong>.', 'extra' => $lang->story->reasonList);
+$lang->story->action->linked2plan         = array('main' => '$date, Linked to plan <strong>$extra</strong> by <strong>$actor</strong>.'); 
+$lang->story->action->unlinkedfromplan    = array('main' => '$date, Removed from <stong>$extra></strong> by <strong>$actor</strong>'); 
+$lang->story->action->linked2project      = array('main' => '$date, Linked to project <strong>$extra</strong> by <strong>$actor</strong>.'); 
+$lang->story->action->unlinkedfromproject = array('main' => '$date, Removed from project <strontg>$extra</strong> by <strong>$actor</strong>.'); 
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 1ae52f16fa..e6873f0808 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The task module english file of ZenTaoMS.
+ * 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
@@ -21,56 +21,56 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->task->index     = "任务一览";
-$lang->task->create    = "新增任务";
-$lang->task->import    = "导入之前未完任务";
-$lang->task->edit      = "更新任务";
-$lang->task->delete    = "删除任务";
-$lang->task->view      = "查看任务";
-$lang->task->logEfforts= "记录工时";
-$lang->task->start     = "开始任务";
-$lang->task->complete  = "完成任务";
-$lang->task->close     = "关闭任务";
-$lang->task->cancel    = "取消任务";
-$lang->task->activate  = "激活任务";
-$lang->task->confirmStoryChange = "确认需求变动";
+$lang->task->index     = "Index";
+$lang->task->create    = "Create";
+$lang->task->import    = "Import undone";
+$lang->task->edit      = "Update";
+$lang->task->delete    = "Delete";
+$lang->task->view      = "Info";
+$lang->task->logEfforts= "Efforts";
+$lang->task->start     = "Start";
+$lang->task->complete  = "Complete";
+$lang->task->close     = "Close";
+$lang->task->cancel    = "Cancel";
+$lang->task->activate  = "Activate";
+$lang->task->confirmStoryChange = "Confirm story change";
 
-$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->mailto       = '抄送给';
-$lang->task->estimate     = '最初预计';
-$lang->task->estimateAB   = '预计';
-$lang->task->left         = '预计剩余';
-$lang->task->leftAB       = '剩余';
-$lang->task->consumed     = '已经消耗';
-$lang->task->consumedAB   = '消耗';
-$lang->task->deadline     = '截止日期';
-$lang->task->deadlineAB   = '截止';
-$lang->task->status       = '任务状态';
-$lang->task->desc         = '任务描述';
-$lang->task->statusCustom = '状态排序';
+$lang->task->common       = 'Task';
+$lang->task->id           = 'ID';
+$lang->task->project      = 'Project';
+$lang->task->story        = 'Story';
+$lang->task->storyVersion = 'Version';
+$lang->task->name         = 'Name';
+$lang->task->type         = 'Type';
+$lang->task->pri          = 'Pri';
+$lang->task->owner        = 'Owner';
+$lang->task->mailto       = 'Mailto';
+$lang->task->estimate     = 'Estimate';
+$lang->task->estimateAB   = 'Estimate';
+$lang->task->left         = 'Left';
+$lang->task->leftAB       = 'Left';
+$lang->task->consumed     = 'Consumed';
+$lang->task->consumedAB   = 'Consumed';
+$lang->task->deadline     = 'Deadline';
+$lang->task->deadlineAB   = 'Deadline';
+$lang->task->status       = 'Status';
+$lang->task->desc         = 'Desc';
+$lang->task->statusCustom = 'Status Order';
 
-$lang->task->statusList['wait']    = '未开始';
-$lang->task->statusList['doing']   = '进行中';
-$lang->task->statusList['done']    = '已完成';
-$lang->task->statusList['cancel']  = '已取消';
+$lang->task->statusList['wait']    = 'Waiting';
+$lang->task->statusList['doing']   = 'Doing';
+$lang->task->statusList['done']    = 'Done';
+$lang->task->statusList['cancel']  = 'Canceled';
 
 $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['affair'] = '事务';
-$lang->task->typeList['misc']   = '其他';
+$lang->task->typeList['design'] = 'Design';
+$lang->task->typeList['devel']  = 'Devel';
+$lang->task->typeList['test']   = 'Test';
+$lang->task->typeList['study']  = 'Study';
+$lang->task->typeList['discuss']= 'Disuss';
+$lang->task->typeList['ui']     = 'UI';
+$lang->task->typeList['affair'] = 'Affair';
+$lang->task->typeList['misc']   = 'Misc';
 
 $lang->task->priList[0] = '';
 $lang->task->priList[3]  = '3';
@@ -78,29 +78,29 @@ $lang->task->priList[1]  = '1';
 $lang->task->priList[2]  = '2';
 $lang->task->priList[4]  = '4';
 
-$lang->task->afterChoices['continueAdding'] = '继续为该需求添加任务';
-$lang->task->afterChoices['toTastList']     = '返回任务列表';
-$lang->task->afterChoices['toStoryList']    = '返回需求列表';
+$lang->task->afterChoices['continueAdding'] = 'Continue add task for this story';
+$lang->task->afterChoices['toTastList']     = 'To task list';
+$lang->task->afterChoices['toStoryList']    = 'To story list';
 
-$lang->task->buttonEdit       = '编辑';
-$lang->task->buttonClose      = '关闭';
-$lang->task->buttonCancel     = '取消';
-$lang->task->buttonActivate   = '激活';
-$lang->task->buttonLogEfforts = '记录工时';
-$lang->task->buttonDelete     = '删除';
-$lang->task->buttonBackToList = '返回';
-$lang->task->buttonStart      = '开始';
-$lang->task->buttonDone       = '完成';
+$lang->task->buttonEdit       = 'Edit';
+$lang->task->buttonClose      = 'Close';
+$lang->task->buttonCancel     = 'Cancel';
+$lang->task->buttonActivate   = 'Activate';
+$lang->task->buttonLogEfforts = 'Errorts';
+$lang->task->buttonDelete     = 'Delete';
+$lang->task->buttonBackToList = 'Back';
+$lang->task->buttonStart      = 'Start';
+$lang->task->buttonDone       = 'Done';
 
-$lang->task->legendBasic  = '基本信息';
-$lang->task->legendEffort = '工时信息';
-$lang->task->legendDesc   = '任务描述';
-$lang->task->legendAction = '操作';
+$lang->task->legendBasic  = 'Basic info';
+$lang->task->legendEffort = 'Errort';
+$lang->task->legendDesc   = 'Desc';
+$lang->task->legendAction = 'Action';
 
-$lang->task->ajaxGetUserTasks    = "接口:我的任务";
-$lang->task->ajaxGetProjectTasks = "接口:项目任务";
-$lang->task->confirmDelete       = "您确定要删除这个任务吗？";
-$lang->task->copyStoryTitle      = "同需求";
-$lang->task->afterSubmit         = "添加之后";
-$lang->task->successSaved        = "成功添加，";
-$lang->task->delayWarning        = " <strong class='delayed f-14px'> 延期%s天 </strong>";
+$lang->task->ajaxGetUserTasks    = "API:My tasks";
+$lang->task->ajaxGetProjectTasks = "API:Project tasks";
+$lang->task->confirmDelete       = "Are you sure to delete this task?";
+$lang->task->copyStoryTitle      = "Same as story";
+$lang->task->afterSubmit         = "After created";
+$lang->task->successSaved        = "Success saved";
+$lang->task->delayWarning        = " <strong class='delayed f-14px'> Postponed %s days </strong>";
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 06cf03ff3f..ff3fa67f9f 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The testcase module english 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
@@ -21,88 +21,88 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$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->testcase->keywords       = '关键词';
-$lang->testcase->files          = '附件';
-$lang->testcase->howRun         = '执行方式';
-$lang->testcase->scriptedBy     = '由谁编写';
-$lang->testcase->scriptedDate   = '编写日期';
-$lang->testcase->scriptedStatus = '脚本状态';
-$lang->testcase->scriptedLocation = '脚本位置';
-$lang->testcase->linkCase         = '相关用例';
-$lang->testcase->stage            = '适用阶段';
-$lang->testcase->lastEditedByAB   = '修改者';
-$lang->testcase->lastEditedDateAB = '修改日期';
+$lang->testcase->id             = 'ID';
+$lang->testcase->product        = 'Product';
+$lang->testcase->module         = 'Module';
+$lang->testcase->story          = 'Story';
+$lang->testcase->storyVersion   = 'Story version';
+$lang->testcase->title          = 'Title';
+$lang->testcase->pri            = 'Priority';
+$lang->testcase->type           = 'Type';
+$lang->testcase->status         = 'Status';
+$lang->testcase->steps          = 'Steps';
+$lang->testcase->frequency      = 'Frequency';
+$lang->testcase->order          = 'Order';
+$lang->testcase->openedBy       = 'Opened by ';
+$lang->testcase->openedDate     = 'Opened date';
+$lang->testcase->lastEditedBy   = 'Last edited by';
+$lang->testcase->lastEditedDate = 'Last edited date';
+$lang->testcase->version        = 'Version';
+$lang->testcase->result         = 'Result';
+$lang->testcase->real           = 'Real';
+$lang->testcase->keywords       = 'Keywords';
+$lang->testcase->files          = 'Files';
+$lang->testcase->howRun         = 'How run';
+$lang->testcase->scriptedBy     = 'Scripted by';
+$lang->testcase->scriptedDate   = 'Scripted date';
+$lang->testcase->scriptedStatus = 'Scripted status';
+$lang->testcase->scriptedLocation = 'Script loction';
+$lang->testcase->linkCase         = 'Related cases';
+$lang->testcase->stage            = 'Stage';
+$lang->testcase->lastEditedByAB   = 'Last edited by';
+$lang->testcase->lastEditedDateAB = 'Last edited date';
 $lang->case = $lang->testcase;  // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
 
-$lang->testcase->stepID     = '编号';
-$lang->testcase->stepDesc   = '步骤';
-$lang->testcase->stepExpect = '预期';
+$lang->testcase->stepID     = 'ID';
+$lang->testcase->stepDesc   = 'Step';
+$lang->testcase->stepExpect = 'Expect';
 
-$lang->testcase->common         = '用例管理';
-$lang->testcase->index          = "用例管理首页";
-$lang->testcase->create         = "创建用例";
-$lang->testcase->delete         = "删除用例";
-$lang->testcase->view           = "用例详情";
-$lang->testcase->edit           = "编辑用例";
-$lang->testcase->delete         = "删除用例";
-$lang->testcase->browse         = "用例列表";
-$lang->testcase->confirmStoryChange = '确认需求变动';
+$lang->testcase->common         = 'Case';
+$lang->testcase->index          = "Index";
+$lang->testcase->create         = "Create";
+$lang->testcase->delete         = "Delete";
+$lang->testcase->view           = "Info";
+$lang->testcase->edit           = "Edit";
+$lang->testcase->delete         = "Delete";
+$lang->testcase->browse         = "Browse";
+$lang->testcase->confirmStoryChange = 'Confirm story change';
 
 $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->needConfirm    = '需求有变动的用例';
-$lang->testcase->moduleCases    = '按模块浏览';
-$lang->testcase->bySearch       = '搜索';
+$lang->testcase->selectProduct  = 'Select product';
+$lang->testcase->byModule       = 'By module';
+$lang->testcase->assignToMe     = 'Assgined to my';
+$lang->testcase->openedByMe     = 'Opened by me';
+$lang->testcase->allCases       = 'All case';
+$lang->testcase->needConfirm    = 'Story changed';
+$lang->testcase->moduleCases    = 'By module';
+$lang->testcase->bySearch       = 'By search';
 
-$lang->testcase->lblProductAndModule         = '产品模块';
-$lang->testcase->lblTypeAndPri               = '类型&优先级';
-$lang->testcase->lblSystemBrowserAndHardware = '系统::浏览器';
-$lang->testcase->lblAssignAndMail            = '指派给::抄送给';
-$lang->testcase->lblStory                    = '相关需求';
-$lang->testcase->lblLastEdited               = '最后编辑';
+$lang->testcase->lblProductAndModule         = 'Product & module';
+$lang->testcase->lblTypeAndPri               = 'Type & priority';
+$lang->testcase->lblSystemBrowserAndHardware = 'OS & browser';
+$lang->testcase->lblAssignAndMail            = 'Assigned & mailto';
+$lang->testcase->lblStory                    = 'Story';
+$lang->testcase->lblLastEdited               = 'Last edited';
 
-$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->legendRelated     = 'Related info';
+$lang->testcase->legendBasicInfo   = 'Basic info';
+$lang->testcase->legendMailto      = 'Mailto';
+$lang->testcase->legendAttatch     = 'Files';
+$lang->testcase->legendLinkBugs    = 'Bug';
+$lang->testcase->legendOpenAndEdit = 'Open & edit';
+$lang->testcase->legendStoryAndTask= 'Story';
+$lang->testcase->legendCases       = 'Related cases';
+$lang->testcase->legendSteps       = 'Steps';
+$lang->testcase->legendAction      = 'Action';
+$lang->testcase->legendHistory     = 'History';
+$lang->testcase->legendComment     = 'Comment';
+$lang->testcase->legendProduct     = 'Product & module';
+$lang->testcase->legendVersion     = 'Versions';
 
-$lang->testcase->confirmDelete     = '您确认要删除该测试用例吗？';
+$lang->testcase->confirmDelete     = 'Are you sure to delete this case?';
 
 $lang->testcase->priList[3] = 3;
 $lang->testcase->priList[1] = 1;
@@ -111,30 +111,30 @@ $lang->testcase->priList[4] = 4;
 
 /* Define the types. */
 $lang->testcase->typeList['']            = '';
-$lang->testcase->typeList['feature']     = '功能测试';
-$lang->testcase->typeList['performance'] = '性能测试';
-$lang->testcase->typeList['config']      = '配置相关';
-$lang->testcase->typeList['install']     = '安装部署';
-$lang->testcase->typeList['security']    = '安全相关';
-$lang->testcase->typeList['other']       = '其他';
+$lang->testcase->typeList['feature']     = 'Feature';
+$lang->testcase->typeList['performance'] = 'Performance';
+$lang->testcase->typeList['config']      = 'Config';
+$lang->testcase->typeList['install']     = 'Install';
+$lang->testcase->typeList['security']    = 'Security';
+$lang->testcase->typeList['other']       = 'Other';
 
 $lang->testcase->stageList['']            = '';
-$lang->testcase->stageList['unittest']    = '单元测试阶段';
-$lang->testcase->stageList['feature']     = '功能测试阶段';
-$lang->testcase->stageList['intergrate']  = '集成测试阶段';
-$lang->testcase->stageList['system']      = '系统测试阶段';
-$lang->testcase->stageList['smoke']       = '冒烟测试阶段';
-$lang->testcase->stageList['bvt']         = '版本验证阶段';
+$lang->testcase->stageList['unittest']    = 'Unit testing';
+$lang->testcase->stageList['feature']     = 'Feature testing';
+$lang->testcase->stageList['intergrate']  = 'Integrate testing';
+$lang->testcase->stageList['system']      = 'System testing';
+$lang->testcase->stageList['smoke']       = 'Smoking testing';
+$lang->testcase->stageList['bvt']         = 'BVT testing';
 
 $lang->testcase->statusList['']            = '';
-$lang->testcase->statusList['normal']      = '正常';
-$lang->testcase->statusList['blocked']     = '被阻塞';
-$lang->testcase->statusList['investigate'] = '研究中';
+$lang->testcase->statusList['normal']      = 'Normal';
+$lang->testcase->statusList['blocked']     = 'Blocked';
+$lang->testcase->statusList['investigate'] = 'Inverstigate';
 
 $lang->testcase->resultList['n/a']     = 'N/A';
-$lang->testcase->resultList['pass']    = '通过';
-$lang->testcase->resultList['fail']    = '失败';
-$lang->testcase->resultList['blocked'] = '阻塞';
+$lang->testcase->resultList['pass']    = 'Pass';
+$lang->testcase->resultList['fail']    = 'Fail';
+$lang->testcase->resultList['blocked'] = 'Blocked';
 
-$lang->testcase->buttonEdit     = '编辑';
-$lang->testcase->buttonToList   = '返回';
+$lang->testcase->buttonEdit     = 'Edit';
+$lang->testcase->buttonToList   = 'Back';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 1fceb0a2b6..7cc00008ef 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The testtask module english file of ZenTaoMS.
+ * 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
@@ -21,48 +21,48 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->testtask->index          = "测试任务首页";
-$lang->testtask->create         = "创建测试任务";
-$lang->testtask->delete         = "删除测试任务";
-$lang->testtask->view           = "测试任务详情";
-$lang->testtask->edit           = "编辑测试任务";
-$lang->testtask->browse         = "测试任务列表";
-$lang->testtask->linkCase       = "关联用例";
-$lang->testtask->linkCaseAB     = "关联";
-$lang->testtask->unlinkCase     = "移除";
-$lang->testtask->batchAssign    = "批量指派";
-$lang->testtask->runCase        = "执行";
-$lang->testtask->results        = "结果";
-$lang->testtask->createBug      = "创建Bug";
-$lang->testtask->assign         = '指派';
-$lang->testtask->cases          = '用例';
+$lang->testtask->index          = "Index";
+$lang->testtask->create         = "Create";
+$lang->testtask->delete         = "Delete";
+$lang->testtask->view           = "Info";
+$lang->testtask->edit           = "Edit";
+$lang->testtask->browse         = "Browse";
+$lang->testtask->linkCase       = "Link case";
+$lang->testtask->linkCaseAB     = "Link";
+$lang->testtask->unlinkCase     = "Remove";
+$lang->testtask->batchAssign    = "Batch Assign";
+$lang->testtask->runCase        = "Run";
+$lang->testtask->results        = "Result";
+$lang->testtask->createBug      = "Create bug";
+$lang->testtask->assign         = 'Assgin';
+$lang->testtask->cases          = 'Cases';
 
-$lang->testtask->common         = '测试任务';
-$lang->testtask->id             = '任务编号';
-$lang->testtask->product        = '所属产品';
-$lang->testtask->project        = '所属项目';
+$lang->testtask->common         = 'Test task';
+$lang->testtask->id             = 'ID';
+$lang->testtask->product        = 'Product';
+$lang->testtask->project        = '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->name           = 'Name';
+$lang->testtask->begin          = 'Begin';
+$lang->testtask->end            = 'End';
+$lang->testtask->desc           = 'Desc';
+$lang->testtask->status         = 'Status';
+$lang->testtask->assignedTo     = 'Assigned to';
+$lang->testtask->linkVersion    = 'Link(version)';
+$lang->testtask->lastRun        = 'Last run';
+$lang->testtask->lastResult     = 'Last result';
 
-$lang->testtask->statusList['wait']    = '未开始';
-$lang->testtask->statusList['doing']   = '进行中';
-$lang->testtask->statusList['done']    = '已完成';
-$lang->testtask->statusList['blocked'] = '被阻塞';
+$lang->testtask->statusList['wait']    = 'Waiting';
+$lang->testtask->statusList['doing']   = 'Doing';
+$lang->testtask->statusList['done']    = 'Done';
+$lang->testtask->statusList['blocked'] = 'Blocked';
 
-$lang->testtask->unlinkedCases = '未关联用例列表';
-$lang->testtask->linkedCases   = '已关联用例列表';
-$lang->testtask->confirmDelete = '您确认要删除该测试任务吗？';
-$lang->testtask->passAll       = '全部通过';
+$lang->testtask->unlinkedCases = 'Unlinked cases';
+$lang->testtask->linkedCases   = 'Linked cases';
+$lang->testtask->confirmDelete = 'Are you sure to delete this test task?';
+$lang->testtask->passAll       = 'Pass all';
 
-$lang->testtask->lblCases      = '用例列表';
-$lang->testtask->lblUnlinkCase = '移除用例';
-$lang->testtask->lblRunCase    = '执行用例';
-$lang->testtask->lblResults    = '执行结果';
+$lang->testtask->lblCases      = 'Case list';
+$lang->testtask->lblUnlinkCase = 'Remove case';
+$lang->testtask->lblRunCase    = 'Run';
+$lang->testtask->lblResults    = 'Result';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index b0d170500e..0f12deb095 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The todo module english file of ZenTaoMS.
+ * 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
@@ -22,67 +22,67 @@
  * @link        http://www.zentaoms.com
  */
 $lang->todo->common    = 'TODO';
-$lang->todo->index     = "todo一览";
-$lang->todo->create    = "新增TODO";
-$lang->todo->edit      = "更新TODO";
-$lang->todo->view      = "TODO详情";
-$lang->todo->viewAB    = "详情";
-$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->index     = "Index";
+$lang->todo->create    = "Create";
+$lang->todo->edit      = "Edit";
+$lang->todo->view      = "Info";
+$lang->todo->viewAB    = "Info";
+$lang->todo->markDone  = "Undone";
+$lang->todo->markWait  = "Done";
+$lang->todo->markDoing = "Doing";
+$lang->todo->mark      = "Change status";
+$lang->todo->delete    = "Delete";
+$lang->todo->browse    = "Browse";
+$lang->todo->import2Today = "Import to today";
+$lang->todo->changeStatus = "Change";
 
-$lang->todo->id          = '编号';
-$lang->todo->account     = '所有者';
-$lang->todo->date        = '日期';
-$lang->todo->begin       = '开始时间';
-$lang->todo->beginAB     = '开始';
-$lang->todo->end         = '结束时间';
-$lang->todo->endAB       = '结束';
-$lang->todo->beginAndEnd = '起止时间';
-$lang->todo->type        = '类型';
-$lang->todo->pri         = '优先级';
-$lang->todo->name        = '名称';
-$lang->todo->status      = '状态';
-$lang->todo->desc        = '描述';
-$lang->todo->private     = '私人事务';
-$lang->todo->idvalue     = '任务或Bug';
+$lang->todo->id          = 'ID';
+$lang->todo->account     = 'Owner';
+$lang->todo->date        = 'Date';
+$lang->todo->begin       = 'Begin time';
+$lang->todo->beginAB     = 'Begin';
+$lang->todo->end         = 'End time';
+$lang->todo->endAB       = 'End';
+$lang->todo->beginAndEnd = 'Begin and End';
+$lang->todo->type        = 'Type';
+$lang->todo->pri         = 'Priority';
+$lang->todo->name        = 'Name';
+$lang->todo->status      = 'Status';
+$lang->todo->desc        = 'Desc';
+$lang->todo->private     = 'Private';
+$lang->todo->idvalue     = 'Task or bug';
 
-$lang->todo->week  = '星期';
-$lang->todo->today = '今天';
-$lang->todo->weekDateList = '一,二,三,四,五,六,天';
-$lang->todo->dayInFeature = '暂不指定';
-$lang->todo->confirmBug   = '该Todo关联的是Bug #%s，需要修改它吗？';
-$lang->todo->confirmTask  = '该Todo关联的是Task #%s，需要修改它吗？';
+$lang->todo->week  = 'Week';
+$lang->todo->today = 'Today';
+$lang->todo->weekDateList = '';
+$lang->todo->dayInFeature = 'Feature';
+$lang->todo->confirmBug   = 'This todo linked to bug #%s，chang it also?';
+$lang->todo->confirmTask  = 'This todo linked to task #%s，chang it also?';
 
-$lang->todo->statusList['wait']     = '未开始';
-$lang->todo->statusList['doing']    = '进行中';
-$lang->todo->statusList['done']     = '已完成';
+$lang->todo->statusList['wait']     = 'Waiting';
+$lang->todo->statusList['doing']    = 'Doing';
+$lang->todo->statusList['done']     = '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->priList[3] = '3';
+$lang->todo->priList[1] = '1';
+$lang->todo->priList[2] = '2';
+$lang->todo->priList[4] = '4';
 
-$lang->todo->typeList->custom = '自定义';
+$lang->todo->typeList->custom = 'Custom';
 $lang->todo->typeList->bug    = 'Bug';
-$lang->todo->typeList->task   = '项目任务';
+$lang->todo->typeList->task   = 'Task';
 
-$lang->todo->confirmDelete  = "您确定要删除这个todo吗？";
-$lang->todo->successMarked  = "成功切换状态！";
-$lang->todo->thisIsPrivate  = '这是一条私人事务。:)';
-$lang->todo->lblDisableDate = '暂时不设定时间';
+$lang->todo->confirmDelete  = "Are you sure to delete this todo?";
+$lang->todo->successMarked  = "Successfully changed status";;
+$lang->todo->thisIsPrivate  = 'This is a private todo。:)';
+$lang->todo->lblDisableDate = 'Set time lately';
 
-$lang->todo->thisWeekTodos = '本周计划';
-$lang->todo->lastWeekTodos = '上周总结';
-$lang->todo->allDaysTodos  = '所有TODO';
-$lang->todo->allUndone     = '之前未完';
-$lang->todo->todayTodos    = '今日安排';
+$lang->todo->thisWeekTodos = 'This week';
+$lang->todo->lastWeekTodos = 'Last week';
+$lang->todo->allDaysTodos  = 'All todo';
+$lang->todo->allUndone     = 'Undone';
+$lang->todo->todayTodos    = 'Today';
 
-$lang->todo->action->marked = array('main' => '$date, 由 <strong>$actor</strong> 标记为<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);
+$lang->todo->action->marked = array('main' => '$date, Change status to <stong>$extra</strong> by <strong>$actor</strong>。', 'extra' => $lang->todo->statusList);
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index cf4fbde0dd..2e8a2e55bb 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The tree module english file of ZenTaoMS.
+ * 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
@@ -21,24 +21,29 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->tree->common      = '模块维护';
-$lang->tree->add         = "添加";
-$lang->tree->edit        = "编辑";
-$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->common            = 'Module manage';
+$lang->tree->add               = 'Add';
+$lang->tree->edit              = 'Edit';
+$lang->tree->addChild          = 'Add child';
+$lang->tree->delete            = 'Delete';
+$lang->tree->browse            = 'Module manage';
+$lang->tree->manage            = 'Manage';
+$lang->tree->manageProduct     = 'Mange product module';
+$lang->tree->manageProject     = 'Manage project mdoule';
+$lang->tree->manageBug         = 'Manage bug module';
+$lang->tree->manageCase        = 'Manage case module';
+$lang->tree->manageCustomDoc   = 'Manage doc library module';
+$lang->tree->updateOrder       = 'Update order';
+$lang->tree->manageChild       = 'Manage child';
+$lang->tree->syncFromProduct   = 'Copy from product module';
+$lang->tree->ajaxGetOptionMenu = 'API: Get select menu';
 
-$lang->tree->confirmDelete = "您确定删除该模块吗？";
-$lang->tree->successSave   = "成功保存";
+$lang->tree->confirmDelete = 'Are you sure to delete this module?';
+$lang->tree->successSave   = 'Success saved';
 
-$lang->tree->name   = '模块名称';
-$lang->tree->parent = '上级模块';
+$lang->tree->name   = 'Name';
+$lang->tree->parent = 'Parent';
+$lang->tree->child  = 'Child';
+$lang->tree->owner  = 'Owner';
+$lang->tree->order  = 'Order';
+$lang->tree->projectDoc = 'Project doc';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 052a527ccd..d013dc3faf 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The upgrade module english file of ZenTaoMS.
+ * 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
@@ -21,27 +21,21 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->upgrade->common  = '升级';
-$lang->upgrade->result  = '升级结果';
-$lang->upgrade->fail    = '升级失败';
-$lang->upgrade->success = '升级成功';
-$lang->upgrade->tohome  = '返回首页';
-$lang->upgrade->warnning= '警告';
+$lang->upgrade->common  = 'Upgrade';
+$lang->upgrade->result  = 'Result';
+$lang->upgrade->fail    = 'Fail';
+$lang->upgrade->success = 'Success';
+$lang->upgrade->tohome  = 'Go to index';
+$lang->upgrade->warnning= '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
+Warnning! Upgradinng is dangeous, backup your database first.<br />
 EOT;
-$lang->upgrade->selectVersion = '选择版本';
-$lang->upgrade->noteVersion   = "务必选择正确的版本，否则会造成数据丢失。";
-$lang->upgrade->fromVersion   = '原来的版本';
-$lang->upgrade->toVersion     = '升级到';
-$lang->upgrade->confirm       = '确认要执行的SQL语句';
-$lang->upgrade->sureExecute   = '确认执行';
+$lang->upgrade->selectVersion = 'Select version';
+$lang->upgrade->noteVersion   = "Must select the correct version";
+$lang->upgrade->fromVersion   = 'From version';
+$lang->upgrade->toVersion     = 'To version';
+$lang->upgrade->confirm       = 'Confirm the sql to executed.';
+$lang->upgrade->sureExecute   = 'Execute';
 
 $lang->upgrade->fromVersions['0_3beta']   = '0.3 BETA';
 $lang->upgrade->fromVersions['0_4beta']   = '0.4 BETA';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 2306c4b993..0034ccfa88 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The user module english 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,70 +21,70 @@
  * @version     $Id$
  * @link        http://www.zentaoms.com
  */
-$lang->user->common        = '用户';
-$lang->user->index         = "用户视图首页";
-$lang->user->view          = "用户详情";
-$lang->user->create        = "添加用户";
-$lang->user->read          = "查看用户";
-$lang->user->edit          = "编辑用户";
-$lang->user->update        = "编辑用户";
-$lang->user->delete        = "删除用户";
-$lang->user->activate      = "激活";
-$lang->user->browse        = "浏览用户";
-$lang->user->login         = "用户登录";
-$lang->user->userView      = "人员视图";
-$lang->user->editProfile   = "修改个人信息";
-$lang->user->editPassword  = "修改密码";
-$lang->user->deny          = "访问受限";
-$lang->user->confirmDelete   = "您确认删除该用户吗？";
-$lang->user->confirmActivate = "您确认激活该用户吗？";
-$lang->user->relogin         = "重新登录";
-$lang->user->asGuest         = "游客访问";
-$lang->user->goback          = "返回前一页";
-$lang->user->allUsers        = '全部用户';
-$lang->user->deleted         = '(已删除)';
+$lang->user->common        = 'User';
+$lang->user->index         = "Index";
+$lang->user->view          = "Info";
+$lang->user->create        = "Add";
+$lang->user->read          = "Info";
+$lang->user->edit          = "Edit";
+$lang->user->update        = "Upgrade";
+$lang->user->delete        = "Delete";
+$lang->user->activate      = "Activate";
+$lang->user->browse        = "Browse";
+$lang->user->login         = "Login";
+$lang->user->userView      = "User view";
+$lang->user->editProfile   = "Edit profile";
+$lang->user->editPassword  = "Change password";
+$lang->user->deny          = "Denined";
+$lang->user->confirmDelete   = "Are you sure to delete this user?";
+$lang->user->confirmActivate = "Are you sure to activate this user?";
+$lang->user->relogin         = "Relogin";
+$lang->user->asGuest         = "Guest";
+$lang->user->goback          = "Back";
+$lang->user->allUsers        = 'All users';
+$lang->user->deleted         = '(deleted)';
 
-$lang->user->profile     = '用户档案';
-$lang->user->project     = '用户项目';
-$lang->user->task        = '用户任务';
-$lang->user->bug         = '用户Bug';
-$lang->user->todo        = '用户TODO';
-$lang->user->story       = '用户需求';
-$lang->user->team        = '用户团队';
-$lang->user->editProfile = '修改信息';
+$lang->user->profile     = 'Profile';
+$lang->user->project     = 'Project';
+$lang->user->task        = 'Task';
+$lang->user->bug         = 'Bug';
+$lang->user->todo        = 'Todo';
+$lang->user->story       = 'Story';
+$lang->user->team        = 'Team';
+$lang->user->editProfile = 'Edit profile';
 
-$lang->user->errorDeny   = "抱歉，您无权访问『<b>%s</b>』模块的『<b>%s</b>』功能。请联系管理员获取权限。点击后退返回上页。";
-$lang->user->loginFailed = "登录失败，请检查您的用户名或密码是否填写正确。";
+$lang->user->errorDeny   = "Sorry, you can't access the <b>%s</b>』module's『<b>%s</b>』feature";
+$lang->user->loginFailed = "Login failed, please check you account and password.";
 
-$lang->user->gendarList->m = '男';
-$lang->user->gendarList->f = '女';
-$lang->user->statusList['active'] = '正常';
-$lang->user->statusList['delete'] = '删除';
+$lang->user->gendarList->m = 'Male';
+$lang->user->gendarList->f = 'Female';
+$lang->user->statusList['active'] = 'Activate';
+$lang->user->statusList['delete'] = 'Delted';
 
-$lang->user->id        = '用户编号';
-$lang->user->company   = '所属公司';
-$lang->user->dept      = '所属部门';
-$lang->user->account   = '用户名';
-$lang->user->password  = '密码';
-$lang->user->password2 = '请重复密码';
-$lang->user->realname  = '真实姓名';
-$lang->user->nickname  = '昵称';
-$lang->user->avatar    = '头像';
-$lang->user->birthyear = '出生年';
-$lang->user->birthday  = '出生月日';
-$lang->user->gendar    = '性别';
-$lang->user->email     = '邮箱';
+$lang->user->id        = 'ID';
+$lang->user->company   = 'Company';
+$lang->user->dept      = 'Department';
+$lang->user->account   = 'Account';
+$lang->user->password  = 'Pasword';
+$lang->user->password2 = 'Repeat password';
+$lang->user->realname  = 'Realname';
+$lang->user->nickname  = 'Nickname';
+$lang->user->avatar    = 'Avatar';
+$lang->user->birthyear = 'Birth year';
+$lang->user->birthday  = 'Birthday';
+$lang->user->gendar    = 'Gendar';
+$lang->user->email     = 'Email';
 $lang->user->msn       = 'MSN';
 $lang->user->qq        = 'QQ';
-$lang->user->yahoo     = '雅虎通';
+$lang->user->yahoo     = 'Yahoo!';
 $lang->user->gtalk     = 'GTalk';
-$lang->user->wangwang  = '旺旺';
-$lang->user->mobile    = '手机';
-$lang->user->phone     = '电话';
-$lang->user->address   = '通讯地址';
-$lang->user->zipcode   = '邮编';
-$lang->user->join      = '加入日期';
-$lang->user->visits    = '访问次数';
-$lang->user->ip        = '最后IP';
-$lang->user->last      = '最后登录时间';
-$lang->user->status    = '状态';
+$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    = 'Visits';
+$lang->user->ip        = 'Last IP';
+$lang->user->last      = 'Last login';
+$lang->user->status    = 'Status';