diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 63486d6497..abc02568cd 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -131,7 +131,7 @@ $lang->bug->allBugs            = '所有';
 $lang->bug->byQuery            = '搜索';
 $lang->bug->needConfirm        = "{$lang->storyCommon}变动";
 $lang->bug->allProduct         = '所有' . $lang->productCommon;
-$lang->bug->allProject         = '所有' . $lang->prodjetCommon;
+$lang->bug->allProject         = '所有' . $lang->projectCommon;
 $lang->bug->my                 = '我的';
 $lang->bug->yesterdayResolved  = '昨天解决Bug数';
 $lang->bug->yesterdayConfirmed = '昨天确认';
diff --git a/module/common/model.php b/module/common/model.php
index 44ec0dd2c0..253c16b14a 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -649,12 +649,12 @@ class commonModel extends model
                             $subActive .= 'dropdown-submenu';
                             $subLink = 'javascript:;';
                             $subProgram .= "<ul class='dropdown-menu'>";
-                            $subProgram .= '<li>' . html::a(helper::createLink('program', 'edit', "programID={$app->session->program}"), "<i class=icon-edit></i> " . "<span class='text'>{$lang->program->edit}</span>", '', "class='btn btn-link'") . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'group', "projectID={$app->session->program}", $program, 'button', 'group', '', '', '', '', $lang->program->group) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'manageMembers', "projectID={$app->session->program}", $program, 'button', 'persons', '', '', '', '', $lang->program->manageMembers) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'start', "projectID={$app->session->program}", $program, 'button', 'play', '', 'iframe', true, '', $lang->program->start) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'activate', "projectID={$app->session->program}", $program, 'button', 'magic', '', 'iframe', true, '', $lang->program->activate) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'suspend', "projectID={$app->session->program}", $program, 'button', 'pause', '', 'iframe', true, '', $lang->program->suspend) . '</li>';
+                            $subProgram .= '<li>' . html::a(helper::createLink('program', 'edit', "programID={$app->session->program}"), "<i class=icon-edit></i> " . "<span class='text'>{$lang->program->PRJEdit}</span>", '', "class='btn btn-link'") . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'group', "projectID={$app->session->program}", $program, 'button', 'group', '', '', '', '', $lang->program->PRJGroup) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'manageMembers', "projectID={$app->session->program}", $program, 'button', 'persons', '', '', '', '', $lang->program->PRJManageMembers) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'start', "projectID={$app->session->program}", $program, 'button', 'play', '', 'iframe', true, '', $lang->program->PRJStart) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'activate', "projectID={$app->session->program}", $program, 'button', 'magic', '', 'iframe', true, '', $lang->program->PRJActivate) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'suspend', "projectID={$app->session->program}", $program, 'button', 'pause', '', 'iframe', true, '', $lang->program->PRJSuspend) . '</li>';
                             $subProgram .= '</ul>';
                         }
 
diff --git a/module/program/control.php b/module/program/control.php
index c8805fa236..a105353743 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -997,6 +997,10 @@ class program extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->processErrors(dao::getError())));
 
             $this->loadModel('action')->create('project', $projectID, 'opened');
+            if($from == 'PGM')
+            {
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('PGMBrowse')));
+            }
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('PRJBrowse', array('programID' => $programID, 'browseType' => 'doing'))));
         }
 
diff --git a/module/program/view/prjbrowse.html.php b/module/program/view/prjbrowse.html.php
index ebcea32bb5..d1cd2df262 100644
--- a/module/program/view/prjbrowse.html.php
+++ b/module/program/view/prjbrowse.html.php
@@ -68,8 +68,8 @@ js::set('browseType', $browseType);
           <tr>
             <td><?php printf('%03d', $project->id);?></td>
             <td class='text-left' title="<?php echo $project->code;?>"><?php echo $project->code;?></td>
-            <td class='c-name text-left' title='<?php echo $project->name?>'>
-              <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);?>
+            <td class='text-left' title='<?php echo $project->name?>'>
+              <?php echo html::a($this->createLink('project', 'index', 'locate=no'), $project->name);?>
             </td>
             <td><?php echo zget($lang->program->statusList, $project->status);?></td>
             <td><?php echo $project->begin;?></td>
diff --git a/module/project/control.php b/module/project/control.php
index 1c6dee5a4b..6be581f157 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -2291,7 +2291,7 @@ class project extends control
     public function ajaxGetDropMenu($projectID, $module, $method, $extra)
     {
         $project = $this->project->getByID($projectID);
-        $program = $this->project->getByID($project->program);
+        $program = $this->project->getByID($project->parent);
 
         $this->view->link      = $this->project->getProjectLink($module, $method, $extra);
         $this->view->projectID = $projectID;