diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 321b69cbf0..d3a7b85c04 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -82,8 +82,8 @@ $lang->bug->confirmAction      = 'Confirm Bug';
 $lang->bug->batchConfirm       = 'Batch Confirm';
 $lang->bug->edit               = 'Edit Bug';
 $lang->bug->batchEdit          = 'Batch Edit';
-$lang->bug->batchChangeModule  = 'Batch Edit Module';
-$lang->bug->batchChangeBranch  = 'Batch Edit Branch';
+$lang->bug->batchChangeModule  = 'Batch Edit Modules';
+$lang->bug->batchChangeBranch  = 'Batch Edit Branches';
 $lang->bug->batchClose         = 'Batch Close';
 $lang->bug->assignTo           = 'Assign';
 $lang->bug->assignAction       = 'Assign Bug';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 587f4574bc..8daaf4aacd 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -1,5 +1,5 @@
 <?php
-$lang->dev->common     = 'CSD';
+$lang->dev->common     = 'Develop';
 $lang->dev->api        = 'API';
 $lang->dev->db         = 'Database';
 $lang->dev->editor     = 'Editor';
@@ -70,7 +70,7 @@ $lang->dev->tableList['api']              = 'API';
 $lang->dev->tableList['backup']           = 'Backup';
 $lang->dev->tableList['common']           = 'Common';
 $lang->dev->tableList['convert']          = 'Convert';
-$lang->dev->tableList['dev']              = 'CSD';
+$lang->dev->tableList['dev']              = 'Develop';
 $lang->dev->tableList['git']              = 'GIT';
 $lang->dev->tableList['index']            = 'Home';
 $lang->dev->tableList['install']          = 'Install';
diff --git a/module/file/lang/en.php b/module/file/lang/en.php
index 47ea651fe3..55658e5423 100644
--- a/module/file/lang/en.php
+++ b/module/file/lang/en.php
@@ -14,7 +14,7 @@ $lang->file->common        = 'File';
 $lang->file->uploadImages  = 'Batch Upload Images';
 $lang->file->download      = 'Download Files';
 $lang->file->uploadDate    = 'Uploaded';
-$lang->file->edit          = 'File Rename';
+$lang->file->edit          = 'Rename File';
 $lang->file->inputFileName = 'Enter File Name';
 $lang->file->delete        = 'Delete File';
 $lang->file->label         = 'Label:';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index e00b886c2a..8fcee89ba4 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -16,7 +16,7 @@ $lang->group->edit               = 'Edit Group';
 $lang->group->copy               = 'Copy Group';
 $lang->group->delete             = 'Delete Group';
 $lang->group->manageView         = 'Manage Sight';
-$lang->group->managePriv         = 'Batch Assign';
+$lang->group->managePriv         = 'Manage Privileges';
 $lang->group->managePrivByGroup  = 'Manage Privileges by Group';
 $lang->group->managePrivByModule = 'Manage Privileges by Module';
 $lang->group->byModuleTips       = '<span class="tips">(Press Shift/Ctrl to Multi-select)</span>';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 08abfa0e6f..1798413b22 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -44,7 +44,6 @@ $lang->moduleOrder[115] = 'admin';
 $lang->moduleOrder[120] = 'extension';
 $lang->moduleOrder[125] = 'custom';
 $lang->moduleOrder[130] = 'editor';
-$lang->moduleOrder[135] = 'convert';
 $lang->moduleOrder[140] = 'action';
 
 $lang->moduleOrder[145] = 'mail';
@@ -118,7 +117,7 @@ $lang->resource->todo->export       = 'export';
 $lang->resource->todo->finish       = 'finish';
 $lang->resource->todo->batchFinish  = 'batchFinish';
 $lang->resource->todo->import2Today = 'import2Today';
-$lang->resource->todo->assignTo     = 'assignTo';
+$lang->resource->todo->assignTo     = 'assignAction';
 $lang->resource->todo->activate     = 'activate';
 $lang->resource->todo->close        = 'close';
 $lang->resource->todo->batchClose   = 'batchClose';
@@ -951,32 +950,6 @@ $lang->extension->methodOrder[40] = 'upload';
 $lang->extension->methodOrder[45] = 'erase';
 $lang->extension->methodOrder[50] = 'upgrade';
 
