From c22b9ed320ec1372ea5714aed9cccbcb3e0928f1 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sun, 3 Mar 2013 01:24:04 +0000
Subject: [PATCH]  * adjust lang items for estimate feature.

---
 module/action/lang/en.php |  6 +++---
 module/task/lang/en.php   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 6188464dc6..eceab1a338 100644
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -81,9 +81,9 @@ $lang->action->desc->frombug        = '$date, from Bug by <strong>$actor</strong
 $lang->action->desc->started        = '$date, started by <strong>$actor</strong>.';
 $lang->action->desc->delayed        = '$date, delayed by <strong>$actor</strong>.';
 $lang->action->desc->suspended      = '$date, suspended by <strong>$actor</strong>.';
-$lang->action->desc->recordestimate = '$date, recorded by <strong>$actor</strong>，consumed <strong>$extra</strong> hour(s).';
-$lang->action->desc->editestimate   = '$date, recorded by <strong>$actor</strong>，consumed <strong>$extra</strong> hour(s).';
-$lang->action->desc->deleteestimate = '$date, recorded by <strong>$actor</strong>，consumed <strong>$extra</strong> hour(s).';
+$lang->action->desc->recordestimate = '$date, <strong>$actor</strong> recorded <strong>$extra</strong> hours.';
+$lang->action->desc->editestimate   = '$date, <strong>$actor</strong> edited working hours';
+$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> deleted working hours'; 
 $lang->action->desc->canceled       = '$date, canceled by <strong>$actor</strong>.';
 $lang->action->desc->svncommited    = '$date, <strong>$actor</strong> commited to svn，revision is <strong>#$extra</strong>.' . "\n";
 $lang->action->desc->finished       = '$date, finished by <strong>$actor</strong>.';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 5a3249dd9e..80bef15768 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -17,7 +17,7 @@ $lang->task->import             = "Import undone";
 $lang->task->edit               = "Update";
 $lang->task->delete             = "Delete";
 $lang->task->view               = "Info";
-$lang->task->logEfforts         = "Efforts";
+$lang->task->logEfforts         = "Log working hours";
 $lang->task->record             = "Estimate";
 $lang->task->start              = "Start";
 $lang->task->finish             = "Finish";
@@ -47,7 +47,7 @@ $lang->task->leftAB            = 'Left';
 $lang->task->consumed          = 'Consumed';
 $lang->task->consumedAB        = 'Use';
 $lang->task->hour              = 'Hour';
-$lang->task->consumedThisTime  = 'Effort';
+$lang->task->consumedThisTime  = 'Hours';
 $lang->task->leftThisTime      = 'Left';
 $lang->task->estStarted        = 'Estimate start';
 $lang->task->realStarted       = 'Real start';
@@ -78,9 +78,9 @@ $lang->task->closedReason      = 'Closed Reason';
 $lang->task->lastEditedBy      = 'Last Edited By';
 $lang->task->lastEditedDate    = 'Last Edited Date';
 $lang->task->lastEdited        = 'Last Edited';
-$lang->task->recordEstimate    = 'Record';
-$lang->task->editEstimate      = 'Edit estimate';
-$lang->task->deleteEstimate    = 'Delete estimate';
+$lang->task->recordEstimate    = 'Hours';
+$lang->task->editEstimate      = 'Edit Hour';
+$lang->task->deleteEstimate    = 'Delete Hour';
 
 $lang->task->ditto = 'Ditto';
 
@@ -134,7 +134,7 @@ $lang->task->legendAction = 'Action';
 $lang->task->ajaxGetUserTasks      = "API:My tasks";
 $lang->task->ajaxGetProjectTasks   = "API:Project tasks";
 $lang->task->confirmDelete         = "Are you sure you want to delete this task?";
-$lang->task->confirmDeleteEstimate = "Are you sure you want to delete this estimate?";
+$lang->task->confirmDeleteEstimate = "Are you sure you want to delete this hour?";
 $lang->task->copyStoryTitle        = "Same as story";
 $lang->task->afterSubmit           = "After created";
 $lang->task->successSaved          = "Successfully saved";