Wonjun Hong 2017-08-31
Message: Modify the confused expression
@532947f096385ab57ed32f7854f1f162c2169d15
app/views/git/partial_info.scala.html
--- app/views/git/partial_info.scala.html
+++ app/views/git/partial_info.scala.html
@@ -65,10 +65,10 @@
     @if(isAllowed(UserApp.currentUser(), pull.asResource(), Operation.ACCEPT)) {
         @if(pull.isAcceptable){
             <a id="btnAccept" href="@routes.PullRequestApp.accept(project.owner, project.name, pull.number)" data-request-method="post"
-               class="ybtn ybtn-success">@Messages("pullRequest.accept")</a>
+               class="ybtn ybtn-success">@Messages("pullRequest.merge")</a>
         } else {
             <button class="ybtn ybtn-disabled" data-toggle="tooltip" data-placement="top"
-               title="@pull.getMessageForDisabledAcceptButton">@Messages("pullRequest.accept")</button>
+               title="@pull.getMessageForDisabledAcceptButton">@Messages("pullRequest.merge")</button>
         }
     }
 </div>
conf/messages
--- conf/messages
+++ conf/messages
@@ -636,7 +636,7 @@
 project.readme.create = create README
 project.recently.visited = Recently visited
 project.reviewer.count = Reviewer
-project.reviewer.count.description = of reviewers is required to accept pull request.
+project.reviewer.count.description = of reviewers is required to merge pull request.
 project.reviewer.count.disable = Disable
 project.reviewer.count.enable = Enable
 project.searchPlaceholder = Search current project
@@ -687,7 +687,7 @@
 project.you.may.want.to.be.a.member = You can send a sign-up request for {0} project.
 project.you.want.to.be.a.member = You have sent a sign-up request for {0} project.
 pullRequest = Pull request
-pullRequest.accept = Accept
+pullRequest.merge = Merge
 pullRequest.additional.changes = Additional changes
 pullRequest.back.to.the.pullrequest = Back to pull request.
 pullRequest.body.required = Enter pull request description.
@@ -765,7 +765,7 @@
 pullRequest.resolver.step9 = After rebasing, push it to origin.
 pullRequest.restore.branch = Restore branch
 pullRequest.restore.frombranch.message = Branch can be restored.
-pullRequest.review = Reviewed
+pullRequest.review = Approve
 pullRequest.review.closed = Closed review
 pullRequest.review.open = Open review
 pullRequest.review.participants = <strong>{0}</strong> participants
conf/messages.ko-KR
--- conf/messages.ko-KR
+++ conf/messages.ko-KR
@@ -686,7 +686,7 @@
 project.you.may.want.to.be.a.member = {0} 프로젝트 멤버로 등록 요청을 할 수 있습니다.
 project.you.want.to.be.a.member = {0} 프로젝트 멤버로 등록 요청했습니다.
 pullRequest = 코드 보내기
-pullRequest.accept = 코드 받기
+pullRequest.merge = 코드 병합
 pullRequest.additional.changes = 추가 변경 내역
 pullRequest.back.to.the.pullrequest = 코드 주고받기로 돌아가기
 pullRequest.body.required = 내용을 입력하세요.
@@ -764,7 +764,7 @@
 pullRequest.resolver.step9 = rebase가 끝났다면 origin으로 코드를 강제 푸쉬 합니다.
 pullRequest.restore.branch = 브랜치 복구
 pullRequest.restore.frombranch.message = 브랜치를 복구할 수 있습니다.
-pullRequest.review = 리뷰 완료
+pullRequest.review = 리뷰 승인
 pullRequest.review.closed = 닫힌 리뷰
 pullRequest.review.open = 열린 리뷰
 pullRequest.review.participants = 참여자 <strong>{0}</strong>명
Add a comment
List