diff --git a/module/branch/control.php b/module/branch/control.php
index 1dad07ae1b..fa7271c64b 100644
--- a/module/branch/control.php
+++ b/module/branch/control.php
@@ -93,7 +93,7 @@ class branch extends control
         {
             $this->app->loadLang('product');
             $productType = $this->branch->getProductType($branchID);
-            die(js::confirm(str_replace('%branch%', $this->lang->product->branchName[$productType], $this->lang->branch->confirmDelete), inlink('delete', "branchID=$branchID&confirm=yes")));
+            die(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmDelete), inlink('delete', "branchID=$branchID&confirm=yes")));
         }
 
         $this->branch->delete(TABLE_BRANCH, $branchID);
diff --git a/module/branch/lang/en.php b/module/branch/lang/en.php
index a547d42e8b..062fdf7d45 100644
--- a/module/branch/lang/en.php
+++ b/module/branch/lang/en.php
@@ -6,4 +6,4 @@ $lang->branch->delete = 'Branch delete';
 $lang->branch->manageTitle = '%s Manage';
 $lang->branch->all = 'All ';
 
-$lang->branch->confirmDelete = '%branch% deletion, will affect the %branch% of the demand, module, plan, release, Bug, testcase and so on, please consider carefully. Are you sure delete the %branch%?';
+$lang->branch->confirmDelete = '@branch@ deletion, will affect the @branch@ of the demand, module, plan, release, Bug, testcase and so on, please consider carefully. Are you sure delete the @branch@?';
diff --git a/module/branch/lang/zh-cn.php b/module/branch/lang/zh-cn.php
index f1b9a2eba2..ac2e1d901f 100644
--- a/module/branch/lang/zh-cn.php
+++ b/module/branch/lang/zh-cn.php
@@ -6,4 +6,4 @@ $lang->branch->delete = '分支删除';
 $lang->branch->manageTitle = '%s管理';
 $lang->branch->all         = '所有';
 
-$lang->branch->confirmDelete = '%branch%删除，会影响关联该%branch%的需求、模块、计划、发布、Bug、用例等等，请慎重考虑。是否删除该%branch%';
+$lang->branch->confirmDelete = '@branch@删除，会影响关联该@branch@的需求、模块、计划、发布、Bug、用例等等，请慎重考虑。是否删除该@branch@';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 78ff63cea0..7e86d2bac8 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -174,7 +174,7 @@ $lang->product->menu->plan    = array('link' => 'Plan|productplan|browse|product
 $lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s',     'subModule' => 'release');
 $lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s';
 $lang->product->menu->doc     = array('link' => 'Doc|product|doc|productID=%s', 'subModule' => 'doc');
-$lang->product->menu->branch  = '%branch%|branch|manage|productID=%s';
+$lang->product->menu->branch  = '@branch@|branch|manage|productID=%s';
 $lang->product->menu->module  = 'Modules|tree|browse|productID=%s&view=story';
 $lang->product->menu->view    = array('link' => 'Info|product|view|productID=%s', 'alias' => 'edit');
 $lang->product->menu->project = "{$lang->projectCommon}s|product|project|status=all&productID=%s";
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index b292501294..e5488e8488 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -174,7 +174,7 @@ $lang->product->menu->plan    = array('link' => '计划|productplan|browse|produ
 $lang->product->menu->release = array('link' => '发布|release|browse|productID=%s',     'subModule' => 'release');
 $lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s';
 $lang->product->menu->doc     = array('link' => '文档|product|doc|productID=%s', 'subModule' => 'doc');
-$lang->product->menu->branch  = '%branch%|branch|manage|productID=%s';
+$lang->product->menu->branch  = '@branch@|branch|manage|productID=%s';
 $lang->product->menu->module  = '模块|tree|browse|productID=%s&view=story';
 $lang->product->menu->view    = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit');
 $lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
diff --git a/module/product/model.php b/module/product/model.php
index be82985f72..94f6bcfd52 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -70,7 +70,7 @@ class productModel extends model
         if($currentProduct->type != 'normal')
         {
             $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$currentProduct->type]);
-            $this->lang->product->menu->branch = str_replace('%branch%', $this->lang->product->branchName[$currentProduct->type], $this->lang->product->menu->branch);
+            $this->lang->product->menu->branch = str_replace('@branch@', $this->lang->product->branchName[$currentProduct->type], $this->lang->product->menu->branch);
             $branches   = $this->loadModel('branch')->getPairs($productID);
             $branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
             $output    .= '</li><li>';