diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 57622d63d4..145105c2bb 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -83,6 +83,7 @@ $lang->action->desc->undeleted      = '$date, restored by <strong>$actor</strong
 $lang->action->desc->hidden         = '$date, hidden by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->commented      = '$date, added by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->activated      = '$date, activated by <strong>$actor</strong> .' . "\n";
+$lang->action->desc->blocked        = '$date, blocked by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->moved          = '$date, moved by <strong>$actor</strong> , which was "$extra".' . "\n";
 $lang->action->desc->confirmed      = '$date, <strong>$actor</strong> confirmed the change of Story. The latest version is <strong>#$extra</strong>.' . "\n";
 $lang->action->desc->caseconfirmed  = '$date, <strong>$actor</strong> confirmed the change of Case. The latest version is <strong>#$extra</strong>' . "\n";
@@ -124,6 +125,7 @@ $lang->action->label->undeleted           = 'Restored';
 $lang->action->label->hidden              = 'Hidden';
 $lang->action->label->commented           = 'Commented';
 $lang->action->label->activated           = 'Activated';
+$lang->action->label->blocked             = 'Blocked';
 $lang->action->label->resolved            = 'Resolved';
 $lang->action->label->reviewed            = 'Reviewed';
 $lang->action->label->moved               = 'Moved';
@@ -218,6 +220,7 @@ $lang->action->search->label['undeleted']           = $lang->action->label->unde
 $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['blocked']             = $lang->action->label->blocked;
 $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;
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 6a64d2e249..a86dc86077 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -83,6 +83,7 @@ $lang->action->desc->undeleted      = '$date, 由 <strong>$actor</strong> 还原
 $lang->action->desc->hidden         = '$date, 由 <strong>$actor</strong> 隐藏。' . "\n";
 $lang->action->desc->commented      = '$date, 由 <strong>$actor</strong> 添加备注。' . "\n";
 $lang->action->desc->activated      = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
+$lang->action->desc->blocked        = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
 $lang->action->desc->moved          = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
 $lang->action->desc->confirmed      = '$date, 由 <strong>$actor</strong> 确认需求变动，最新版本为<strong>#$extra</strong>。' . "\n";
 $lang->action->desc->caseconfirmed  = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
@@ -124,6 +125,7 @@ $lang->action->label->undeleted           = '还原了';
 $lang->action->label->hidden              = '隐藏了';
 $lang->action->label->commented           = '评论了';
 $lang->action->label->activated           = '激活了';
+$lang->action->label->blocked             = '阻塞了';
 $lang->action->label->resolved            = '解决了';
 $lang->action->label->reviewed            = '评审了';
 $lang->action->label->moved               = '移动了';
@@ -218,6 +220,7 @@ $lang->action->search->label['undeleted']           = $lang->action->label->unde
 $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['blocked']             = $lang->action->label->blocked;
 $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;
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 6d5dc1e727..de74d9952a 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -455,7 +455,7 @@ class testtask extends control
 
             if($this->post->comment != '' or !empty($changes))
             {
-                $actionID = $this->action->create('testtask', $taskID, 'Doinged', $this->post->comment);
+                $actionID = $this->action->create('testtask', $taskID, 'Activated', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 018b9fc6d2..84f6db166f 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -896,10 +896,10 @@ class testtaskModel extends model
     {
         $action = strtolower($action);
 
-        if($action == 'start')   return $testtask->status  == 'wait';
-        if($action == 'blocked') return ($testtask->status == 'doing'   || $testtask->status == 'wait');
-        if($action == 'doing')   return ($testtask->status == 'blocked' || $testtask->status == 'done');
-        if($action == 'close')   return $testtask->status != 'done';
+        if($action == 'start')    return $testtask->status  == 'wait';
+        if($action == 'block')    return ($testtask->status == 'doing'   || $testtask->status == 'wait');
+        if($action == 'activate') return ($testtask->status == 'blocked' || $testtask->status == 'done');
+        if($action == 'close')    return $testtask->status != 'done';
 
         return true;
     }