Alex/refactor bb rebase (#824)
* Refactor task_attempt branch handling and enforce NOT NULL constraint on branch column * Change backend rebase to no change base branch, add change target branch api * Change frontend rebase on branch to change target branch Change status to show ahead/behind, always show rebase * Use target branch for everything except rebase * Remove base_branch * Remove base branch frontend * add rebase dialog with target and upstream options * Fix unused upstream arg * Add i18n * Remove stray ts-rs file * dont show +0, -0 * Move upstream to foldable advanced rebase * Move buttons around * Move git state/actions into a component * Add task/target labels * Fix action buttons layout * Fmt * i18n * remove branch origin removal * Remove empty divs * Remove [1fr_auto_1fr] class in favour if divs * use theme colours, make gear icon bigger * Fix plural i18n * Remove legacy ui reducer
This commit is contained in:
@@ -7,5 +7,85 @@
|
||||
},
|
||||
"actions": {
|
||||
"addTask": "Agregar tarea"
|
||||
},
|
||||
"rebase": {
|
||||
"common": {
|
||||
"action": "Rebase",
|
||||
"inProgress": "Rebaseando...",
|
||||
"withTarget": "Rebase sobre {{branch}}"
|
||||
},
|
||||
"dialog": {
|
||||
"title": "Rebase del intento de tarea",
|
||||
"description": "Elige una nueva rama base para hacer rebase de este intento de tarea.",
|
||||
"upstreamLabel": "Rama upstream",
|
||||
"upstreamPlaceholder": "Selecciona una rama upstream",
|
||||
"targetLabel": "Rama de destino",
|
||||
"targetPlaceholder": "Selecciona una rama de destino",
|
||||
"advanced": "Avanzado"
|
||||
},
|
||||
"status": {
|
||||
"inProgress": "Rebase en progreso{{counts}}",
|
||||
"needed": "Rebase necesario{{dirty}}{{counts}}",
|
||||
"dirtyMarker": " (sucio)"
|
||||
}
|
||||
},
|
||||
"branches": {
|
||||
"changeTarget": {
|
||||
"dialog": {
|
||||
"title": "Cambiar rama de destino",
|
||||
"description": "Elige una nueva rama de destino para el intento de tarea.",
|
||||
"placeholder": "Selecciona una rama de destino",
|
||||
"action": "Cambiar rama",
|
||||
"inProgress": "Cambiando..."
|
||||
}
|
||||
}
|
||||
},
|
||||
"attempt": {
|
||||
"labels": {
|
||||
"attempt": "Intento",
|
||||
"agent": "Agente",
|
||||
"branch": "Rama",
|
||||
"diffs": "Diferencias"
|
||||
},
|
||||
"actions": {
|
||||
"openInIde": "Abrir en IDE",
|
||||
"openMenu": "Abrir menú",
|
||||
"startDevServer": "Iniciar servidor de desarrollo",
|
||||
"stopDevServer": "Detener servidor de desarrollo"
|
||||
}
|
||||
},
|
||||
"git": {
|
||||
"labels": {
|
||||
"taskBranch": "Rama de tarea"
|
||||
},
|
||||
"branch": {
|
||||
"current": "actual"
|
||||
},
|
||||
"status": {
|
||||
"commits_one": "commit",
|
||||
"commits_other": "commits",
|
||||
"conflicts": "Conflictos",
|
||||
"upToDate": "Al día",
|
||||
"ahead": "adelante",
|
||||
"behind": "atrás"
|
||||
},
|
||||
"states": {
|
||||
"merged": "¡Fusionado!",
|
||||
"merging": "Fusionando...",
|
||||
"merge": "Fusionar",
|
||||
"rebasing": "Rebaseando...",
|
||||
"rebase": "Rebase",
|
||||
"pushed": "¡Enviado!",
|
||||
"pushing": "Enviando...",
|
||||
"push": "Enviar",
|
||||
"creating": "Creando...",
|
||||
"createPr": "Crear PR"
|
||||
},
|
||||
"errors": {
|
||||
"changeTargetBranch": "Error al cambiar rama de destino",
|
||||
"pushChanges": "Error al enviar cambios",
|
||||
"mergeChanges": "Error al fusionar cambios",
|
||||
"rebaseBranch": "Error al hacer rebase de la rama"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user