BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve git operation progress banner

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/lib/i18n/messages/en.ts
+6 -6
View File
@@ -498,14 +498,14 @@ export const dict = {
'gitView.integrate.toMoveCount': 'To Move Count',
'gitView.operation.abort': 'Abort',
'gitView.operation.continue': 'Continue',
'gitView.operation.inProgressTitle': 'In Progress Title',
'gitView.operation.inProgressTitle': '{operation} in progress',
'gitView.operation.merge': 'Merge',
'gitView.operation.mergeInProgressWithHead': 'Merge In Progress With Head',
'gitView.operation.mergingMessage': 'Merging Message',
'gitView.operation.mergeInProgressWithHead': 'Merging {head}',
'gitView.operation.mergingMessage': 'Merging: {message}',
'gitView.operation.rebase': 'Rebase',
'gitView.operation.rebaseInProgress': 'Rebase In Progress',
'gitView.operation.rebasingOnto': 'Rebasing Onto',
'gitView.operation.resolveConflictsHint': 'Resolve Conflicts Hint',
'gitView.operation.rebaseInProgress': 'Rebase in progress',
'gitView.operation.rebasingOnto': 'Rebasing {headName} onto {onto}',
'gitView.operation.resolveConflictsHint': 'Resolve conflicts, then continue the operation.',
'gitView.operation.resolveWithAi': 'Resolve with AI',
'gitView.stash.confirmButton': 'Confirm Button',
'gitView.stash.description': 'Description',