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/es.ts
+5 -5
View File
@@ -499,14 +499,14 @@ export const dict: Record<I18nKey, string> = {
"gitView.integrate.toMoveCount": "Commits por mover",
"gitView.operation.abort": "Abortar",
"gitView.operation.continue": "Continuar",
"gitView.operation.inProgressTitle": "Operación en progreso",
"gitView.operation.inProgressTitle": "{operation} en progreso",
"gitView.operation.merge": "Merge",
"gitView.operation.mergeInProgressWithHead": "Merge en progreso",
"gitView.operation.mergingMessage": "Fusionando...",
"gitView.operation.mergeInProgressWithHead": "Haciendo merge de {head}",
"gitView.operation.mergingMessage": "Haciendo merge: {message}",
"gitView.operation.rebase": "Rebase",
"gitView.operation.rebaseInProgress": "Rebase en progreso",
"gitView.operation.rebasingOnto": "Haciendo rebase",
"gitView.operation.resolveConflictsHint": "Resuelve los conflictos para continuar.",
"gitView.operation.rebasingOnto": "Haciendo rebase de {headName} sobre {onto}",
"gitView.operation.resolveConflictsHint": "Resuelve los conflictos y luego continúa la operación.",
"gitView.operation.resolveWithAi": "Resolver con IA",
"gitView.stash.confirmButton": "Guardar cambios y continuar",
"gitView.stash.description": "Tienes cambios sin commit que podrían sobrescribirse. Guárdalos temporalmente antes de continuar.",