fix(git): clean up in-progress merge/rebase banner
Use the real status-warning tokens (--status-warning-bg did not exist, so the card rendered without a fill), drop the decorative icons, and fold the conflict count into the title as a single full-message key per locale. The operation description now wraps instead of truncating, and both the conflict and ready-to-continue states share the same action layout.
This commit is contained in:
@@ -2023,12 +2023,15 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.operation.abort': 'Przerwij',
|
||||
'gitView.operation.continue': 'Kontynuuj',
|
||||
'gitView.operation.inProgressTitle': 'Operacja w toku',
|
||||
'gitView.operation.inProgressTitleManyConflicts': '{operation} w toku: {count} konfliktów',
|
||||
'gitView.operation.inProgressTitleOneConflict': '{operation} w toku: {count} konflikt',
|
||||
'gitView.operation.merge': 'Scal',
|
||||
'gitView.operation.mergeInProgressWithHead': 'Trwa scalanie z HEAD',
|
||||
'gitView.operation.mergingMessage': 'Trwa scalanie',
|
||||
'gitView.operation.rebase': 'Rebase',
|
||||
'gitView.operation.rebaseInProgress': 'Trwa rebase',
|
||||
'gitView.operation.rebasingOnto': 'Wykonywanie rebase na',
|
||||
'gitView.operation.readyToContinueHint': 'Wszystkie konflikty rozwiązane. Kontynuuj, aby zakończyć operację.',
|
||||
'gitView.operation.resolveConflictsHint': 'Rozwiąż konflikty, aby kontynuować.',
|
||||
'gitView.operation.resolveWithAi': 'Rozwiąż za pomocą AI',
|
||||
'gitView.pr.actions.add': 'Dodaj',
|
||||
|
||||
Reference in New Issue
Block a user