fix: improve git operation progress banner

Replace placeholder conflict text with localized copy
Split in-progress operation details and actions into clearer rows
Keep merge and rebase status messages consistent
This commit is contained in:
Bohdan Triapitsyn
2026-05-06 01:58:36 +03:00
parent 6a749ed259
commit a02f0cd7c7
7 changed files with 35 additions and 35 deletions
+4 -4
View File
@@ -499,14 +499,14 @@ export const dict: Record<I18nKey, string> = {
'gitView.integrate.toMoveCount': '이동할 커밋 수',
'gitView.operation.abort': '중단',
'gitView.operation.continue': '계속',
'gitView.operation.inProgressTitle': 'Git 작업 진행 중',
'gitView.operation.inProgressTitle': '{operation} 진행 중',
'gitView.operation.merge': '병합',
'gitView.operation.mergeInProgressWithHead': '{head} 병합 진행 중',
'gitView.operation.mergingMessage': '병합 중…',
'gitView.operation.mergingMessage': '병합 중: {message}',
'gitView.operation.rebase': '리베이스',
'gitView.operation.rebaseInProgress': '리베이스 진행 중',
'gitView.operation.rebasingOnto': '{branch} 위로 리베이스 중',
'gitView.operation.resolveConflictsHint': '충돌을 해결한 뒤 계속 진행하세요.',
'gitView.operation.rebasingOnto': '{headName}을(를) {onto} 위로 리베이스 중',
'gitView.operation.resolveConflictsHint': '충돌을 해결한 뒤 작업을 계속하세요.',
'gitView.operation.resolveWithAi': 'AI로 해결',
'gitView.stash.confirmButton': '확인',
'gitView.stash.description': '설명',