diff --git a/trunk/module/common/control.php b/trunk/module/common/control.php
index 79b0b3c595..483e6ce99e 100644
--- a/trunk/module/common/control.php
+++ b/trunk/module/common/control.php
@@ -144,25 +144,50 @@ EOT;
     /* 打印模块的菜单。*/
     public static function printModuleMenu($moduleName)
     {
-        global $lang;
+        global $lang, $app;
+
+        /* 没有设置菜单，直接退出。*/
         if(!isset($lang->$moduleName->menu)) {echo "<ul></ul>"; return;}
-        $submenus = $lang->$moduleName->menu;  
+
+        /* 获得菜单设置，并记录当前的模块名和方法名。*/
+        $submenus      = $lang->$moduleName->menu;  
+        $currentModule = $app->getModuleName();
+        $currentMethod = $app->getMethodName();
+
+        /* 菜单开始。*/
         echo "<ul>\n";
+
+        /* 循环处理每一个菜单项。*/
         foreach($submenus as $submenu)
         {
-            if(strpos($submenu, '|') === false)
+            /* 初始化设置。*/
+            $link      = $submenu;
+            $subModule = '';
+            $alias     = '';
+            $float     = '';
+            $active    = '';
+
+            /* 如果该菜单是以数组的形式配置的，则覆盖上面的默认设置。*/
+            if(is_array($submenu)) extract($submenu);
+
+            /* 打印菜单。*/
+            if(strpos($link, '|') === false)
             {
-                echo "<li>$submenu</li>\n";
+                echo "<li>$link</li>\n";
             }
             else
             {
-                $submenu = explode('|', $submenu);
-                list($label, $module, $method, $vars) = $submenu;
+                $link = explode('|', $link);
+                list($label, $module, $method) = $link;
+                $vars = isset($link[3]) ? $link[3] : '';
                 if(common::hasPriv($module, $method))
                 {
                     global $app;
-                    $float  = count($submenu) == 4 ? 'left' : 'right';
-                    $active = $app->getMethodName() == $method ? 'active' : '';
+
+                    /* 判断是否应该设置激活。*/
+                    if($currentModule == $subModule) $active = 'active';
+                    if($module == $currentModule and ($method == $currentMethod or strpos($alias, $currentMethod) !== false)) $active = 'active';
+
                     echo "<li class='$float $active'>" . html::a(helper::createLink($module, $method, $vars), $label) . "</li>\n";
                 }
             }
diff --git a/trunk/module/common/lang/zh-cn.php b/trunk/module/common/lang/zh-cn.php
index 24cba7dbbf..ea812416ec 100644
--- a/trunk/module/common/lang/zh-cn.php
+++ b/trunk/module/common/lang/zh-cn.php
@@ -41,7 +41,7 @@ $lang->zentaoSite = "瀹樻柟缃戠珯";
 $lang->myControl  = "鎴戠殑鍦扮洏";
 $lang->sponser    = "<a href='http://www.pujia.com' target='_blank'>鏅姞璧炲姪</a>";
 
-/* 鑿滃崟璁剧疆锛氶《绾х殑tab銆�*/
+/* 涓诲鑸彍鍗曘��*/
 $lang->menu->index   = '棣栭〉|index|index';
 $lang->menu->my      = '鎴戠殑鍦扮洏|my|index';
 $lang->menu->product = '浜у搧瑙嗗浘|product|index';
@@ -50,33 +50,44 @@ $lang->menu->qa      = 'QA瑙嗗浘|qa|index';
 $lang->menu->company = '缁勭粐瑙嗗浘|company|index';
 $lang->menu->admin   = '鍚庡彴绠＄悊|admin|index';
 
-/*鑿滃崟璁剧疆锛氫笅绾ц彍鍗曘��*/
-$lang->index->menu[]   = '娴忚浜у搧|product|browse|';
-$lang->index->menu[]   = '娴忚椤圭洰|project|browse|';
+/* 棣栭〉鑿滃崟璁剧疆銆�*/
+$lang->index->menu->product = '娴忚浜у搧|product|browse';
+$lang->index->menu->project = '娴忚椤圭洰|project|browse';
 
-$lang->my->menu[]      = '鎴戠殑TODO|my|todo|';
-$lang->my->menu[]      = '鎴戠殑浠诲姟|my|task|';
-$lang->my->menu[]      = '鎴戠殑椤圭洰|my|project|';
-$lang->my->menu[]      = '鎴戠殑Bug|my|bug|';
-$lang->my->menu[]      = '鎴戠殑妗ｆ|my|editprofile|';
+/* 鎴戠殑鍦扮洏鑿滃崟璁剧疆銆�*/
+$lang->my->menu->account  = '%s' . $lang->arrow;
+$lang->my->menu->todo     = array('link' => '鎴戠殑TODO|my|todo|', 'subModule' => 'todo');
+$lang->my->menu->task     = '鎴戠殑浠诲姟|my|task|';
+$lang->my->menu->project  = '鎴戠殑椤圭洰|my|project|';
+$lang->my->menu->bug      = '鎴戠殑Bug|my|bug|';
+$lang->my->menu->profile  = array('link' => '鎴戠殑妗ｆ|my|profile|', 'alias' => 'editprofile');
+$lang->todo->menu         = $lang->my->menu;
 
+/* 浜у搧瑙嗗浘璁剧疆銆�*/
+$lang->product->menu->list   = '%s';
+$lang->product->menu->story  = '闇�姹傚垪琛▅product|browse|productID=%s';
+$lang->product->menu->create = array('link' => '鏂板浜у搧|product|create', 'float' => 'right');
 
-$lang->project->menu[] = '鏂板椤圭洰|project|create|';
-$lang->project->menu[] = '娴忚椤圭洰|project|browse|';
+/* 椤圭洰瑙嗗浘鑿滃崟璁剧疆銆�*/
+$lang->project->menu->create = '鏂板椤圭洰|project|create';
+$lang->project->menu->browse = '娴忚椤圭洰|project|browse';
 
-$lang->bug->menu[]      = '缂洪櫡绠＄悊|bug|index|';
-$lang->bug->menu[]      = '鐢ㄤ緥绠＄悊|testcase|index|';
-$lang->testcase->menu[] = '缂洪櫡绠＄悊|bug|index|';
-$lang->testcase->menu[] = '鐢ㄤ緥绠＄悊|testcase|index|';
+/* QA瑙嗗浘鑿滃崟璁剧疆銆�*/
+$lang->bug->menu->bug      = '缂洪櫡绠＄悊|bug|browse';
+$lang->bug->menu->testcase = '鐢ㄤ緥绠＄悊|testcase|browse';
+$lang->testcase->menu      = $lang->bug->menu;
 
-$lang->company->menu[] = '缁勭粐缁撴瀯|company|index|';
+/* 缁勭粐缁撴瀯瑙嗗浘鑿滃崟璁剧疆銆�*/
+$lang->company->menu->browse = '缁勭粐缁撴瀯|company|browse';
 
-$lang->admin->menu[]   = '娴忚鍏徃|admin|browsecompany|';
-$lang->admin->menu[]   = '鏂板鍏徃|company|create|';
-$lang->admin->menu[]   = '娴忚鍒嗙粍|admin|browsegroup|';
-$lang->admin->menu[]   = '鏂板鍒嗙粍|group|create|';
-$lang->admin->menu[]   = '娴忚鐢ㄦ埛|admin|browseuser|';
-$lang->admin->menu[]   = '鏂板鐢ㄦ埛|user|create|';
+/* 鍚庡彴绠＄悊鑿滃崟璁剧疆銆�*/
+$lang->admin->menu->browseCompany = '娴忚鍏徃|admin|browsecompany';
+$lang->admin->menu->createCompany = '鏂板鍏徃|company|create';
+$lang->admin->menu->browseGroup   = '娴忚鍒嗙粍|admin|browsegroup';
+$lang->admin->menu->createGroup   = '鏂板鍒嗙粍|group|create';
+$lang->admin->menu->browseUser    = '娴忚鐢ㄦ埛|admin|browseuser';
+$lang->admin->menu->createUser    = '鏂板鐢ㄦ埛|user|create';
+$lang->group->menu = $lang->admin->menu;
 
 /*鑿滃崟璁剧疆锛氬垎缁勮缃��*/
 $lang->menugroup->release = 'product';
@@ -102,6 +113,8 @@ $lang->error->float           = "銆�%s銆忓簲褰撴槸鏁板瓧锛屽彲浠ユ槸灏忔暟銆�";
 $lang->error->email           = "銆�%s銆忓簲褰撲负鍚堟硶鐨凟MAIL銆�";
 $lang->error->date            = "銆�%s銆忓簲褰撲负鍚堟硶鐨勬棩鏈熴��";
 $lang->error->account         = "銆�%s銆忓簲褰撲负鍚堟硶鐨勭敤鎴峰悕銆�";
+$lang->error->passwordsame    = "涓ゆ瀵嗙爜搴斿綋鐩哥瓑銆�";
+$lang->error->passwordrule    = "瀵嗙爜搴旇绗﹀悎瑙勫垯銆�";
 
 /* 鍒嗛〉淇℃伅銆�*/
 $lang->pager->noRecord  = "鏆傛椂娌℃湁璁板綍";