Fix bug 16408.
This commit is contained in:
@@ -9,15 +9,14 @@ $lang->branch->manageTitle = '%s Management';
|
||||
$lang->branch->all = 'All ';
|
||||
$lang->branch->main = 'Main';
|
||||
|
||||
$lang->branch->edit = 'Edit';
|
||||
$lang->branch->editAction = 'Edit %s';
|
||||
$lang->branch->editBranch = 'Edit Branch';
|
||||
$lang->branch->edit = 'Edit %s';
|
||||
$lang->branch->editAction = 'Edit Branch';
|
||||
$lang->branch->activate = 'Activate';
|
||||
$lang->branch->activateAction = 'Activate Branch';
|
||||
$lang->branch->close = 'Close';
|
||||
$lang->branch->closeAction = 'Close Branch';
|
||||
$lang->branch->create = 'Create %s';
|
||||
$lang->branch->createBranch = 'Create Branch';
|
||||
$lang->branch->createAction = 'Create Branch';
|
||||
$lang->branch->merge = 'Merge';
|
||||
$lang->branch->batchEdit = 'Batch Edit';
|
||||
$lang->branch->defaultBranch = 'Default Branch';
|
||||
|
||||
@@ -9,15 +9,14 @@ $lang->branch->manageTitle = '%s管理';
|
||||
$lang->branch->all = '所有';
|
||||
$lang->branch->main = '主干';
|
||||
|
||||
$lang->branch->edit = '编辑';
|
||||
$lang->branch->editAction = '编辑%s';
|
||||
$lang->branch->editBranch = '编辑分支';
|
||||
$lang->branch->edit = '编辑%s';
|
||||
$lang->branch->editAction = '编辑分支';
|
||||
$lang->branch->activate = '激活';
|
||||
$lang->branch->activateAction = '激活分支';
|
||||
$lang->branch->close = '关闭';
|
||||
$lang->branch->closeAction = '关闭分支';
|
||||
$lang->branch->create = '新增%s';
|
||||
$lang->branch->createBranch = '新增分支';
|
||||
$lang->branch->createAction = '新增分支';
|
||||
$lang->branch->merge = '合并';
|
||||
$lang->branch->batchEdit = '批量编辑';
|
||||
$lang->branch->defaultBranch = '默认分支';
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='main-header'>
|
||||
<h2><?php echo sprintf($lang->branch->editAction, $lang->product->branchName[$product->type]);?></h2>
|
||||
<h2><?php echo sprintf($lang->branch->edit, $lang->product->branchName[$product->type]);?></h2>
|
||||
</div>
|
||||
<form class='main-form' method='post' target='hiddenwin'>
|
||||
<table class='table table-form'>
|
||||
|
||||
@@ -421,8 +421,8 @@ $lang->product->methodOrder[105] = 'unbindWhitelist';
|
||||
/* Branch. */
|
||||
$lang->resource->branch = new stdclass();
|
||||
$lang->resource->branch->manage = 'manage';
|
||||
$lang->resource->branch->create = 'createBranch';
|
||||
$lang->resource->branch->edit = 'editBranch';
|
||||
$lang->resource->branch->create = 'createAction';
|
||||
$lang->resource->branch->edit = 'editAction';
|
||||
$lang->resource->branch->close = 'closeAction';
|
||||
$lang->resource->branch->activate = 'activateAction';
|
||||
$lang->resource->branch->sort = 'sort';
|
||||
|
||||
Reference in New Issue
Block a user