* Fix bug#17141

module/gitlab/js/managegroupmembers.js

@@ -41,6 +41,6 @@ function addItem(obj)
  */
 function deleteItem(obj)
 {
-    if($('#teamForm .table tbody').children().length < 2) return false;
+    if($('#teamForm .table-form tbody').children().length < 2) return false;
     $(obj).closest('tr').remove();
-}
+}

module/gitlab/js/manageprojectmembers.js

@@ -41,6 +41,6 @@ function addItem(obj)
  */
 function deleteItem(obj)
 {
-    if($('#teamForm .table tbody').children().length < 2) return false;
+    if($('#teamForm .table-form tbody').children().length < 2) return false;
     $(obj).closest('tr').remove();
-}
+}

module/mr/lang/zh-cn.php

@@ -102,7 +102,7 @@ $lang->mr->closeSuccess        = "已关闭合并请求。";
 
 $lang->mr->apiErrorMap[0] = "You can't use same project/branch for source and target";
 
-$lang->mr->errorLang[0] = '源项目分支不能和目标项目分支一样';
+$lang->mr->errorLang[0] = '源项目分支与目标项目分支不能相同';
 
 $lang->mr->from = "从";
 $lang->mr->to   = "合并到";