-/* Convert. */
-$lang->resource->convert = new stdclass();
-$lang->resource->convert->index          = 'index';
-$lang->resource->convert->selectSource   = 'selectSource';
-$lang->resource->convert->setConfig      = 'setConfig';
-$lang->resource->convert->setBugfree     = 'setBugfree';
-$lang->resource->convert->setRedmine     = 'setRedmine';
-$lang->resource->convert->checkConfig    = 'checkConfig';
-$lang->resource->convert->checkBugFree   = 'checkBugFree';
-$lang->resource->convert->checkRedmine   = 'checkRedmine';
-$lang->resource->convert->execute        = 'execute';
-$lang->resource->convert->convertBugFree = 'convertBugFree';
-$lang->resource->convert->convertRedmine = 'convertRedmine';
-
-$lang->convert->methodOrder[5]  = 'index';
-$lang->convert->methodOrder[10] = 'selectSource';
-$lang->convert->methodOrder[15] = 'setConfig';
-$lang->convert->methodOrder[20] = 'setBugfree';
-$lang->convert->methodOrder[25] = 'setRedmine';
-$lang->convert->methodOrder[30] = 'checkConfig';
-$lang->convert->methodOrder[35] = 'checkBugFree';
-$lang->convert->methodOrder[40] = 'checkRedmine';
-$lang->convert->methodOrder[45] = 'execute';
-$lang->convert->methodOrder[50] = 'convertBugFree';
-$lang->convert->methodOrder[55] = 'convertRedmine';
-
 /* Others. */
 $lang->resource->api = new stdclass();
 $lang->resource->api->getModel    = 'getModel';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index a3a289cd1a..b4bc95db5f 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -125,7 +125,6 @@ $lang->project->team              = 'Members';
 $lang->project->doc               = 'Document';
 $lang->project->doclib            = 'Docoment Library';
 $lang->project->manageProducts    = 'Linked ' . $lang->productCommon . 's';
-$lang->project->linkStory         = 'Link Stories';
 $lang->project->linkStoryByPlan   = 'Link Stories By Plan';
 $lang->project->linkPlan          = 'Linked Plans';
 $lang->project->unlinkStoryTasks  = 'Unlink';
@@ -164,8 +163,8 @@ $lang->project->treeStory         = 'Show Story Only';
 $lang->project->treeOnlyTask      = 'Show Task Only';
 $lang->project->treeOnlyStory     = 'Show Story Only';
 $lang->project->storyKanban       = 'Story Kanban';
-$lang->project->storySort         = 'Order Story';
-$lang->project->importPlanStory   = '' . $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
+$lang->project->storySort         = 'Rank Story';
+$lang->project->importPlanStory   = $lang->projectCommon . ' is created!\nDo you want to import stories that have been linked to the plan?';
 $lang->project->iteration         = 'Iterations';
 $lang->project->iterationInfo     = '%s Iterations';
 $lang->project->viewAll           = 'View All';
@@ -253,7 +252,7 @@ $lang->project->accessDenied          = "Your access to {$lang->projectCommon} i
 $lang->project->tips                  = 'Note';
 $lang->project->afterInfo             = "{$lang->projectCommon} is created. Next you can ";
 $lang->project->setTeam               = 'Set Team';
-$lang->project->linkStory             = 'Link Stories';
+$lang->project->linkStory             = 'Link Story';
 $lang->project->createTask            = 'Create Task';
 $lang->project->goback                = "Go Back";
 $lang->project->noweekend             = 'Exclude Weekend';
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 42bf12db10..f19a781126 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -20,8 +20,8 @@ $lang->release->view             = "Release Detail";
 $lang->release->browse           = "Release List";
 $lang->release->changeStatus     = "Change Status";
 $lang->release->batchUnlink      = "Batch Unlink";
-$lang->release->batchUnlinkStory = "Batch Unlink Story";
-$lang->release->batchUnlinkBug   = "Batch Unlink Bug";
+$lang->release->batchUnlinkStory = "Batch Unlink Stories";
+$lang->release->batchUnlinkBug   = "Batch Unlink Bugs";
 
 $lang->release->confirmDelete      = "Do you want to delete this release?";
 $lang->release->confirmUnlinkStory = "Do you want to remove this story?";
diff --git a/module/svn/lang/en.php b/module/svn/lang/en.php
index 54a24ecca2..47ac24becd 100644
--- a/module/svn/lang/en.php
+++ b/module/svn/lang/en.php
@@ -13,4 +13,4 @@
 $lang->svn->common  = 'Subversion';
 $lang->svn->cat     = 'View Source Code';
 $lang->svn->diff    = 'Compare Source Code';
-$lang->svn->apiSync = 'API: Syncrhonize SVN logs.';
+$lang->svn->apiSync = 'API: Syncrhonize SVN logs';
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 587398ccb3..3bd215d4aa 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -30,7 +30,7 @@ $lang->testcase->real             = 'Details';
 $lang->testcase->keywords         = 'Tags';
 $lang->testcase->files            = 'Files';
 $lang->testcase->linkCase         = 'Linked Cases';
-$lang->testcase->linkCases        = 'Link Cases';
+$lang->testcase->linkCases        = 'Link Case';
 $lang->testcase->unlinkCase       = 'Unlink Cases';
 $lang->testcase->stage            = 'Phase';
 $lang->testcase->reviewedBy       = 'ReviewedBy';
