From d1431b9ddb55045c2f6bcefee6e9dde407cdae93 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 18 Jun 2014 03:22:13 +0000
Subject: [PATCH]  * finish task #1876.

---
 module/action/lang/en.php    | 67 +++++++++++++++++++-----------------
 module/action/lang/zh-cn.php | 67 +++++++++++++++++++-----------------
 2 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 7ad528b826..9cc43276fe 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -170,36 +170,39 @@ $lang->action->search->objectTypeList['productplan'] = 'productplan';
 
 /* Display action for search. */
 $lang->action->search->label['']                    = '';
-$lang->action->search->label['created']             = $lang->action->label->created;            
-$lang->action->search->label['opened']              = $lang->action->label->opened;             
-$lang->action->search->label['changed']             = $lang->action->label->changed;            
-$lang->action->search->label['edited']              = $lang->action->label->edited;             
-$lang->action->search->label['assigned']            = $lang->action->label->assigned;           
-$lang->action->search->label['closed']              = $lang->action->label->closed;             
-$lang->action->search->label['deleted']             = $lang->action->label->deleted;            
-$lang->action->search->label['deletedfile']         = $lang->action->label->deletedfile;        
-$lang->action->search->label['editfile']            = $lang->action->label->editfile;           
-$lang->action->search->label['erased']              = $lang->action->label->erased;             
-$lang->action->search->label['undeleted']           = $lang->action->label->undeleted;          
-$lang->action->search->label['hidden']              = $lang->action->label->hidden;          
-$lang->action->search->label['commented']           = $lang->action->label->commented;          
-$lang->action->search->label['activated']           = $lang->action->label->activated;          
-$lang->action->search->label['resolved']            = $lang->action->label->resolved;           
-$lang->action->search->label['reviewed']            = $lang->action->label->reviewed;           
-$lang->action->search->label['moved']               = $lang->action->label->moved;              
-$lang->action->search->label['confirmed']           = $lang->action->label->confirmed;   
-$lang->action->search->label['bugconfirmed']        = $lang->action->label->bugconfirmed;       
-$lang->action->search->label['tostory']             = $lang->action->label->tostory;            
-$lang->action->search->label['frombug']             = $lang->action->label->frombug;            
-$lang->action->search->label['totask']              = $lang->action->label->totask;             
-$lang->action->search->label['svncommited']         = $lang->action->label->svncommited;        
-$lang->action->search->label['gitcommited']         = $lang->action->label->gitcommited;        
-$lang->action->search->label['linked2plan']         = $lang->action->label->linked2plan;        
-$lang->action->search->label['unlinkedfromplan']    = $lang->action->label->unlinkedfromplan;   
-$lang->action->search->label['linked2project']      = $lang->action->label->linked2project;     
+$lang->action->search->label['created']             = $lang->action->label->created;
+$lang->action->search->label['opened']              = $lang->action->label->opened;
+$lang->action->search->label['changed']             = $lang->action->label->changed;
+$lang->action->search->label['edited']              = $lang->action->label->edited;
+$lang->action->search->label['assigned']            = $lang->action->label->assigned;
+$lang->action->search->label['closed']              = $lang->action->label->closed;
+$lang->action->search->label['deleted']             = $lang->action->label->deleted;
+$lang->action->search->label['deletedfile']         = $lang->action->label->deletedfile;
+$lang->action->search->label['editfile']            = $lang->action->label->editfile;
+$lang->action->search->label['erased']              = $lang->action->label->erased;
+$lang->action->search->label['undeleted']           = $lang->action->label->undeleted;
+$lang->action->search->label['hidden']              = $lang->action->label->hidden;
+$lang->action->search->label['commented']           = $lang->action->label->commented;
+$lang->action->search->label['activated']           = $lang->action->label->activated;
+$lang->action->search->label['resolved']            = $lang->action->label->resolved;
+$lang->action->search->label['reviewed']            = $lang->action->label->reviewed;
+$lang->action->search->label['moved']               = $lang->action->label->moved;
+$lang->action->search->label['confirmed']           = $lang->action->label->confirmed;
+$lang->action->search->label['bugconfirmed']        = $lang->action->label->bugconfirmed;
+$lang->action->search->label['tostory']             = $lang->action->label->tostory;
+$lang->action->search->label['frombug']             = $lang->action->label->frombug;
+$lang->action->search->label['totask']              = $lang->action->label->totask;
+$lang->action->search->label['svncommited']         = $lang->action->label->svncommited;
+$lang->action->search->label['gitcommited']         = $lang->action->label->gitcommited;
+$lang->action->search->label['linked2plan']         = $lang->action->label->linked2plan;
+$lang->action->search->label['unlinkedfromplan']    = $lang->action->label->unlinkedfromplan;
+$lang->action->search->label['marked']              = $lang->action->label->marked;
+$lang->action->search->label['linked2project']      = $lang->action->label->linked2project;
 $lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject;
-$lang->action->search->label['started']             = $lang->action->label->started;            
-$lang->action->search->label['canceled']            = $lang->action->label->canceled;           
-$lang->action->search->label['finished']            = $lang->action->label->finished;           
-$lang->action->search->label['login']               = $lang->action->label->login;              
-$lang->action->search->label['logout']              = $lang->action->label->logout;             
+$lang->action->search->label['started']             = $lang->action->label->started;
+$lang->action->search->label['recordestimate']      = $lang->action->label->recordestimate;
+$lang->action->search->label['editestimate']        = $lang->action->label->editestimate;
+$lang->action->search->label['canceled']            = $lang->action->label->canceled;
+$lang->action->search->label['finished']            = $lang->action->label->finished;
+$lang->action->search->label['login']               = $lang->action->label->login;
+$lang->action->search->label['logout']              = $lang->action->label->logout;
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 005c695edf..806d163339 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -170,36 +170,39 @@ $lang->action->search->objectTypeList['productplan'] = '计划';
 
 /* 用来在动态显示中显示动作 */
 $lang->action->search->label['']                    = '';
