diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index d72af9cd0d..b8bc32b52a 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -126,25 +126,25 @@ $lang->task->reasonList[''] = '';
$lang->task->reasonList['done'] = 'Done';
$lang->task->reasonList['cancel'] = 'Cancelled';
-$lang->task->afterChoices['continueAdding'] = 'Contine Add Task';
+$lang->task->afterChoices['continueAdding'] = 'Continue adding Tasks';
$lang->task->afterChoices['toTaskList'] = 'Back to Task List';
$lang->task->afterChoices['toStoryList'] = 'Back to Story List';
$lang->task->legendBasic = 'Basic Info';
$lang->task->legendEffort = 'Man-Hour';
$lang->task->legendLife = 'Task Life';
-$lang->task->legendDesc = 'Task Desn';
+$lang->task->legendDesc = 'Task Desc';
$lang->task->confirmDelete = "Do you want to delete this Task?";
$lang->task->confirmDeleteEstimate = "Do you want to delete it?";
$lang->task->copyStoryTitle = "Same Story";
-$lang->task->afterSubmit = "After Created";
+$lang->task->afterSubmit = "After Created,";
$lang->task->successSaved = "Created!";
$lang->task->delayWarning = " Delay %s days ";
$lang->task->remindBug = "This Task is converted from a Bug. Do you want to update te Bug:%s?";
-$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module,Story and Assignor will be changed. Do you want to do it?";
-$lang->task->confirmFinish = '"Estimated Left" is 0. Do you want to change the Status to "Done"?';
-$lang->task->confirmRecord = '"Left" is 0. Do you want to set Task as "Done"?';
+$lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?";
+$lang->task->confirmFinish = '"Estimated reamin hour" is 0. Do you want to change the Status to "Done"?';
+$lang->task->confirmRecord = '"Remain hour" is 0. Do you want to set Task as "Done"?';
$lang->task->noticeSaveRecord = 'Your man-hour is not saved. Please save it first.';
$lang->task->commentActions = '%s. %s, commented by %s.';
@@ -206,11 +206,11 @@ $lang->task->report->tasksPerType->item = 'Type';
$lang->task->report->tasksPerPri->item = 'Priority';
$lang->task->report->tasksPerStatus->item = 'Status';
$lang->task->report->tasksPerDeadline->item = 'Date';
-$lang->task->report->tasksPerEstimate->item = '预计';
-$lang->task->report->tasksPerLeft->item = '剩余';
-$lang->task->report->tasksPerConsumed->item = '消耗';
+$lang->task->report->tasksPerEstimate->item = 'Est.';
+$lang->task->report->tasksPerLeft->item = 'Reamin';
+$lang->task->report->tasksPerConsumed->item = 'Consume';
$lang->task->report->tasksPerFinishedBy->item = 'User';
-$lang->task->report->tasksPerClosedReason->item = '原因';
+$lang->task->report->tasksPerClosedReason->item = 'Reason';
$lang->task->report->finishedTasksPerDay->item = 'Date';
$lang->task->report->tasksPerProject->graph = new stdclass();
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 173126ebd7..8b4fa7d0c9 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -76,13 +76,26 @@
?>
-
+
+
+
diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index f4ddfd98ac..0e4d8ba40e 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -33,17 +33,17 @@ $lang->tree->dragAndSort = "Drag and Sort";
$lang->tree->addChild = "Add Child Module";
$lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?';
-$lang->tree->confirmRoot = "Modify the module {$lang->productCommon}s, modified the {$lang->productCommon}s belong to the needs of the module, bug, use case, and {$lang->projectCommon} and {$lang->productCommon} relationship. This is dangerous, please be careful. To confirm the change?";
-$lang->tree->successSave = 'Successfully saved';
-$lang->tree->successFixed = 'Successfully fixed.';
-$lang->tree->repeatName = 'The name "%s" has exists!';
+$lang->tree->confirmRoot = "Changes on {$lang->productCommon} will change the Story, Bug, Case of {$lang->productCommon} it belongs to, as well as the realtion of {$lang->projectCommon} and {$lang->productCommon}, which is dangerous, please be aware of it. Do you want to change?";
+$lang->tree->successSave = 'Saved.';
+$lang->tree->successFixed = 'Fixed.';
+$lang->tree->repeatName = 'The name "%s" has existed!';
$lang->tree->name = 'Name';
$lang->tree->parent = 'Parent';
$lang->tree->child = 'Child';
$lang->tree->owner = 'Owner';
$lang->tree->order = 'Order';
-$lang->tree->short = 'Sort';
+$lang->tree->short = 'Short';
$lang->tree->all = 'All Modules';
$lang->tree->projectDoc = "{$lang->projectCommon} Doc";
$lang->tree->product = $lang->productCommon;
diff --git a/www/js/my.full.js b/www/js/my.full.js
index e1701fa4c5..ff067f5070 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -1684,6 +1684,13 @@ function initHotKey()
return false;
});
+ /* Alt+up, go back to the previous page. */
+ $(document).bind('keydown', 'Alt+up', function(evt)
+ {
+ backLink = ($('#back').attr("href"));
+ if(typeof(backLink) != 'undefined') location.href = backLink;
+ });
+
/* left, go to pre object. */
$(document).bind('keydown', 'left', function(evt)
{