@@ -87,14 +87,14 @@ $lang->testcase->reviewAB                = "Review";
 $lang->testcase->batchReview             = "Batch Review";
 $lang->testcase->edit                    = "Edit Case";
 $lang->testcase->batchEdit               = "Batch Edit ";
-$lang->testcase->batchChangeModule       = "Batch Change Module";
+$lang->testcase->batchChangeModule       = "Batch Change Modules";
 $lang->testcase->confirmLibcaseChange    = "Confirm CaseLib Change";
 $lang->testcase->ignoreLibcaseChange     = "Ignore CaseLib Change";
-$lang->testcase->batchChangeBranch       = "Batch Change Branch";
+$lang->testcase->batchChangeBranch       = "Batch Change Branches";
 $lang->testcase->groupByStories          = 'Group by Story';
 $lang->testcase->batchDelete             = "Batch Delete ";
 $lang->testcase->batchConfirmStoryChange = "Batch Confirm";
-$lang->testcase->batchCaseTypeChange     = "Batch Change Type";
+$lang->testcase->batchCaseTypeChange     = "Batch Change Types";
 $lang->testcase->browse                  = "Case List";
 $lang->testcase->groupCase               = "View By Group";
 $lang->testcase->import                  = "Import";
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index 45f4b52d86..8f2db232c6 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -18,13 +18,13 @@ $lang->testsuite->browse           = "Suite List";
 $lang->testsuite->linkCase         = "Link Case";
 $lang->testsuite->linkVersion      = "Version";
 $lang->testsuite->unlinkCase       = "Unlink";
-$lang->testsuite->unlinkCaseAction = "Unlink Cases";
-$lang->testsuite->batchUnlinkCases = "Batch Unlink Case";
+$lang->testsuite->unlinkCaseAction = "Unlink Case";
+$lang->testsuite->batchUnlinkCases = "Batch Unlink Cases";
 $lang->testsuite->deleted          = 'Deleted';
 $lang->testsuite->exportTemplet    = 'Export Template';
 $lang->testsuite->batchCreateCase  = 'Batch Create';
 $lang->testsuite->import           = 'Import';
-$lang->testsuite->importAction     = 'Import Cases';
+$lang->testsuite->importAction     = 'Import Case';
 $lang->testsuite->showImport       = 'Imported Data';
 $lang->testsuite->successSaved     = 'Saved';
 
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 255ea4da77..70ef7158e2 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -20,7 +20,7 @@ $lang->testtask->browse           = "Test Request";
 $lang->testtask->linkCase         = "Link Case";
 $lang->testtask->selectVersion    = "Select Version";
 $lang->testtask->unlinkCase       = "Unlink";
-$lang->testtask->batchUnlinkCases = "Batch Unlink Case";
+$lang->testtask->batchUnlinkCases = "Batch Unlink Cases";
 $lang->testtask->batchAssign      = "Batch Assign";
 $lang->testtask->runCase          = "Run";
 $lang->testtask->batchRun         = "Batch Run";
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index d6ccd60816..ab8d8f2b7a 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -13,7 +13,9 @@ $lang->todo->common       = 'Todo';
 $lang->todo->index        = "Home";
 $lang->todo->create       = "Add Todo";
 $lang->todo->createCycle  = "Add Recurred Todo";
-$lang->todo->assignTo     = "Todo Assign";
+$lang->todo->assignTo     = "Assigned To";
+$lang->todo->assignedDate = "Assigned Date";
+$lang->todo->assignAction = "Assign Todo";
 $lang->todo->activate     = "Activate Todo";
 $lang->todo->batchCreate  = "Batch Add ";
 $lang->todo->edit         = "Edit Todo";
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index b952b8074c..cd5f327a3f 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -14,6 +14,8 @@ $lang->todo->index        = "待办一览";
 $lang->todo->create       = "添加待办";
 $lang->todo->createCycle  = "创建周期待办";
 $lang->todo->assignTo     = "指派给";
+$lang->todo->assignedDate = "指派日期";
+$lang->todo->assignAction = "指派待办";
 $lang->todo->activate     = "激活待办";
 $lang->todo->batchCreate  = "批量添加";
 $lang->todo->edit         = "编辑待办";
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index fb6c6188e3..d9e44d06d8 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -123,7 +123,7 @@
               <td><?php echo zget($users, $todo->assignedTo);?></td>
             </tr>
             <tr>
-              <th><?php echo $lang->todo->assignTo . $lang->todo->date;?></th>
+              <th><?php echo $lang->todo->assignedDate;?></th>
               <td><?php echo formatTime($todo->assignedDate, DT_DATE1);?></td>
             </tr>
             <?php endif;?>