|
|
63.
|
|
|
No merge conflicts, ready to commit
|
|
|
|
|
머지 충돌이 없습니다. 커밋할 수 있습니다.
|
|
Translated by
nvu
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:332 tortoisehg/hgqt/merge.py:425
|
|
|
64.
|
|
|
Commit backout and merge results
|
|
|
|
|
커밋 철회 및 결과 병합
|
|
Translated by
JK Kim
|
|
Reviewed by
JK Kim
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:366
|
|
|
65.
|
|
|
Parents
|
|
|
|
|
부모 리비전
|
|
Translated by
nvu
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:378 tortoisehg/hgqt/matching.py:124
tortoisehg/hgqt/merge.py:469
|
|
|
66.
|
|
|
Working Directory
|
|
|
|
|
작업 디렉토리
|
|
Translated by
강우진
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:382 tortoisehg/hgqt/customtools.py:771
tortoisehg/hgqt/merge.py:473 tortoisehg/hgqt/repomodel.py:767
tortoisehg/hgqt/repomodel.py:769 tortoisehg/hgqt/revdetails.py:635
tortoisehg/hgqt/shelve.py:48 tortoisehg/hgqt/thgimport.py:122
|
|
|
67.
|
|
|
Working Directory (merged)
|
|
|
|
|
작업 디렉토리(병합)
|
|
Translated by
강우진
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:422 tortoisehg/hgqt/merge.py:510
|
|
|
68.
|
|
|
Commit message
|
|
|
|
|
커밋 메시지
|
|
Translated by
NO vCJD
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:430 tortoisehg/hgqt/merge.py:519
|
|
|
69.
|
|
|
Skip final confirmation page, close after commit.
|
|
|
|
|
최종 확인 페이지를 건너뛰고, 커밋 후에 창을 닫습니다.
|
|
Translated and reviewed by
JK Kim
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:454 tortoisehg/hgqt/merge.py:545
|
|
|
70.
|
|
|
Backed out changeset:
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
백아웃한 변경사항:
|
|
Translated by
nvu
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:462 tortoisehg/hgqt/backout.py:489
|
|
|
71.
|
|
|
Confirm Discard Message
|
|
|
|
|
삭제 메세지를 확인합니다.
|
|
Translated by
hklee002
|
|
Reviewed by
Inseok Lee
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:465 tortoisehg/hgqt/commit.py:850
|
|
|
72.
|
|
|
Discard current backout message?
|
|
|
|
|
현재 백아웃 메시지를 파기하시겠습니까?
|
|
Translated by
nvu
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:466
|