-$lang->action->search->label['created']             = $lang->action->label->created;            
-$lang->action->search->label['opened']              = $lang->action->label->opened;             
-$lang->action->search->label['changed']             = $lang->action->label->changed;            
-$lang->action->search->label['edited']              = $lang->action->label->edited;             
-$lang->action->search->label['assigned']            = $lang->action->label->assigned;           
-$lang->action->search->label['closed']              = $lang->action->label->closed;             
-$lang->action->search->label['deleted']             = $lang->action->label->deleted;            
-$lang->action->search->label['deletedfile']         = $lang->action->label->deletedfile;        
-$lang->action->search->label['editfile']            = $lang->action->label->editfile;           
-$lang->action->search->label['erased']              = $lang->action->label->erased;             
-$lang->action->search->label['undeleted']           = $lang->action->label->undeleted;          
-$lang->action->search->label['hidden']              = $lang->action->label->hidden;          
-$lang->action->search->label['commented']           = $lang->action->label->commented;          
-$lang->action->search->label['activated']           = $lang->action->label->activated;          
-$lang->action->search->label['resolved']            = $lang->action->label->resolved;           
-$lang->action->search->label['reviewed']            = $lang->action->label->reviewed;           
-$lang->action->search->label['moved']               = $lang->action->label->moved;              
-$lang->action->search->label['confirmed']           = $lang->action->label->confirmed;   
-$lang->action->search->label['bugconfirmed']        = $lang->action->label->bugconfirmed;       
-$lang->action->search->label['tostory']             = $lang->action->label->tostory;            
-$lang->action->search->label['frombug']             = $lang->action->label->frombug;            
-$lang->action->search->label['totask']              = $lang->action->label->totask;             
-$lang->action->search->label['svncommited']         = $lang->action->label->svncommited;        
-$lang->action->search->label['gitcommited']         = $lang->action->label->gitcommited;        
-$lang->action->search->label['linked2plan']         = $lang->action->label->linked2plan;        
-$lang->action->search->label['unlinkedfromplan']    = $lang->action->label->unlinkedfromplan;   
-$lang->action->search->label['linked2project']      = $lang->action->label->linked2project;     
+$lang->action->search->label['created']             = $lang->action->label->created;
+$lang->action->search->label['opened']              = $lang->action->label->opened;
+$lang->action->search->label['changed']             = $lang->action->label->changed;
+$lang->action->search->label['edited']              = $lang->action->label->edited;
+$lang->action->search->label['assigned']            = $lang->action->label->assigned;
+$lang->action->search->label['closed']              = $lang->action->label->closed;
+$lang->action->search->label['deleted']             = $lang->action->label->deleted;
+$lang->action->search->label['deletedfile']         = $lang->action->label->deletedfile;
+$lang->action->search->label['editfile']            = $lang->action->label->editfile;
+$lang->action->search->label['erased']              = $lang->action->label->erased;
+$lang->action->search->label['undeleted']           = $lang->action->label->undeleted;
+$lang->action->search->label['hidden']              = $lang->action->label->hidden;
+$lang->action->search->label['commented']           = $lang->action->label->commented;
+$lang->action->search->label['activated']           = $lang->action->label->activated;
+$lang->action->search->label['resolved']            = $lang->action->label->resolved;
+$lang->action->search->label['reviewed']            = $lang->action->label->reviewed;
+$lang->action->search->label['moved']               = $lang->action->label->moved;
+$lang->action->search->label['confirmed']           = $lang->action->label->confirmed;
+$lang->action->search->label['bugconfirmed']        = $lang->action->label->bugconfirmed;
+$lang->action->search->label['tostory']             = $lang->action->label->tostory;
+$lang->action->search->label['frombug']             = $lang->action->label->frombug;
+$lang->action->search->label['totask']              = $lang->action->label->totask;
+$lang->action->search->label['svncommited']         = $lang->action->label->svncommited;
+$lang->action->search->label['gitcommited']         = $lang->action->label->gitcommited;
+$lang->action->search->label['linked2plan']         = $lang->action->label->linked2plan;
+$lang->action->search->label['unlinkedfromplan']    = $lang->action->label->unlinkedfromplan;
+$lang->action->search->label['marked']              = $lang->action->label->marked;
+$lang->action->search->label['linked2project']      = $lang->action->label->linked2project;
 $lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject;
-$lang->action->search->label['started']             = $lang->action->label->started;            
-$lang->action->search->label['canceled']            = $lang->action->label->canceled;           
-$lang->action->search->label['finished']            = $lang->action->label->finished;           
-$lang->action->search->label['login']               = $lang->action->label->login;              
-$lang->action->search->label['logout']              = $lang->action->label->logout;             
+$lang->action->search->label['started']             = $lang->action->label->started;
+$lang->action->search->label['recordestimate']      = $lang->action->label->recordestimate;
+$lang->action->search->label['editestimate']        = $lang->action->label->editestimate;
+$lang->action->search->label['canceled']            = $lang->action->label->canceled;
+$lang->action->search->label['finished']            = $lang->action->label->finished;
+$lang->action->search->label['login']               = $lang->action->label->login;
+$lang->action->search->label['logout']              = $lang->action->label->logout;