diff options
Diffstat (limited to 'po/es.po')
| -rw-r--r-- | po/es.po | 14366 |
1 files changed, 9083 insertions, 5283 deletions
@@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-12-02 10:55+0800\n" -"PO-Revision-Date: 2018-12-01 23:16-0500\n" +"POT-Creation-Date: 2020-03-11 15:26+0800\n" +"PO-Revision-Date: 2020-03-11 23:18-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,40 +16,729 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.3\n" -#: advice.c:99 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "¿Ahh (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 +#: builtin/rebase.c:2086 builtin/rebase.c:2130 +msgid "could not read index" +msgstr "no se pudo leer índice" + +#: add-interactive.c:576 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binario" + +#: add-interactive.c:634 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "nada" + +#: add-interactive.c:635 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "sin cambios" + +#: add-interactive.c:672 git-add--interactive.perl:643 +msgid "Update" +msgstr "Actualizar" + +#: add-interactive.c:689 add-interactive.c:877 +#, c-format +msgid "could not stage '%s'" +msgstr "no se pudo poner en stage '%s'" + +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 +#: builtin/rebase.c:899 +msgid "could not write index" +msgstr "no se pudo escribir índice" + +#: add-interactive.c:698 git-add--interactive.perl:628 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "actualizada %d ruta\n" +msgstr[1] "actualizadas %d rutas\n" + +#: add-interactive.c:716 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s no es rastreado ahora.\n" + +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry falló para la ruta '%s'" + +#: add-interactive.c:751 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Revertir" + +#: add-interactive.c:767 +msgid "Could not parse HEAD^{tree}" +msgstr "no se pudo analizar HEAD^{tree}" + +#: add-interactive.c:805 git-add--interactive.perl:631 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "revertida %d ruta\n" +msgstr[1] "revertidas %d rutas\n" + +#: add-interactive.c:856 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "No hay archivos sin rastrear.\n" + +#: add-interactive.c:860 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Agregar no rastreados" + +#: add-interactive.c:887 git-add--interactive.perl:625 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "agregada %d ruta\n" +msgstr[1] "agregadas %d rutas\n" + +#: add-interactive.c:917 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "ignorando lo no fusionado: %s" + +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Solo cambiaron archivos binarios.\n" + +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "Sin cambios.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "Actualización del parche" + +#: add-interactive.c:974 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "Revisión de diff" + +#: add-interactive.c:1002 +msgid "show paths with changes" +msgstr "mostrar rutas con cambios" + +#: add-interactive.c:1004 +msgid "add working tree state to the staged set of changes" +msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage" + +#: add-interactive.c:1006 +msgid "revert staged set of changes back to the HEAD version" +msgstr "revertir conjunto de cambios en stage a la versión de HEAD" + +#: add-interactive.c:1008 +msgid "pick hunks and update selectively" +msgstr "elegir hunks y actualizar de forma selectiva" + +#: add-interactive.c:1010 +msgid "view diff between HEAD and index" +msgstr "ver diff entre HEAD e index" + +#: add-interactive.c:1012 +msgid "add contents of untracked files to the staged set of changes" +msgstr "" +"agregar contenidos de archivos sin rastrear al conjunto de cambios de stage" + +#: add-interactive.c:1020 add-interactive.c:1069 +msgid "Prompt help:" +msgstr "Mostrar ayuda:" + +#: add-interactive.c:1022 +msgid "select a single item" +msgstr "selecciona un único objeto" + +#: add-interactive.c:1024 +msgid "select a range of items" +msgstr "selecciona un rango de objetos" + +#: add-interactive.c:1026 +msgid "select multiple ranges" +msgstr "selecciona multiples rangos" + +#: add-interactive.c:1028 add-interactive.c:1073 +msgid "select item based on unique prefix" +msgstr "seleccionar objeto basado en prefijo único" + +#: add-interactive.c:1030 +msgid "unselect specified items" +msgstr "quitar objetos especificados" + +#: add-interactive.c:1032 +msgid "choose all items" +msgstr "escoger todos los objetos" + +#: add-interactive.c:1034 +msgid "(empty) finish selecting" +msgstr "(vacío) finalizar selección" + +#: add-interactive.c:1071 +msgid "select a numbered item" +msgstr "selecciona un objeto numerado" + +#: add-interactive.c:1075 +msgid "(empty) select nothing" +msgstr "(vacío) selecciona nada" + +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "*** Comandos ***" + +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "Ahora que" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "staged" +msgstr "rastreado" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "no rastreado" + +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 +msgid "path" +msgstr "ruta" + +#: add-interactive.c:1143 +msgid "could not refresh index" +msgstr "no se pudo refrescar el index" + +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "Adiós.\n" + +#: add-patch.c:33 git-add--interactive.perl:1428 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:34 git-add--interactive.perl:1429 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1430 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " +"para el área de stage." + +#: add-patch.c:40 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar stage a este hunk\n" +"n - no aplicar stage a este hunk\n" +"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" +"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" +"d - no aplicar stage a este hunk o a ninguno de los posteriores en este " +"archivo\n" + +#: add-patch.c:54 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " + +#: add-patch.c:55 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? " + +#: add-patch.c:56 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " +"para aplicar stash." + +#: add-patch.c:61 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar stash a este hunk\n" +"n - no aplicar stash a este hunk\n" +"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n" +"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" +"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n" + +#: add-patch.c:77 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:78 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:79 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " +"para sacar del área de stage." + +#: add-patch.c:84 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - sacar desde hunk del área de stage\n" +"n - no sacar este hunk del area de stage\n" +"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n" +"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" +"d - no sacar del area de stage este hunk o ninguno de los posteriores en el " +"archivo\n" + +#: add-patch.c:99 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " + +#: add-patch.c:100 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? " + +#: add-patch.c:101 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? " + +#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Si el parche aplica de forma limpia, el hunk editado sera marcado " +"inmediatamente para aplicar." + +#: add-patch.c:106 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar este hunk al índice\n" +"n - no aplicar este hunk al índice\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunko ninguno de los posteriores en el archivo\n" + +#: add-patch.c:121 git-add--interactive.perl:1448 +#: git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:122 git-add--interactive.perl:1449 +#: git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:123 git-add--interactive.perl:1450 +#: git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Si el parche aplica de forma limpia, el hunk editado sera marcado " +"inmediatamente para descarte." + +#: add-patch.c:128 add-patch.c:193 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - descartar este hunk del árbol de trabajo\n" +"n - no descartar este hunk del árbol de trabajo\n" +"q - quit; no descartar este hunk o ninguno de los que restantes\n" +"a - descartar este hunk y todos los posteriores en este archivo\n" +"d - no descartar este hunk o ninguno de los posteriores en el archivo\n" + +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:150 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - descartar este hunk del índice y el árbol de trabajo\n" +"n - no descartar este hunk del índice ni el árbol de trabajo\n" +"q - quit; no descartar este hunk o ninguno de los que quedan\n" +"a - descartar este hunk y todos los posteriores en este archivo\n" +"d - no descartar este hunk o ninguno posterior en el archivo\n" + +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d" +"%s,?]? " + +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:171 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar este hunk al índice y al árbol de trabajo\n" +"n - no aplicar este hunk al índice y al árbol de trabajo\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n" + +#: add-patch.c:214 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar este hunk al índice y al árbol de trabajo\n" +"n - no aplicar este hunk al índice y al árbol de trabajo\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n" + +#: add-patch.c:318 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "no se puede analizar hunk header '%.*s'" + +#: add-patch.c:337 add-patch.c:341 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "no se puede analizar hunk header '%.*s'" + +#: add-patch.c:395 +msgid "could not parse diff" +msgstr "no se puede analizar diff" + +#: add-patch.c:414 +msgid "could not parse colored diff" +msgstr "no se pudo analizar diff a colores" + +#: add-patch.c:428 +#, c-format +msgid "failed to run '%s'" +msgstr "falló al ejecutar '%s'" + +#: add-patch.c:587 +msgid "mismatched output from interactive.diffFilter" +msgstr "output de interactive.diffFilter no concuerda" + +#: add-patch.c:588 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" +"Tu filtro tiene que mantener correspondencia de uno a uno\n" +"entre las líneas de entrada y salida." + +#: add-patch.c:761 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"se esperaba línea de contexto #%d en\n" +"%.*s" + +#: add-patch.c:776 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"hunks no hacen overlap:\n" +"%.*s\n" +"\tno acaba con:\n" +"%.*s" + +#: add-patch.c:1052 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" + +#: add-patch.c:1056 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"Para eliminar '%c' líneas, haga de ellas líneas ' ' (contexto).\n" +"Para eliminar '%c' líneas, bórrelas.\n" +"Lineas comenzando con %c serán eliminadas.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:1070 git-add--interactive.perl:1126 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si esto no aplica de manera limpia, se te da la oportunidad de \n" +"editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n" +"la edición es abortada y el hunk queda sin cambios.\n" + +#: add-patch.c:1103 +msgid "could not parse hunk header" +msgstr "no se puede analizar hunk header" + +#: add-patch.c:1148 +msgid "'git apply --cached' failed" +msgstr "falló 'git apply --cached'" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:1218 git-add--interactive.perl:1239 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/" +"n]? " + +#: add-patch.c:1261 +msgid "The selected hunks do not apply to the index!" +msgstr "¡Los hunks seleccionados no aplican al índice!" + +#: add-patch.c:1262 git-add--interactive.perl:1343 +msgid "Apply them to the worktree anyway? " +msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? " + +#: add-patch.c:1269 git-add--interactive.perl:1346 +msgid "Nothing was applied.\n" +msgstr "Nada fue aplicado.\n" + +#: add-patch.c:1326 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - deja este hunk sin decidir, ver el siguiente hunk sin decisión\n" +"J - deja este hunk sin decidir, ver siguiente hunk\n" +"k - deja este hunk sin decidir, ver hunk previo sin decidir\n" +"K - deja este hunk sin decidir, ver hunk anterior\n" +"g - selecciona un hunk a dónde ir\n" +"/ - buscar un hunk que cumpla con el regex dado\n" +"s - separar el hunk actual en más pequeños\n" +"e - editar manualmente el hunk actual\n" +"? - imprimir ayuda\n" + +#: add-patch.c:1447 add-patch.c:1457 +msgid "No previous hunk" +msgstr "No el anterior hunk" + +#: add-patch.c:1452 add-patch.c:1462 +msgid "No next hunk" +msgstr "No el siguiente hunk" + +#: add-patch.c:1468 +msgid "No other hunks to goto" +msgstr "No hay más pedazos para el ir" + +#: add-patch.c:1479 git-add--interactive.perl:1577 +msgid "go to which hunk (<ret> to see more)? " +msgstr "¿a que hunk ir (<enter> para ver más)? " + +#: add-patch.c:1480 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "¿a que hunk ir? " + +#: add-patch.c:1491 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Numero inválido: '%s'" + +#: add-patch.c:1496 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Lo siento, solo %d hunk disponible." +msgstr[1] "Lo siento, solo %d hunks disponibles." + +#: add-patch.c:1505 +msgid "No other hunks to search" +msgstr "No hay más pedazos para buscar" + +#: add-patch.c:1511 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "¿buscar para regexp? " + +#: add-patch.c:1526 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Regexp para la búsqueda mal formado %s: %s" + +#: add-patch.c:1543 +msgid "No hunk matches the given pattern" +msgstr "No hay hunks que concuerden con el patrón entregado." + +#: add-patch.c:1550 +msgid "Sorry, cannot split this hunk" +msgstr "Perdón, no se puede dividir este pedazo" + +#: add-patch.c:1554 +#, c-format +msgid "Split into %d hunks." +msgstr "Cortar en %d hunk." + +#: add-patch.c:1558 +msgid "Sorry, cannot edit this hunk" +msgstr "Perdón, no se puede editar este pedazo" + +#: add-patch.c:1609 +msgid "'git apply' failed" +msgstr "falló 'git apply'" + +#: advice.c:115 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:152 +#: advice.c:168 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." -#: advice.c:154 +#: advice.c:170 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:156 +#: advice.c:172 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:158 +#: advice.c:174 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:160 +#: advice.c:176 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:162 +#: advice.c:178 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No es posible %s porque tienes archivos sin fusionar." -#: advice.c:170 +#: advice.c:186 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -57,144 +746,156 @@ msgstr "" "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" "como sea apropiado, para marcar la resolución y realizar un commit." -#: advice.c:178 +#: advice.c:194 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:183 builtin/merge.c:1289 +#: advice.c:199 builtin/merge.c:1335 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:185 +#: advice.c:201 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:186 +#: advice.c:202 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:192 +#: advice.c:208 #, c-format msgid "" -"Note: checking out '%s'.\n" +"Note: switching to '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by performing another checkout.\n" +"state without impacting any branches by switching back to a branch.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -b with the checkout command again. Example:\n" +"do so (now or later) by using -c with the switch command. Example:\n" +"\n" +" git switch -c <new-branch-name>\n" +"\n" +"Or undo this operation with:\n" "\n" -" git checkout -b <new-branch-name>\n" +" git switch -\n" +"\n" +"Turn off this advice by setting config variable advice.detachedHead to " +"false\n" "\n" msgstr "" -"Nota: actualizando el árbol de trabajo '%s'.\n" +"Nota: cambiando a '%s'.\n" "\n" "Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n" -"cambios experimentales y confirmarlos, y puedes descartar cualquier\n" +"cambios experimentales y hacer commits, y puedes descartar cualquier\n" "commit que hayas hecho en este estado sin impactar a tu rama realizando\n" "otro checkout.\n" "\n" "Si quieres crear una nueva rama para mantener los commits que has creado,\n" -"puedes hacerlo (ahora o después) usando -b con el comando checkout. " +"puedes hacerlo (ahora o después) usando -c con el comando checkout. " "Ejemplo:\n" "\n" -" git checkout -b <nombre-de-nueva-rama>\n" +" git switch -c <nombre-de-nueva-rama>\n" +"\n" +"O deshacer la operación con:\n" +"\n" +" git switch -\n" +"\n" +"Desactiva este aviso poniendo la variable de config advice.detachedHead en " +"false\n" "\n" -#: apply.c:59 +#: alias.c:50 +msgid "cmdline ends with \\" +msgstr "cmdline termina en \\" + +#: alias.c:51 +msgid "unclosed quote" +msgstr "comillas incompletas" + +#: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opción de espacios en blanco no reconocida '%s'" -#: apply.c:75 +#: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opción de ignorar espacios en blanco no reconocida '%s'" -#: apply.c:125 +#: apply.c:135 msgid "--reject and --3way cannot be used together." msgstr "--reject y --3way no se pueden utilizar juntas." -#: apply.c:127 +#: apply.c:137 msgid "--cached and --3way cannot be used together." msgstr "--cached y --3way no se pueden utilizar juntas." -#: apply.c:130 +#: apply.c:140 msgid "--3way outside a repository" msgstr "--3way está fuera de un repositorio" -#: apply.c:141 +#: apply.c:151 msgid "--index outside a repository" msgstr "--index está fuera de un repositorio" -#: apply.c:144 +#: apply.c:154 msgid "--cached outside a repository" msgstr "--cached está fuera de un repositorio" -#: apply.c:826 +#: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No se puede preparar una marca de tiempo para la expresión regular %s" -#: apply.c:835 +#: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec devolvió %d para la entrada: %s" -#: apply.c:909 +#: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" "no se puede encontrar el nombre del archivo en el parche en la línea %d" -#: apply.c:947 +#: apply.c:922 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en " "lalínea %d" -#: apply.c:953 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en " "lalínea %d" -#: apply.c:954 +#: apply.c:929 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff erróneo - viejo nombre de archivo inconsistente en " "lalínea %d" -#: apply.c:959 +#: apply.c:934 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d" -#: apply.c:988 +#: apply.c:963 #, c-format msgid "invalid mode on line %d: %s" msgstr "modo inválido en la línea %d: %s" -#: apply.c:1307 +#: apply.c:1282 #, c-format msgid "inconsistent header lines %d and %d" msgstr "header inconsistente en las líneas %d y %d" -#: apply.c:1479 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: línea inesperada: %.*s" - -#: apply.c:1548 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragmento de parche sin header en la línea %d: %.*s" - -#: apply.c:1568 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -209,83 +910,94 @@ msgstr[1] "" "los headers de git diff carecen de información de los nombres de los " "archivos %d cuando los eliminan de la ruta principal componentes (línea %d)" -#: apply.c:1581 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -"el header de git diff carece de información del nombre del archivo (línea %d)" +"la cabecera de git diff carece de información del nombre del archivo (línea " +"%d)" + +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: línea inesperada: %.*s" -#: apply.c:1769 +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragmento de parche sin header en la línea %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "el nuevo archivo depende de contenidos viejos" -#: apply.c:1771 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "el archivo eliminado todavía tiene contenido" -#: apply.c:1805 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "parche corrupto en la línea %d" -#: apply.c:1842 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "nuevo archivo %s depende en contenidos viejos" -#: apply.c:1844 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "el archivo borrado %s todavía tiene contenido" -#: apply.c:1847 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** peligro: el archivo %s está vacío pero no es borrado" -#: apply.c:1994 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "parche binario corrupto en la línea %d: %.*s" -#: apply.c:2031 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "parche binario no reconocido en la línea %d" -#: apply.c:2193 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "parche que solo contiene basura en la línea %d" -#: apply.c:2279 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "no es posible leer el enlace simbólico %s" -#: apply.c:2283 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2942 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "comienzo inválido de línea: '%c'" -#: apply.c:3063 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)." msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)." -#: apply.c:3075 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d" -#: apply.c:3081 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -294,23 +1006,23 @@ msgstr "" "mientras se busca:\n" "%.*s" -#: apply.c:3103 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3111 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" -#: apply.c:3158 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo" -#: apply.c:3168 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -318,288 +1030,284 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3176 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el parche aplica a un '%s' vacío, pero este no lo esta" -#: apply.c:3194 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "la postimagen necesaria %s para '%s' no se puede leer" -#: apply.c:3207 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3213 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " "obtuvo %s)" -#: apply.c:3234 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche falló: %s:%ld" -#: apply.c:3356 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3416 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simbólico" -#: apply.c:3445 apply.c:3688 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3531 apply.c:3703 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el índice" -#: apply.c:3540 apply.c:3711 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el índice" -#: apply.c:3575 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "el repositorio carece del blob necesario para regresar en un merge de tres-" "vías." -#: apply.c:3578 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-vías...\n" -#: apply.c:3594 apply.c:3598 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3610 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Falló el merge en retroceso de tres-vías...\n" -#: apply.c:3624 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3629 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3655 +#: apply.c:3652 msgid "removal patch leaves file contents" -msgstr "parche de remoción deja contenidos en el archivo" +msgstr "parche de eliminación deja contenidos en el archivo" -#: apply.c:3728 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3730 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3881 apply.c:3883 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" -#: apply.c:3939 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el índice" -#: apply.c:3942 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3962 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" -#: apply.c:3967 +#: apply.c:3964 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" -#: apply.c:3987 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' está tras un enlace simbólico" -#: apply.c:3991 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4006 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4098 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta información del sha1 o es inútil para el submódulo %s" -#: apply.c:4105 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" -#: apply.c:4108 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry falló para la ruta '%s'" - -#: apply.c:4117 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo añadir %s al índice temporal" -#: apply.c:4127 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4265 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del índice" -#: apply.c:4299 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submódulo %s" -#: apply.c:4305 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4313 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no es posible crear una copia de seguridad para el archivo recién creado %s" -#: apply.c:4319 apply.c:4464 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4362 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir para '%s'" -#: apply.c:4366 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4436 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4534 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4542 +#: apply.c:4539 msgid "internal error" msgstr "error interno" -#: apply.c:4545 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicando parche %%s con %d rechazo..." msgstr[1] "Aplicando parche %%s con %d rechazos..." -#: apply.c:4556 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4578 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4582 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4692 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4700 +#: apply.c:4706 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4719 +#: apply.c:4726 msgid "unable to read index file" msgstr "no es posible leer el archivo índice" -#: apply.c:4874 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4901 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco aplastado" msgstr[1] "%d errores de espacios en blanco aplastados" -#: apply.c:4907 apply.c:4922 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línea agrega errores de espacios en blanco." msgstr[1] "%d líneas agregan errores de espacios en blanco." -#: apply.c:4915 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -608,147 +1316,137 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212 -#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262 -#: builtin/pull.c:199 builtin/submodule--helper.c:406 -#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365 -#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849 -#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197 -msgid "path" -msgstr "ruta" - -#: apply.c:4959 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4962 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4964 builtin/am.c:2218 +#: apply.c:4973 builtin/am.c:2260 msgid "num" msgstr "num" -#: apply.c:4965 +#: apply.c:4974 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4968 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4970 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" -#: apply.c:4974 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" -#: apply.c:4976 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" -#: apply.c:4978 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" -#: apply.c:4980 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4982 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4984 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4986 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4989 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4991 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vías si el parche no aplica" -#: apply.c:4993 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información del índice incrustado" -#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL" -#: apply.c:4998 +#: apply.c:5007 msgid "ensure at least <n> lines of context match" -msgstr "asegure que por lo menos <n> líneas del contexto concuerden" +msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden" -#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3312 builtin/rebase.c:857 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 msgid "action" msgstr "acción" -#: apply.c:5000 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detectar líneas nuevas o modificadas que contienen errores de espacios en " "blanco" -#: apply.c:5003 apply.c:5006 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5009 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5011 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:5013 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5015 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698 -#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127 -#: builtin/rebase--interactive.c:157 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5018 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar nuevas líneas faltantes detectadas incorrectamente al final del " "archivo" -#: apply.c:5021 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:5023 builtin/am.c:2206 +#: apply.c:5032 builtin/am.c:2248 msgid "root" msgstr "raíz" -#: apply.c:5024 +#: apply.c:5033 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -771,148 +1469,168 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concordó con ninguna carpeta" -#: archive.c:453 +#: archive.c:396 +#, c-format +msgid "no such ref: %.*s" +msgstr "no existe el ref: %.*s" + +#: archive.c:401 +#, c-format +msgid "not a valid object name: %s" +msgstr "nombre de objeto no válido: %s" + +#: archive.c:414 +#, c-format +msgid "not a tree object: %s" +msgstr "no es un objeto tree: %s" + +#: archive.c:426 +msgid "current working directory is untracked" +msgstr "directorio de trabajo actual no rastreado" + +#: archive.c:457 msgid "fmt" msgstr "fmt" -#: archive.c:453 +#: archive.c:457 msgid "archive format" msgstr "formato del archivo" -#: archive.c:454 builtin/log.c:1536 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "prefijo" -#: archive.c:455 +#: archive.c:459 msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884 -#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562 -#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122 -#: parse-options.h:162 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:190 msgid "file" msgstr "carpeta" -#: archive.c:457 builtin/archive.c:89 +#: archive.c:461 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escribe el archivo en esta carpeta" -#: archive.c:459 +#: archive.c:463 msgid "read .gitattributes in working directory" msgstr "leer .gitattributes en el directorio de trabajo" -#: archive.c:460 +#: archive.c:464 msgid "report archived files on stderr" msgstr "reportar archivos archivados por stderr" -#: archive.c:461 +#: archive.c:465 msgid "store only" msgstr "solo guardar" -#: archive.c:462 +#: archive.c:466 msgid "compress faster" -msgstr "comprimir mas rápido" +msgstr "comprimir más rápido" -#: archive.c:470 +#: archive.c:474 msgid "compress better" msgstr "comprimir mejor" -#: archive.c:473 +#: archive.c:477 msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" -#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 -#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "repo" -#: archive.c:476 builtin/archive.c:91 +#: archive.c:480 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "obtener la carpeta del repositorio remoto <repo>" -#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714 -#: builtin/notes.c:496 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:478 builtin/archive.c:93 +#: archive.c:482 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "ruta para el comando git-upload-archivo remoto" -#: archive.c:485 +#: archive.c:489 msgid "Unexpected option --remote" msgstr "Opción inesperada --remote" -#: archive.c:487 +#: archive.c:491 msgid "Option --exec can only be used together with --remote" msgstr "Opción --exec solo puede ser utilizada con --remote" -#: archive.c:489 +#: archive.c:493 msgid "Unexpected option --output" msgstr "Opción inesperada --output" -#: archive.c:511 +#: archive.c:515 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de carpeta desconocido '%s'" -#: archive.c:518 +#: archive.c:522 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" -#: archive-tar.c:125 archive-zip.c:345 +#: archive-tar.c:125 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "no se puede transmitir el blob %s" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:369 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo de archivo no soportado: 0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:359 #, c-format msgid "cannot read %s" msgstr "no se puede leer %s" -#: archive-tar.c:458 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "no se puede comenzar filtro '%s'" -#: archive-tar.c:461 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "incapaz de redirigir descriptor" -#: archive-tar.c:468 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "filtro '%s' reportó un error" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "ruta no válida UTF-8: %s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta muy larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: archive-zip.c:609 +#: archive-zip.c:615 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" @@ -920,7 +1638,12 @@ msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" #: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" -msgstr "%.*s no es un nombre de atributo valido" +msgstr "%.*s no es un nombre de atributo válido" + +#: attr.c:369 +#, c-format +msgid "%s not allowed: %s:%d" +msgstr "%s no permitido: %s:%d" #: attr.c:409 msgid "" @@ -935,17 +1658,17 @@ msgstr "" msgid "Badly quoted content in file '%s': %s" msgstr "Revisa las comillas en el archivo '%s': %s" -#: bisect.c:676 +#: bisect.c:678 #, c-format msgid "We cannot bisect more!\n" msgstr "¡No podemos biseccionar más!\n" -#: bisect.c:730 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" -msgstr "No es un nombre de commit valido %s" +msgstr "No es un nombre de commit válido %s" -#: bisect.c:754 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -954,7 +1677,7 @@ msgstr "" "La base de fisión %s está mal.\n" "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n" -#: bisect.c:759 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -963,7 +1686,7 @@ msgstr "" "La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:764 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -972,7 +1695,7 @@ msgstr "" "La base de fisión %s es %s.\n" "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n" -#: bisect.c:772 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -981,9 +1704,9 @@ msgid "" msgstr "" "Algunas %s revisiones no son ancestros de la revisión %s.\n" "git bisect no puede trabajar bien en este caso.\n" -"Tal vez confundió la revisión %s y %s?\n" +"¿Tal vez confundiste la revisión %s y %s?\n" -#: bisect.c:785 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -994,36 +1717,36 @@ msgstr "" "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n" "Vamos a continuar de todas maneras." -#: bisect.c:818 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Biseccionando: una base de fisión debe ser probada\n" -#: bisect.c:858 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:928 builtin/merge.c:138 +#: bisect.c:966 builtin/merge.c:149 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "falló leer las refs de bisect" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1032,7 +1755,7 @@ msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1042,52 +1765,52 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n" msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n" -#: blame.c:1787 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents y --reverse no se mezclan bien." -#: blame.c:1801 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "no se puede usar --contents con el nombre de objeto commit final" -#: blame.c:1822 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963 -#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932 -#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "falló la configuración del camino de revisión" -#: blame.c:1849 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent juntos requieren un rango a lo largo de la cadena " "del primer padre" -#: blame.c:1860 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "no hay una ruta %s en %s" -#: blame.c:1871 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "no se puede leer el blob %s para la ruta %s" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1100,97 +1823,97 @@ msgstr "" "la infamación del rastreo remoto invocando\n" "\"git branch --set-upstream-to=%s%s%s\"." -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "La rama %s no se configura como su propio upstream." -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' " "por rebase." -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" "Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'." -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" "Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase." -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'." -#: branch.c:103 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por " "rebase." -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "" "Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'." -#: branch.c:108 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" "Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por " "rebase." -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "" "Rama '%s' configurada para hacer seguimiento a la referencia local '%s'." -#: branch.c:118 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "No es posible escribir la configuración de la rama upstream" -#: branch.c:155 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "No rastreando: información ambigua para la referencia %s" -#: branch.c:188 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." -msgstr "'%s' no es un nombre valido de rama." +msgstr "'%s' no es un nombre válido de rama." -#: branch.c:207 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Una rama llamada '%s' ya existe." -#: branch.c:212 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "No se puede forzar la actualización de la rama actual." -#: branch.c:232 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "No se puede configurar el rastreo de información; el punto de partida '%s' " "no es una rama." -#: branch.c:234 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la rama de upstream solicitada '%s' no existe" -#: branch.c:236 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1211,27 +1934,27 @@ msgstr "" "\"git push -u\" para configurar tu upstream predeterminado cuando realizas " "el push." -#: branch.c:279 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." -msgstr "Nombre de objeto no valido: '%s'." +msgstr "Nombre de objeto no válido: '%s'." -#: branch.c:299 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nombre de objeto ambiguo: '%s'." -#: branch.c:304 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." -msgstr "Punto de rama no valido: '%s'." +msgstr "Punto de rama no válido: '%s'." -#: branch.c:358 +#: branch.c:364 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ya ha sido marcado en '%s'" -#: branch.c:381 +#: branch.c:387 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD del árbol de trabajo %s no está actualizada" @@ -1246,89 +1969,92 @@ msgstr "'%s' no se ve como un archivo bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722 -#: builtin/commit.c:774 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 +#: builtin/commit.c:815 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" -#: bundle.c:141 +#: bundle.c:143 msgid "Repository lacks these prerequisite commits:" msgstr "Al repositorio le falta estos commits prerrequisito:" -#: bundle.c:192 +#: bundle.c:146 +msgid "need a repository to verify a bundle" +msgstr "se necesita un repositorio para verificar un bundle" + +#: bundle.c:197 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El bundle contiene esta referencia:" msgstr[1] "El bundle contiene estas %d referencias:" -#: bundle.c:199 +#: bundle.c:204 msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#: bundle.c:201 +#: bundle.c:206 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "El bundle requiere esta referencia:" msgstr[1] "El bundle requiere estas %d referencias:" -#: bundle.c:267 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:274 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:285 +#: bundle.c:291 msgid "pack-objects died" msgstr "pack-objects murió" -#: bundle.c:327 +#: bundle.c:333 msgid "rev-list died" msgstr "rev-list murió" -#: bundle.c:376 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:464 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacío." -#: bundle.c:474 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:498 +#: bundle.c:504 msgid "index-pack died" msgstr "index-pack murió" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414 -#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376 -#: builtin/replace.c:448 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" -msgstr "%s %s no es un commit!" +msgstr "¡%s %s no es un commit!" #: commit.c:193 msgid "" @@ -1350,128 +2076,302 @@ msgstr "" "Apapa este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1115 +#: commit.c:1153 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." -#: commit.c:1118 +#: commit.c:1157 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." -#: commit.c:1121 +#: commit.c:1160 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1124 +#: commit.c:1163 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "El Commit %s tiene una buena firma GPG por %s\n" -#: commit.c:1378 +#: commit.c:1417 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" "Peligro: el mensaje del commit no se ajusta a UTF-8.\n" -"Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n" +"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n" "variable de configuración i18n.commitencoding para la codificación que usa " -"su proyecto.\n" +"tu proyecto.\n" -#: commit-graph.c:108 +#: commit-graph.c:122 +msgid "commit-graph file is too small" +msgstr "archivo commit-graph es muy pequeño" + +#: commit-graph.c:189 #, c-format -msgid "graph file %s is too small" -msgstr "archivo graph %s es muy pequeño" +msgid "commit-graph signature %X does not match signature %X" +msgstr "firma %X en commit-graph no concuerda con firma %X" -#: commit-graph.c:115 +#: commit-graph.c:196 #, c-format -msgid "graph signature %X does not match signature %X" -msgstr "firma de graph %X no concuerda con firma %X" +msgid "commit-graph version %X does not match version %X" +msgstr "versión de commit-graph %X no concuerda con versión %X" -#: commit-graph.c:122 +#: commit-graph.c:203 #, c-format -msgid "graph version %X does not match version %X" -msgstr "versión de graph %X no concuerda con versión %X" +msgid "commit-graph hash version %X does not match version %X" +msgstr "versión de hash de commit-graph %X no concuerda con versión %X" + +#: commit-graph.c:226 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +msgstr "" +"falta tabla de lookup del chunk en commit-graph; el archivo puede estar " +"incompleto" -#: commit-graph.c:129 +#: commit-graph.c:237 #, c-format -msgid "hash version %X does not match version %X" -msgstr "versión de hash %X no concuerda con versión %X" +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "offset del chunk de commit-graph inapropiado %08x%08x" -#: commit-graph.c:153 +#: commit-graph.c:280 #, c-format -msgid "improper chunk offset %08x%08x" -msgstr "offset del chunk impropio %08x%08x" +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" -#: commit-graph.c:189 +#: commit-graph.c:343 +msgid "commit-graph has no base graphs chunk" +msgstr "commit-graph no tiene una chunk base de graphs" + +#: commit-graph.c:353 +msgid "commit-graph chain does not match" +msgstr "cadena commit-graph no concuerda" + +#: commit-graph.c:401 #, c-format -msgid "chunk id %08x appears multiple times" -msgstr "id de chunk %08x parece tener múltiples tiempos" +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "cadena de commit-graph inválida: línea '%s' no es un hash" -#: commit-graph.c:308 +#: commit-graph.c:425 +msgid "unable to find all commit-graph files" +msgstr "no es posible encontrar los archivos commit-graph" + +#: commit-graph.c:558 commit-graph.c:618 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "posición de commit inválida. commit-graph está probablemente corrupto" + +#: commit-graph.c:579 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:617 builtin/pack-objects.c:2652 +#: commit-graph.c:852 builtin/am.c:1292 +#, c-format +msgid "unable to parse commit %s" +msgstr "no es posible analizar el commit %s" + +#: commit-graph.c:1011 builtin/pack-objects.c:2782 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:651 -msgid "Annotating commits in commit graph" -msgstr "Anotando commits en commit graph" +#: commit-graph.c:1043 +msgid "Loading known commits in commit graph" +msgstr "Cargando commits conocidos en commit graph" + +#: commit-graph.c:1060 +msgid "Expanding reachable commits in commit graph" +msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:691 +#: commit-graph.c:1079 +msgid "Clearing commit marks in commit graph" +msgstr "Limpiando marcas de commits en commit graph" + +#: commit-graph.c:1098 msgid "Computing commit graph generation numbers" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852 -msgid "Finding commits for commit graph" -msgstr "Encontrando commits para commit graph" +#: commit-graph.c:1173 +#, c-format +msgid "Finding commits for commit graph in %d pack" +msgid_plural "Finding commits for commit graph in %d packs" +msgstr[0] "Encontrando commits para commit graph en %d pack" +msgstr[1] "Encontrando commits para commit graph en %d packs" -#: commit-graph.c:812 +#: commit-graph.c:1186 #, c-format msgid "error adding pack %s" msgstr "error agregando pack %s" -#: commit-graph.c:814 +#: commit-graph.c:1190 #, c-format msgid "error opening index for %s" msgstr "error abriendo index para %s" -#: commit-graph.c:868 +#: commit-graph.c:1214 #, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "el formato de gráficos de commit no pudede escribir %d commits" +msgid "Finding commits for commit graph from %d ref" +msgid_plural "Finding commits for commit graph from %d refs" +msgstr[0] "Encontrando commits para commit graph de %d ref" +msgstr[1] "Encontrando commits para commit graph de %d refs" -#: commit-graph.c:895 -msgid "too many commits to write graph" -msgstr "demasiados commits para escribir el gráfico" +#: commit-graph.c:1234 +#, c-format +msgid "invalid commit object id: %s" +msgstr "id de objeto commit: %s inválido" + +#: commit-graph.c:1249 +msgid "Finding commits for commit graph among packed objects" +msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:902 midx.c:769 +#: commit-graph.c:1264 +msgid "Counting distinct commits in commit graph" +msgstr "Contando commits distintos en commit graph" + +#: commit-graph.c:1294 +msgid "Finding extra edges in commit graph" +msgstr "Encontrando esquinas extra en commit graph" + +#: commit-graph.c:1340 +msgid "failed to write correct number of base graph ids" +msgstr "falló al escribir el número correcto de ids de base graph" + +#: commit-graph.c:1373 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1002 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#, c-format +msgid "unable to create '%s'" +msgstr "no se puede crear '%s'" + +#: commit-graph.c:1445 +#, c-format +msgid "Writing out commit graph in %d pass" +msgid_plural "Writing out commit graph in %d passes" +msgstr[0] "Escribiendo commit graph en %d paso" +msgstr[1] "Escribiendo commit graph en %d pasos" + +#: commit-graph.c:1486 +msgid "unable to open commit-graph chain file" +msgstr "no se pudo abrir la cadena de archivos commit-graph" + +#: commit-graph.c:1498 +msgid "failed to rename base commit-graph file" +msgstr "no se pudo renombrar el archivo base commit-graph" + +#: commit-graph.c:1518 +msgid "failed to rename temporary commit-graph file" +msgstr "falló al renombrar el archivo temporal commit-graph" + +#: commit-graph.c:1631 +msgid "Scanning merged commits" +msgstr "Escaneando commits fusionados" + +#: commit-graph.c:1642 +#, c-format +msgid "unexpected duplicate commit id %s" +msgstr "id de commit duplicado inesperado %s" + +#: commit-graph.c:1665 +msgid "Merging commit-graph" +msgstr "Fusionando commit-graph" + +#: commit-graph.c:1844 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "el formato de gráficos de commit no pudede escribir %d commits" + +#: commit-graph.c:1855 +msgid "too many commits to write graph" +msgstr "demasiados commits para escribir el gráfico" + +#: commit-graph.c:1944 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el archivo de commit-graph tiene checksums incorrectos y probablemente está " "corrupto" -#: commit-graph.c:1046 +#: commit-graph.c:1954 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s" + +#: commit-graph.c:1964 commit-graph.c:1979 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u" + +#: commit-graph.c:1971 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "falló al analizar commit %s para commit-graph" + +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: compat/obstack.c:405 compat/obstack.c:407 +#: commit-graph.c:2003 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" +"falló al analizar el commit %s de la base de datos de objetos para commit-" +"graph" + +#: commit-graph.c:2010 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s" + +#: commit-graph.c:2020 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "lista padre de commit-graph para commit %s es muy larga" + +#: commit-graph.c:2029 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "padre de commit-graph para %s es %s != %s" + +#: commit-graph.c:2042 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "lista padre de commit-graph para commit %s termina antes" + +#: commit-graph.c:2047 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" +"commit-graph ha generado número cero para %s, pero no-cero para los demás" + +#: commit-graph.c:2051 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" +"commit-graph tiene generación no-cero para %s, pero cero para los demás" + +#: commit-graph.c:2066 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "generación commit-graph para commit %s es %u != %u" + +#: commit-graph.c:2072 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "" +"fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>" + +#: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:123 +#: config.c:124 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1486,300 +2386,293 @@ msgstr "" "\t%s\n" "Esto puede ser causado por inclusiones circulares." -#: config.c:139 +#: config.c:140 #, c-format msgid "could not expand include path '%s'" msgstr "no se pudo expandir rutas de inclusión '%s'" -#: config.c:150 +#: config.c:151 msgid "relative config includes must come from files" msgstr "inclusiones de configuración relativas tienen que venir de archivos" -#: config.c:190 +#: config.c:197 msgid "relative config include conditionals must come from files" msgstr "" "la configuración relativa incluye condicionales que deben venir de archivos" -#: config.c:348 +#: config.c:376 #, c-format msgid "key does not contain a section: %s" msgstr "llave no contiene una sección: %s" -#: config.c:354 +#: config.c:382 #, c-format msgid "key does not contain variable name: %s" msgstr "llave no contiene el nombre de variable: %s" -#: config.c:378 sequencer.c:2296 +#: config.c:406 sequencer.c:2444 #, c-format msgid "invalid key: %s" msgstr "llave inválida: %s" -#: config.c:384 +#: config.c:412 #, c-format msgid "invalid key (newline): %s" msgstr "llave inválida (nueva línea): %s" -#: config.c:420 config.c:432 +#: config.c:448 config.c:460 #, c-format msgid "bogus config parameter: %s" msgstr "parámetro de configuración malogrado: %s" -#: config.c:467 +#: config.c:495 #, c-format msgid "bogus format in %s" msgstr "formato malogrado en %s" -#: config.c:793 +#: config.c:821 #, c-format msgid "bad config line %d in blob %s" msgstr "mala línea de config %d en el blob %s" -#: config.c:797 +#: config.c:825 #, c-format msgid "bad config line %d in file %s" msgstr "mala línea de config %d en el archivo %s" -#: config.c:801 +#: config.c:829 #, c-format msgid "bad config line %d in standard input" msgstr "mala línea de config %d en la entrada standard" -#: config.c:805 +#: config.c:833 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "mala línea de config %d en el submódulo-blob %s" -#: config.c:809 +#: config.c:837 #, c-format msgid "bad config line %d in command line %s" msgstr "mala línea de config %d en la línea de comando %s" -#: config.c:813 +#: config.c:841 #, c-format msgid "bad config line %d in %s" msgstr "mala línea de config %d en %s" -#: config.c:952 +#: config.c:978 msgid "out of range" msgstr "fuera de rango" -#: config.c:952 +#: config.c:978 msgid "invalid unit" msgstr "unidad inválida" -#: config.c:958 +#: config.c:979 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "mal valor de config numérica '%s' para '%s': %s" -#: config.c:963 +#: config.c:998 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s" -#: config.c:966 +#: config.c:1001 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s" -#: config.c:969 +#: config.c:1004 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s" -#: config.c:972 +#: config.c:1007 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s" -#: config.c:975 +#: config.c:1010 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s" -#: config.c:978 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en %s: %s" -#: config.c:1073 +#: config.c:1108 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falló al expandir el directorio de usuario en: '%s'" -#: config.c:1082 +#: config.c:1117 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' para '%s' no es una marca de tiempo válida" -#: config.c:1173 +#: config.c:1208 #, c-format msgid "abbrev length out of range: %d" msgstr "largo de abreviatura fuera de rango: %d" -#: config.c:1187 config.c:1198 +#: config.c:1222 config.c:1233 #, c-format msgid "bad zlib compression level %d" msgstr "nivel de compresión de zlib erróneo %d" -#: config.c:1290 +#: config.c:1325 msgid "core.commentChar should only be one character" msgstr "core.commentChar debería tener solo un caracter" -#: config.c:1323 +#: config.c:1358 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido de creación de objetos: %s" -#: config.c:1395 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "valor malformado para %s" -#: config.c:1421 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "valor malformado para %s: %s" -#: config.c:1422 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1481 builtin/pack-objects.c:3391 +#: config.c:1518 builtin/pack-objects.c:3541 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" -#: config.c:1602 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz de cargar configuración de objeto blob '%s'" -#: config.c:1605 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referencia '%s' no apunta a un blob" -#: config.c:1622 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no se posible resolver configuración de blob '%s'" -#: config.c:1652 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1705 +#: config.c:1743 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2037 +#: config.c:2097 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2207 +#: config.c:2267 #, c-format msgid "Invalid %s: '%s'" -msgstr "Invalido %s: '%s'" +msgstr "Inválido %s: '%s'" -#: config.c:2250 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " -"defecto" - -#: config.c:2276 +#: config.c:2312 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" -#: config.c:2322 +#: config.c:2358 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2324 +#: config.c:2360 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" -#: config.c:2405 +#: config.c:2441 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2437 +#: config.c:2473 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2466 +#: config.c:2502 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2717 config.c:3041 +#: config.c:2754 config.c:3078 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2728 +#: config.c:2765 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2763 builtin/config.c:327 +#: config.c:2800 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:2788 +#: config.c:2825 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:2801 config.c:3054 +#: config.c:2838 config.c:3091 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:2812 +#: config.c:2849 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2821 config.c:3059 +#: config.c:2858 config.c:3096 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:2906 config.c:3156 +#: config.c:2943 config.c:3193 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:2940 +#: config.c:2977 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2942 builtin/remote.c:782 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3032 +#: config.c:3069 #, c-format msgid "invalid section name: %s" msgstr "sección de nombre inválida: %s" -#: config.c:3199 +#: config.c:3236 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -1797,7 +2690,7 @@ msgid "" msgstr "" "No se pudo leer del repositorio remoto.\n" "\n" -"Por favor asegúrese que tiene los permisos de acceso correctos\n" +"Por favor asegúrate que tienes los permisos de acceso correctos\n" "y que el repositorio existe." #: connect.c:81 @@ -1832,50 +2725,45 @@ msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'" msgid "repository on the other end cannot be shallow" msgstr "el repositorio en el otro final no puede ser superficial" -#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "error remoto: %s" - -#: connect.c:316 +#: connect.c:313 msgid "invalid packet" msgstr "paquete inválido" -#: connect.c:336 +#: connect.c:333 #, c-format msgid "protocol error: unexpected '%s'" msgstr "error de protocolo: '%s' inesperado" -#: connect.c:444 +#: connect.c:441 #, c-format msgid "invalid ls-refs response: %s" msgstr "respuesta de referencias ls-refs inválida: %s" -#: connect.c:448 +#: connect.c:445 msgid "expected flush after ref listing" msgstr "flush esperado tras listado de refs" -#: connect.c:547 +#: connect.c:544 #, c-format msgid "protocol '%s' is not supported" msgstr "protocolo '%s' no es soportado" -#: connect.c:598 +#: connect.c:595 msgid "unable to set SO_KEEPALIVE on socket" msgstr "no es posible configurar SO_KEEPALIVE en el socket" -#: connect.c:638 connect.c:701 +#: connect.c:635 connect.c:698 #, c-format msgid "Looking up %s ... " msgstr "Revisando %s... " -#: connect.c:642 +#: connect.c:639 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "no se puede revisar %s (puerto %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:646 connect.c:717 +#: connect.c:643 connect.c:714 #, c-format msgid "" "done.\n" @@ -1884,7 +2772,7 @@ msgstr "" "hecho.\n" "Conectando a %s (puerto %s) ... " -#: connect.c:668 connect.c:745 +#: connect.c:665 connect.c:742 #, c-format msgid "" "unable to connect to %s:\n" @@ -1894,74 +2782,74 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:674 connect.c:751 +#: connect.c:671 connect.c:748 msgid "done." msgstr "hecho." -#: connect.c:705 +#: connect.c:702 #, c-format msgid "unable to look up %s (%s)" msgstr "no es posible revisar %s (%s)" -#: connect.c:711 +#: connect.c:708 #, c-format msgid "unknown port %s" msgstr "puerto desconocido %s" -#: connect.c:848 connect.c:1174 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "hostname extraño '%s' bloqueado" -#: connect.c:850 +#: connect.c:847 #, c-format msgid "strange port '%s' blocked" msgstr "puerto extraño '%s' bloqueado" -#: connect.c:860 +#: connect.c:857 #, c-format msgid "cannot start proxy %s" msgstr "no se puede comenzar proxy %s" -#: connect.c:927 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas" -#: connect.c:1122 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "variante 'simple' de ssh no soporta -4" -#: connect.c:1134 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "variante 'simple' de ssh no soporta -6" -#: connect.c:1151 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "variante ssh 'simple' no soporta configurar puerto" -#: connect.c:1262 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "ruta extraña '%s' bloqueada" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:80 +#: connected.c:110 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:100 +#: connected.c:130 msgid "failed write to rev-list" msgstr "falló escribir a rev-list" -#: connected.c:107 +#: connected.c:137 msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" @@ -1998,26 +2886,26 @@ msgstr "" "LF será reemplazado por CRLF en %s.\n" "El archivo tendrá sus finales de línea originales en tu directorio de trabajo" -#: convert.c:280 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM está prohibido en '%s' si es codificado como %s" -#: convert.c:287 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." -msgstr "" -"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como " +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." +msgstr "" +"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%.*s " +"como working-tree-encoding." -#: convert.c:305 +#: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM es requerido en '%s' si es codificado como %s" -#: convert.c:307 +#: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2026,50 +2914,50 @@ msgstr "" "Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o " "UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding." -#: convert.c:425 convert.c:496 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "falló al codificar '%s' de %s a %s" -#: convert.c:468 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "codificación '%s' de %s a %s y de vuelta no son iguales" -#: convert.c:674 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no se puede hacer fork para ejecutar filtros externos '%s'" -#: convert.c:694 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "no se pueden alimentar de input a los filtros externos '%s'" -#: convert.c:701 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' falló %d" -#: convert.c:736 convert.c:739 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "lectura de filtro externo '%s' falló" -#: convert.c:742 convert.c:796 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "filtro externo '%s' falló" -#: convert.c:844 +#: convert.c:839 msgid "unexpected filter type" msgstr "tipo de filtro inesperado" -#: convert.c:855 +#: convert.c:850 msgid "path name too long for external filter" msgstr "nombre de ruta muy largo para filtro externo" -#: convert.c:929 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2078,67 +2966,67 @@ msgstr "" "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido " "filtradas" -#: convert.c:1228 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "true/false no son working-tree-encodings válidos" -#: convert.c:1398 convert.c:1432 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: falló al limpiar filtro '%s'" -#: convert.c:1476 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: filtro smudge %s falló" -#: date.c:116 +#: date.c:138 msgid "in the future" msgstr "en el futuro" -#: date.c:122 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "hace %<PRIuMAX> segundo" msgstr[1] "hace %<PRIuMAX> segundos" -#: date.c:129 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "hace %<PRIuMAX> minuto" msgstr[1] "hace %<PRIuMAX> minutos" -#: date.c:136 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "hace %<PRIuMAX> hora" msgstr[1] "hace %<PRIuMAX> horas" -#: date.c:143 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "hace %<PRIuMAX> día" msgstr[1] "hace %<PRIuMAX> días" -#: date.c:149 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "hace %<PRIuMAX> semana" msgstr[1] "hace %<PRIuMAX> semanas" -#: date.c:156 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "hace %<PRIuMAX> mes" msgstr[1] "hace %<PRIuMAX> meses" -#: date.c:167 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2146,40 +3034,40 @@ msgstr[0] "%<PRIuMAX> año" msgstr[1] "%<PRIuMAX> años" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:170 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, y %<PRIuMAX> mes atrás" msgstr[1] "%s, y %<PRIuMAX> meses atrás" -#: date.c:175 date.c:180 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" msgstr[0] "hace %<PRIuMAX> año" msgstr[1] "hace %<PRIuMAX> años" -#: delta-islands.c:268 +#: delta-islands.c:272 msgid "Propagating island marks" msgstr "Propagando marcas isla" -#: delta-islands.c:286 +#: delta-islands.c:290 #, c-format msgid "bad tree object %s" msgstr "mal objeto árbol %s" -#: delta-islands.c:330 +#: delta-islands.c:334 #, c-format msgid "failed to load island regex for '%s': %s" msgstr "falló al cargar isla de regex para '%s': %s" -#: delta-islands.c:386 +#: delta-islands.c:390 #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "regex isla de config tiene muchos grupos de captura (max=%d)" -#: delta-islands.c:462 +#: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "%d islas marcadas, listo.\n" @@ -2189,26 +3077,33 @@ msgstr "%d islas marcadas, listo.\n" msgid "failed to read orderfile '%s'" msgstr "falló al leer orden de archivos '%s'" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "Realizando una detección de cambios de nombre inexacta" -#: diff.c:108 -#, c-format -msgid "option '%s' requires a value" -msgstr "opción '%s' requiere un valor" +#: diff-no-index.c:238 +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<opciones>] <path> <path>" -#: diff.c:158 +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" +"No es un repositorio git. Use --no-index para comparar dos paths fuera del " +"árbol de trabajo" + +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Falló al analizar dirstat porcentaje de corte '%s'\n" -#: diff.c:163 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " parámetro '%s' de dirstat desconocido\n" -#: diff.c:291 +#: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2216,26 +3111,31 @@ msgstr "" "opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', " "'dimmed_zebra', 'plain'" -#: diff.c:316 +#: diff.c:324 #, c-format -msgid "ignoring unknown color-moved-ws mode '%s'" -msgstr "ignorando modo desconocido color-moved-ws '%s'" +msgid "" +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +msgstr "" +"modo color-moved-ws desconocido '%s', valores posibles son 'ignore-space-" +"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" +"change'" -#: diff.c:323 +#: diff.c:332 msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other white " -"space modes" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" msgstr "" "color-moved-ws: allow-indentation-change no puede ser combinado con otros " "modos de espacios en blanco" -#: diff.c:394 +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valor para la variable de configuración 'diff.submodule' desconocido: '%s'" -#: diff.c:454 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2244,24 +3144,35 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4140 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4482 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4485 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4563 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4729 +#: diff.c:4676 +#, c-format +msgid "invalid --stat value: %s" +msgstr "valor --stat inválido: %s" + +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: parse-options.c:197 parse-options.c:201 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s espera un valor numérico" + +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2270,64 +3181,579 @@ msgstr "" "Falló al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4743 +#: diff.c:4798 +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" + +#: diff.c:4822 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "valor desconocido luego de ws-error-highlight=%.*s" + +#: diff.c:4836 +#, c-format +msgid "unable to resolve '%s'" +msgstr "no se puede resolver '%s'" + +#: diff.c:4886 diff.c:4892 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s espera forma <n>/<m>" + +#: diff.c:4904 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s esperaba un char, se obtuvo '%s'" + +#: diff.c:4925 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "mal argumento --color-moved: %s" + +#: diff.c:4944 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "modo inválido '%s' en --color-moved-ws" + +#: diff.c:4984 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " +"\"histogram\"" + +#: diff.c:5020 diff.c:5040 +#, c-format +msgid "invalid argument to %s" +msgstr "argumento inválido para %s" + +#: diff.c:5178 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "falló al analizar parámetro de opción --submodule: '%s'" + +#: diff.c:5234 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "Falló al analizar parámetro de opción --submodule: '%s'" +msgid "bad --word-diff argument: %s" +msgstr "mal argumento --word-diff: %s" + +#: diff.c:5257 +msgid "Diff output format options" +msgstr "Opciones de formato de salida para diff" + +#: diff.c:5259 diff.c:5265 +msgid "generate patch" +msgstr "generar parche" + +#: diff.c:5262 builtin/log.c:173 +msgid "suppress diff output" +msgstr "suprimir salida de diff" + +#: diff.c:5267 diff.c:5381 diff.c:5388 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5268 diff.c:5271 +msgid "generate diffs with <n> lines context" +msgstr "genera diffs con <n> líneas de contexto" + +#: diff.c:5273 +msgid "generate the diff in raw format" +msgstr "genera el diff en formato raw" + +#: diff.c:5276 +msgid "synonym for '-p --raw'" +msgstr "sinónimo para '-p --stat'" + +#: diff.c:5280 +msgid "synonym for '-p --stat'" +msgstr "sinónimo para '-p --stat'" + +#: diff.c:5284 +msgid "machine friendly --stat" +msgstr "--stat amigable para máquina" + +#: diff.c:5287 +msgid "output only the last line of --stat" +msgstr "mostrar solo la última línea para --stat" + +#: diff.c:5289 diff.c:5297 +msgid "<param1,param2>..." +msgstr "<param1,param2>..." + +#: diff.c:5290 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" +"muestra la distribución de cantidades de cambios relativa para cada " +"subdirectorio" + +#: diff.c:5294 +msgid "synonym for --dirstat=cumulative" +msgstr "sinónimo para --dirstat=cumulative" + +#: diff.c:5298 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "sinonimo para --dirstat=archivos,param1,param2..." + +#: diff.c:5302 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "" +"advierte si cambios introducen conflictos de markers o errores de espacios " +"en blanco" + +#: diff.c:5305 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "" +"resumen condensado de creaciones, cambios de nombres y cambios de modos" + +#: diff.c:5308 +msgid "show only names of changed files" +msgstr "mostrar solo nombres de archivos cambiados" + +#: diff.c:5311 +msgid "show only names and status of changed files" +msgstr "mostrar solo nombres y estados de archivos cambiados" + +#: diff.c:5313 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" + +#: diff.c:5314 +msgid "generate diffstat" +msgstr "generar diffstat" + +#: diff.c:5316 diff.c:5319 diff.c:5322 +msgid "<width>" +msgstr "<ancho>" + +#: diff.c:5317 +msgid "generate diffstat with a given width" +msgstr "genera diffstat con un ancho dado" + +#: diff.c:5320 +msgid "generate diffstat with a given name width" +msgstr "genera diffstat con un nombre de ancho dado" + +#: diff.c:5323 +msgid "generate diffstat with a given graph width" +msgstr "genera diffstat con un ancho de graph dado" + +#: diff.c:5325 +msgid "<count>" +msgstr "<cantidad>" + +#: diff.c:5326 +msgid "generate diffstat with limited lines" +msgstr "genera diffstat con líneas limitadas" + +#: diff.c:5329 +msgid "generate compact summary in diffstat" +msgstr "genera un resumen compacto de diffstat" + +#: diff.c:5332 +msgid "output a binary diff that can be applied" +msgstr "muestra un diff binario que puede ser aplicado" + +#: diff.c:5335 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "" +"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index" +"\"" + +#: diff.c:5337 +msgid "show colored diff" +msgstr "mostrar diff colorido" + +#: diff.c:5338 +msgid "<kind>" +msgstr "<tipo>" + +#: diff.c:5339 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" +"resaltar errores de espacios en blanco en las líneas 'context', 'old' o " +"'new' del diff" + +#: diff.c:5342 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"no consolidar los pathnames y usar NULs como terminadores de campos en --raw " +"o --numstat" + +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +msgid "<prefix>" +msgstr "<prefijo>" + +#: diff.c:5346 +msgid "show the given source prefix instead of \"a/\"" +msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" + +#: diff.c:5349 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "mostrar el prefijo de destino en lugar de \"b/\"" + +#: diff.c:5352 +msgid "prepend an additional prefix to every line of output" +msgstr "anteponer un prefijo adicional a cada línea mostrada" + +#: diff.c:5355 +msgid "do not show any source or destination prefix" +msgstr "no mostrar ningún prefijo de fuente o destino" + +#: diff.c:5358 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "" +"muestra el contexto entre hunks de diff hasta el número especificado de " +"líneas" + +#: diff.c:5362 diff.c:5367 diff.c:5372 +msgid "<char>" +msgstr "<char>" + +#: diff.c:5363 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "especifica el char para indicar una nueva línea en lugar de '+'" + +#: diff.c:5368 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "especifica el char para indicar una línea vieja en lugar de '-'" + +#: diff.c:5373 +msgid "specify the character to indicate a context instead of ' '" +msgstr "especifica el char para indicar un contexto en lugar de ' '" + +#: diff.c:5376 +msgid "Diff rename options" +msgstr "Opciones de diff rename" + +#: diff.c:5377 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5378 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "descomponer los cambios de reescritura en pares de borrar y crear" + +#: diff.c:5382 +msgid "detect renames" +msgstr "detectar renombrados" + +#: diff.c:5386 +msgid "omit the preimage for deletes" +msgstr "omite la preimage para borrados" + +#: diff.c:5389 +msgid "detect copies" +msgstr "detectar copias" + +#: diff.c:5393 +msgid "use unmodified files as source to find copies" +msgstr "usa archivos no modificados como fuente para encontrar copias" + +#: diff.c:5395 +msgid "disable rename detection" +msgstr "deshabilita detección de renombres" + +#: diff.c:5398 +msgid "use empty blobs as rename source" +msgstr "usa blobs vacíos como fuente de renombre" + +#: diff.c:5400 +msgid "continue listing the history of a file beyond renames" +msgstr "continua listando el historial de un archivo más allá de renombres" + +#: diff.c:5403 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" +"previene detección de renombre/copias si el número de objetivos para " +"renombres/copias excede el límite dado" + +#: diff.c:5405 +msgid "Diff algorithm options" +msgstr "Opciones de algoritmos de diff" + +#: diff.c:5407 +msgid "produce the smallest possible diff" +msgstr "produce el diff más pequeño posible" + +#: diff.c:5410 +msgid "ignore whitespace when comparing lines" +msgstr "ignorar espacios en blanco cuando comparando líneas" + +#: diff.c:5413 +msgid "ignore changes in amount of whitespace" +msgstr "ignorar cambios en la cantidad de líneas en blanco" + +#: diff.c:5416 +msgid "ignore changes in whitespace at EOL" +msgstr "ignorar cambios en espacios en blanco en EOL" + +#: diff.c:5419 +msgid "ignore carrier-return at the end of line" +msgstr "ignora carrier-return al final de la línea" + +#: diff.c:5422 +msgid "ignore changes whose lines are all blank" +msgstr "ignora cambios cuyas líneas son todas en blanco" + +#: diff.c:5425 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "heurística para cambiar los límites de hunk para una fácil lectura" + +#: diff.c:5428 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "genera un diff usando algoritmo \"patience diff\"" + +#: diff.c:5432 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "genera un diff usando algoritmo \"histogram diff\"" + +#: diff.c:5434 +msgid "<algorithm>" +msgstr "<algoritmo>" + +#: diff.c:5435 +msgid "choose a diff algorithm" +msgstr "escoge un algoritmo para diff" + +#: diff.c:5437 +msgid "<text>" +msgstr "<texto>" + +#: diff.c:5438 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "genera un diff usando algoritmo \"anchored diff\"" + +#: diff.c:5440 diff.c:5449 diff.c:5452 +msgid "<mode>" +msgstr "<modo>" + +#: diff.c:5441 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "" +"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" + +#: diff.c:5443 diff.c:5446 diff.c:5491 +msgid "<regex>" +msgstr "<regex>" + +#: diff.c:5444 +msgid "use <regex> to decide what a word is" +msgstr "usa <regex> para decidir que palabra es" + +#: diff.c:5447 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" + +#: diff.c:5450 +msgid "moved lines of code are colored differently" +msgstr "líneas movidas de código están coloreadas diferente" + +#: diff.c:5453 +msgid "how white spaces are ignored in --color-moved" +msgstr "como espacios en blanco son ignorados en --color-moved" + +#: diff.c:5456 +msgid "Other diff options" +msgstr "Otras opciones de diff" + +#: diff.c:5458 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "" +"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra " +"paths relativos" + +#: diff.c:5462 +msgid "treat all files as text" +msgstr "tratar todos los archivos como texto" + +#: diff.c:5464 +msgid "swap two inputs, reverse the diff" +msgstr "cambia dos inputs, invierte el diff" + +#: diff.c:5466 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" + +#: diff.c:5468 +msgid "disable all output of the program" +msgstr "deshabilita todo el output del programa" + +#: diff.c:5470 +msgid "allow an external diff helper to be executed" +msgstr "permite la ejecución de un diff helper externo" + +#: diff.c:5472 +msgid "run external text conversion filters when comparing binary files" +msgstr "" +"ejecuta filtros de conversión de texto externos cuando comparando binarios" + +#: diff.c:5474 +msgid "<when>" +msgstr "<cuando>" + +#: diff.c:5475 +msgid "ignore changes to submodules in the diff generation" +msgstr "ignorar cambios a submódulos en la generación de diff" + +#: diff.c:5478 +msgid "<format>" +msgstr "<formato>" + +#: diff.c:5479 +msgid "specify how differences in submodules are shown" +msgstr "especifica como son mostradas las diferencias en submódulos" + +#: diff.c:5483 +msgid "hide 'git add -N' entries from the index" +msgstr "ocultar entradas 'git add -N' del index" + +#: diff.c:5486 +msgid "treat 'git add -N' entries as real in the index" +msgstr "trata entradas 'git add -N' como reales en el index" + +#: diff.c:5488 +msgid "<string>" +msgstr "<string>" + +#: diff.c:5489 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "" +"busca por diferencias que cambien el número de ocurrencias para el string " +"especificado" + +#: diff.c:5492 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" +"busca por diferencias que cambien el número de ocurrencias para el regex " +"especificado" + +#: diff.c:5495 +msgid "show all changes in the changeset with -S or -G" +msgstr "mostrar todos los cambios en el changeset con -S o -G" + +#: diff.c:5498 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "tratar <string> en -S como una expresión regular extendida de POSIX" + +#: diff.c:5501 +msgid "control the order in which files appear in the output" +msgstr "controlar el orden en el que los archivos aparecen en la salida" -#: diff.c:5823 +#: diff.c:5502 +msgid "<object-id>" +msgstr "<id-objeto>" + +#: diff.c:5503 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "" +"busca por diferencias que cambien el número de ocurrencias para el objeto " +"especificado" + +#: diff.c:5505 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5506 +msgid "select files by diff type" +msgstr "selecciona archivos por tipo de diff" + +#: diff.c:5508 +msgid "<file>" +msgstr "<archivo>" + +#: diff.c:5509 +msgid "Output to a specific file" +msgstr "Output a un archivo específico" + +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." msgstr "" "detección de cambio de nombre inexacta fue saltada por haber muchos archivos." -#: diff.c:5826 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber muchos archivos." -#: diff.c:5829 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -"tal vez quiera configurar la variable %s para por lo menos %d y volver a " +"tal vez quieras configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:576 +#: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git" -#: dir.c:965 +#: dir.c:695 dir.c:724 dir.c:737 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "patrón desconocido: '%s'" + +#: dir.c:754 dir.c:768 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "patrón negativo no reconocido: '%s'" + +#: dir.c:786 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" +"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido" + +#: dir.c:796 +msgid "disabling cone pattern matching" +msgstr "deshabilitar coincidencia de patrónes cono" + +#: dir.c:1173 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusión" -#: dir.c:1880 +#: dir.c:2144 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2122 +#: dir.c:2479 msgid "failed to get kernel name and information" msgstr "falló al conseguir la información y nombre del kernel" -#: dir.c:2246 +#: dir.c:2603 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache está desactivado en este sistema o ubicación" -#: dir.c:3047 +#: dir.c:3407 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo índice corrompido en repositorio %s" -#: dir.c:3092 dir.c:3097 +#: dir.c:3452 dir.c:3457 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3126 +#: dir.c:3486 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -2341,297 +3767,290 @@ msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c" msgid "Filtering content" msgstr "Filtrando contenido" -#: entry.c:465 +#: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" -#: environment.c:150 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:332 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no se pudo configurar GIT_DIR a '%s'" -#: exec-cmd.c:361 +#: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "demasiados argumentos para correr %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Remoto sin URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: lista poco profunda esperada" -#: fetch-pack.c:163 +#: fetch-pack.c:153 +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "" +"git fetch-pack: se esperaba un flush packet luego de la lista superficial" + +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet" -#: fetch-pack.c:183 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'" -#: fetch-pack.c:253 +#: fetch-pack.c:195 +msgid "unable to write to remote" +msgstr "no se puede escribir al remoto" + +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:347 fetch-pack.c:1277 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "línea poco profunda inválida: %s" -#: fetch-pack.c:353 fetch-pack.c:1283 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "línea superficial inválida: %s" -#: fetch-pack.c:355 fetch-pack.c:1285 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:358 fetch-pack.c:1288 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:360 fetch-pack.c:1290 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:363 fetch-pack.c:1293 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" -#: fetch-pack.c:404 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "se obtuvo %s %d %s" -#: fetch-pack.c:421 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:452 +#: fetch-pack.c:462 msgid "giving up" msgstr "rindiéndose" -#: fetch-pack.c:464 progress.c:229 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "listo" -#: fetch-pack.c:476 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "se obtuvo %s (%d) %s" -#: fetch-pack.c:522 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:764 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:803 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:811 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "error de protocolo: paquete de header erróneo" -#: fetch-pack.c:879 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:895 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "%s falló" -#: fetch-pack.c:897 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:926 -msgid "Server does not support shallow clients" -msgstr "El servidor no soporta clientes superficiales" - -#: fetch-pack.c:930 -msgid "Server supports multi_ack_detailed" -msgstr "El servidor soporta ulti_ack_detailed" - -#: fetch-pack.c:933 -msgid "Server supports no-done" -msgstr "El servidor soporta no-done" - -#: fetch-pack.c:939 -msgid "Server supports multi_ack" -msgstr "El servidor soporta multi_ack" - -#: fetch-pack.c:943 -msgid "Server supports side-band-64k" -msgstr "El servidor soporta side-band-64k" - -#: fetch-pack.c:947 -msgid "Server supports side-band" -msgstr "El servidor soporta side-band" - -#: fetch-pack.c:951 -msgid "Server supports allow-tip-sha1-in-want" -msgstr "El servidor soporta allow-tip-sha1-in-want" - -#: fetch-pack.c:955 -msgid "Server supports allow-reachable-sha1-in-want" -msgstr "El servidor soporta allow-reachable-sha1-in-want" - #: fetch-pack.c:965 -msgid "Server supports ofs-delta" -msgstr "El servidor soporta ofs-delta" - -#: fetch-pack.c:971 fetch-pack.c:1158 -msgid "Server supports filter" -msgstr "El servidor soporta filtro" - -#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:985 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#, c-format +msgid "Server supports %s" +msgstr "El servidor soporta %s" + +#: fetch-pack.c:972 +msgid "Server does not support shallow clients" +msgstr "El servidor no soporta clientes superficiales" + +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shalow-since" -#: fetch-pack.c:989 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shalow-exclude" -#: fetch-pack.c:991 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:1008 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1020 fetch-pack.c:1418 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch falló." -#: fetch-pack.c:1153 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1199 +#: fetch-pack.c:1216 +msgid "Server supports filter" +msgstr "El servidor soporta filtro" + +#: fetch-pack.c:1239 +msgid "unable to write request to remote" +msgstr "no se puede escribir request al remoto" + +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "error leyendo sección header '%s'" -#: fetch-pack.c:1205 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibió '%s'" -#: fetch-pack.c:1244 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" -msgstr "linea de confirmación inesperada: '%s'" +msgstr "línea de confirmación inesperada: '%s'" -#: fetch-pack.c:1249 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "error procesando acks: %d" -#: fetch-pack.c:1259 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "espere que el packfile sea mandado luego del 'listo'" -#: fetch-pack.c:1261 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "espere que ninguna otra sección sea enviada luego del 'listo'" -#: fetch-pack.c:1298 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "error procesando información superficial: %d" -#: fetch-pack.c:1314 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1324 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1328 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "error procesando refs deseadas: %d" -#: fetch-pack.c:1642 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1660 builtin/clone.c:664 +#: fetch-pack.c:1785 builtin/clone.c:689 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: fetch-pack.c:1686 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1689 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" -#: gpg-interface.c:318 +#: gpg-interface.c:408 msgid "gpg failed to sign the data" msgstr "gpg falló al firmar la data" -#: gpg-interface.c:344 +#: gpg-interface.c:434 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:347 +#: gpg-interface.c:437 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falló al escribir la firma separada para '%s'" -#: graph.c:97 +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color inválido '%.*s' en log.graphColors" -#: grep.c:2113 +#: grep.c:668 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es " +"soportado con -P bajo PCRE v2" + +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 -#: builtin/rm.c:134 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falló al marcar '%s'" -#: grep.c:2141 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -2681,81 +4100,81 @@ msgid "Low-level Commands / Interrogators" msgstr "Comandos de bajo nivel / Interrogadores" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Comandos de bajo nivel / Sincronización de repositorios" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "Comandos de bajo nivel / Auxiliares internos" -#: help.c:296 +#: help.c:298 #, c-format msgid "available git commands in '%s'" msgstr "comandos disponibles de git en '%s'" -#: help.c:303 +#: help.c:305 msgid "git commands available from elsewhere on your $PATH" msgstr "comandos disponibles de git desde otro lugar en tu $PATH" -#: help.c:312 +#: help.c:314 msgid "These are common Git commands used in various situations:" msgstr "Estos son comandos comunes de Git usados en varias situaciones:" -#: help.c:361 git.c:90 +#: help.c:363 git.c:98 #, c-format msgid "unsupported command listing type '%s'" msgstr "comando de listado de tipos no soportado '%s'" -#: help.c:408 +#: help.c:403 msgid "The common Git guides are:" msgstr "Las guías comunes de Git son:" -#: help.c:517 +#: help.c:512 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos" -#: help.c:522 +#: help.c:517 msgid "External commands" msgstr "Comandos externos" -#: help.c:530 +#: help.c:532 msgid "Command aliases" msgstr "Aliases de comando" -#: help.c:594 +#: help.c:596 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" "'%s' parece ser un comando de git, pero no hemos\n" -"podido ejecutarlo. Tal vez git-%s se ha roto?" +"podido ejecutarlo. ¿Tal vez git-%s se ha roto?" -#: help.c:653 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh oh. Tu sistema no reporta ningún comando de Git." -#: help.c:675 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe." -#: help.c:680 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuando asumiendo que quisiste decir '%s'." -#: help.c:685 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'." -#: help.c:693 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s'no es un comando de git. Mira 'git --help'." -#: help.c:697 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2764,21 +4183,21 @@ msgid_plural "" "The most similar commands are" msgstr[0] "" "\n" -"El comando mas similar es" +"El comando más similar es" msgstr[1] "" "\n" -"Los comandos mas similares son" +"Los comandos más similares son" -#: help.c:712 +#: help.c:714 msgid "git version [<options>]" msgstr "git versión [<opciones>]" -#: help.c:780 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:784 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -2792,7 +4211,7 @@ msgstr[1] "" "\n" "¿Quisiste decir alguno de estos?" -#: ident.c:345 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2818,50 +4237,89 @@ msgstr "" "Omite --global para configurar tu identidad solo en este repositorio.\n" "\n" -#: ident.c:369 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" msgstr "no se entrego ningún email y la detección automática está desactivada" -#: ident.c:374 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')" -#: ident.c:384 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "no se entrego ningún nombre y la detección automática está desactivada" -#: ident.c:390 +#: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')" -#: ident.c:398 +#: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "no se puede tener un nombre vacío (para <%s>)" -#: ident.c:404 +#: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:419 builtin/commit.c:606 +#: ident.c:436 builtin/commit.c:635 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inválido: %s" -#: list-objects-filter-options.c:35 -msgid "multiple filter-specs cannot be combined" -msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno" + +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "no se puede cargar árbol raíz para commit %s" + +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "no es posible acceder al blob en '%s'" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "incapaz de analizar filtro de data en %s" #: list-objects-filter-options.c:58 -msgid "only 'tree:0' is supported" -msgstr "solo 'tree:0' es soportado" +msgid "expected 'tree:<depth>'" +msgstr "se esperaba 'tree:<depth>'" -#: list-objects-filter-options.c:137 -msgid "cannot change partial clone promisor remote" -msgstr "no se puede cambiar un clon parcial remoto promisor" +#: list-objects-filter-options.c:73 +msgid "sparse:path filters support has been dropped" +msgstr "soporte para filtros sparse:path ha sido discontinuado" + +#: list-objects-filter-options.c:86 +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "filtro -spec inválido '%s'" + +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "se espera algo luego de combine:" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" #: lockfile.c:151 #, c-format @@ -2892,114 +4350,111 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933 -#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" -#: merge-recursive.c:323 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit erróneo)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión." -#: merge-recursive.c:353 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión." -#: merge-recursive.c:435 -msgid "error building trees" -msgstr "error construyendo árboles" - -#: merge-recursive.c:906 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "falló al crear la ruta '%s'%s" -#: merge-recursive.c:917 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:931 merge-recursive.c:950 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" -msgstr ": tal vez un conflicto D/F?" +msgstr ": ¿tal vez un conflicto D/F?" -#: merge-recursive.c:940 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "rehusando perder el archivo rastreado en '%s'" -#: merge-recursive.c:982 builtin/cat-file.c:39 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:984 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:1008 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "falló al abrir '%s': %s" -#: merge-recursive.c:1019 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "falló al crear el enlace simbólico '%s': %s" -#: merge-recursive.c:1024 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se que hacer con %06o %s '%s'" -#: merge-recursive.c:1212 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Falló al fusionar el submódulo %s (no revisado)" -#: merge-recursive.c:1219 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Falló al fusionar el submódulo %s (commits no presentes)" -#: merge-recursive.c:1226 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)" -#: merge-recursive.c:1234 merge-recursive.c:1246 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:" -#: merge-recursive.c:1237 merge-recursive.c:1249 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rápido en submódulo %s" -#: merge-recursive.c:1271 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)" -#: merge-recursive.c:1275 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)" -#: merge-recursive.c:1276 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" -#: merge-recursive.c:1279 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3016,33 +4471,33 @@ msgstr "" "\n" "el cual aceptará esta sugerencia.\n" -#: merge-recursive.c:1288 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)" -#: merge-recursive.c:1358 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Falló al ejecutar la fusión interna" -#: merge-recursive.c:1363 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "No es posible agregar %s a la base de datos" -#: merge-recursive.c:1395 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1416 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en " "cambio." -#: merge-recursive.c:1483 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3051,7 +4506,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s " "en el árbol." -#: merge-recursive.c:1488 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3060,7 +4515,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol." -#: merge-recursive.c:1495 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3069,7 +4524,7 @@ msgstr "" "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " "dejada en el árbol, en %s." -#: merge-recursive.c:1500 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3078,32 +4533,44 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol en %s." -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369 -#: merge-recursive.c:3124 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" -#: merge-recursive.c:1602 +#: merge-recursive.c:1587 +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "" +"Rehusando perder el archivo no rastreado en %s, incluso aunque se está " +"interponiendo." + +#: merge-recursive.c:1645 +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +msgstr "" +"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" + +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s es un directorio en %s agregando como %s más bien" -#: merge-recursive.c:1607 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio" -#: merge-recursive.c:1633 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3112,30 +4579,18 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1638 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1699 +#: merge-recursive.c:1793 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:1734 -#, c-format -msgid "Renaming %s to %s and %s to %s instead" -msgstr "Renombrando %s a %s y %s a %s más bien" - -#: merge-recursive.c:1746 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "" -"Rehusando perder el archivo no rastreado en %s, incluso aunque se está " -"interponiendo." - -#: merge-recursive.c:1952 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3146,7 +4601,7 @@ msgstr "" "colocar %s porque el directorio %s fue renombrado a otros múltiples " "directorios, sin ningún que contenga la mayoría de archivos." -#: merge-recursive.c:1984 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3156,7 +4611,7 @@ msgstr "" "existente en %s se interpone con el cambio de nombres implícito, poniendo " "la(s) siguiente(s) ruta(s) aquí: %s." -#: merge-recursive.c:1994 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3165,7 +4620,7 @@ msgstr "" "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta " "para %s; cambio de nombre implícito intentó poner estas rutas: %s" -#: merge-recursive.c:2086 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3174,7 +4629,7 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2331 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3183,261 +4638,333 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-recursive.c:2737 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "" -"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" - -#: merge-recursive.c:2763 -#, c-format -msgid "Adding merged %s" -msgstr "Agregar %s fusionado" - -#: merge-recursive.c:2770 merge-recursive.c:3127 -#, c-format -msgid "Adding as %s instead" -msgstr "Agregando más bien como %s" - -#: merge-recursive.c:2934 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-recursive.c:2937 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-recursive.c:3006 +#: merge-recursive.c:3028 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3006 +#: merge-recursive.c:3028 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3017 +#: merge-recursive.c:3040 msgid "content" msgstr "contenido" -#: merge-recursive.c:3024 +#: merge-recursive.c:3044 msgid "add/add" msgstr "agregar/agregar" -#: merge-recursive.c:3071 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3093 git-submodule.sh:858 +#: merge-recursive.c:3089 git-submodule.sh:1003 msgid "submodule" msgstr "submódulo" -#: merge-recursive.c:3094 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusión en %s" -#: merge-recursive.c:3216 +#: merge-recursive.c:3120 +#, c-format +msgid "Adding as %s instead" +msgstr "Agregando más bien como %s" + +#: merge-recursive.c:3203 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Path actualizado: %s agregado en %s dentro de un directorio que fue " +"renombrado en %s; moviéndolo a %s." + +#: merge-recursive.c:3206 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio " +"que fue renombrado en %s, sugerimos que debería ser movido a %s." + +#: merge-recursive.c:3210 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue " +"renombrado en %s; moviéndolo a %s." + +#: merge-recursive.c:3213 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un " +"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " +"movido a %s." + +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3242 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3248 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3255 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " "%s" -#: merge-recursive.c:3264 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3300 +#: merge-recursive.c:3380 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Los cambios locales de los siguientes archivos serán sobreescritos por " -"merge:\n" -" %s" +msgid "CONFLICT (add/add): Merge conflict in %s" +msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3311 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "¡Ya está actualizado!" -#: merge-recursive.c:3320 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:3419 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3432 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "se encontró %u ancestro común:" msgstr[1] "se encontraron %u ancestros comunes:" -#: merge-recursive.c:3471 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3537 +#: merge-recursive.c:3659 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Los cambios locales de los siguientes archivos serán sobreescritos por " +"merge:\n" +" %s" + +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." -#: midx.c:65 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "archivo multi-pack-index %s es muy pequeño" -#: midx.c:81 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x" -#: midx.c:86 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versión %d de multi-pack-index no reconocida" -#: midx.c:91 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "versión de hash %u no concuerda" -#: midx.c:105 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "offset inválido del conjunto (muy grande)" -#: midx.c:129 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "terminando multi-pack-index porque el id del conjunto aparece antes de lo " "esperado" -#: midx.c:142 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index le falta el conjunto pack-name requerido" -#: midx.c:144 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:146 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:148 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido" -#: midx.c:162 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'" -#: midx.c:205 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mal pack-int-id: %u (%u paquetes totales)" -#: midx.c:246 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño" -#: midx.c:271 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "error preparando packfile de multi-pack-index" -#: midx.c:407 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" msgstr "falló al agregar packfile '%s'" -#: midx.c:413 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "falló al abrir pack-index '%s'" -#: midx.c:507 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" msgstr "falló al ubicar objeto %d en packfile" -#: midx.c:943 +#: midx.c:842 +msgid "Adding packfiles to multi-pack-index" +msgstr "Agregando packfiles a multi-pack-index" + +#: midx.c:875 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "no se vió pack-file %s caer" + +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "Escribiendo chunks a multi-pack-index" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falló al limpiar multi-pack-index en %s" -#: midx.c:981 +#: midx.c:1108 +msgid "Looking for referenced packfiles" +msgstr "Buscando por packfiles referidos" + +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:992 +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" +msgstr "Verificando orden de OID en multi-pack-index" + +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:996 +#: midx.c:1157 +msgid "Sorting objects by packfile" +msgstr "Ordenando objetos por packfile" + +#: midx.c:1164 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1004 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1010 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "falló al cargar el pack-index para packfile %s" -#: midx.c:1019 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: name-hash.c:532 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "Contando objetos no referenciados" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Encontrando y borrando packfiles sin referencias" + +#: midx.c:1388 +msgid "could not start pack-objects" +msgstr "no se pudo empezar los pack-objetcts" + +#: midx.c:1407 +msgid "could not finish pack-objects" +msgstr "no se pudo finalizar pack-objetcts" + +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no es posible crear hilo lazy_dir: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "no es posible crear hilo lazy_name: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "no es posible unir hilo lazy_name: %s" -#: notes-merge.c:275 +#: notes-merge.c:277 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -3449,23 +4976,23 @@ msgstr "" "confirmar/abortar la fusión previa antes de que puedas comenzar una nueva " "nota de fusión." -#: notes-merge.c:282 +#: notes-merge.c:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "No has terminado tus notas de fusión (%s existe)." -#: notes-utils.c:45 +#: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "No se puede realizar commit, notas del árbol no inicializadas o no " "referenciadas" -#: notes-utils.c:104 +#: notes-utils.c:105 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Valor erróneo para notes.rewriteMode: '%s'" -#: notes-utils.c:114 +#: notes-utils.c:115 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" @@ -3474,12 +5001,12 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:144 +#: notes-utils.c:145 #, c-format msgid "Bad %s value: '%s'" msgstr "Valor erróneo para %s: '%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "tipo de objeto \"%s\" inválido" @@ -3499,32 +5026,92 @@ msgstr "el objeto %s tiene un id de tipo desconocido %d" msgid "unable to parse object: %s" msgstr "incapaz de analizar objeto: %s" -#: object.c:266 object.c:277 +#: object.c:266 object.c:278 #, c-format -msgid "sha1 mismatch %s" -msgstr "sha1 no concuerda %s" +msgid "hash mismatch %s" +msgstr "hash no concuerda %s" -#: packfile.c:607 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1864 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -"offset antes del comienzo del índice del paquete para %s (índice corrupto?)" +"offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)" -#: packfile.c:1868 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -"offset más allá del índice de fin de paquete para %s (índice truncado?)" +"offset más allá del índice de fin de paquete para %s (¿índice truncado?)" + +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#, c-format +msgid "unable to get size of %s" +msgstr "no se pudo obtener el tamaño de %s" + +#: parse-options.c:38 +#, c-format +msgid "%s requires a value" +msgstr "%s requiere un valor" + +#: parse-options.c:73 +#, c-format +msgid "%s is incompatible with %s" +msgstr "%s es incompatible con %s" + +#: parse-options.c:78 +#, c-format +msgid "%s : incompatible with something else" +msgstr "%s : incompatible con otra cosa" + +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#, c-format +msgid "%s takes no value" +msgstr "%s no toma valores" + +#: parse-options.c:94 +#, c-format +msgid "%s isn't available" +msgstr "%s no está disponible" + +#: parse-options.c:217 +#, c-format +msgid "%s expects a non-negative integer value with an optional k/m/g suffix" +msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g" -#: parse-options.c:672 +#: parse-options.c:386 +#, c-format +msgid "ambiguous option: %s (could be --%s%s or --%s%s)" +msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)" + +#: parse-options.c:420 parse-options.c:428 +#, c-format +msgid "did you mean `--%s` (with two dashes)?" +msgstr "¿quisiste decir `--%s` (con dos guiones)?" + +#: parse-options.c:857 +#, c-format +msgid "unknown option `%s'" +msgstr "opción `%s' desconocida" + +#: parse-options.c:859 +#, c-format +msgid "unknown switch `%c'" +msgstr "switch desconocido `%c'" + +#: parse-options.c:861 +#, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "opción desconocida en string no ascii: `%s'" + +#: parse-options.c:885 msgid "..." msgstr "..." -#: parse-options.c:691 +#: parse-options.c:904 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -3532,59 +5119,74 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:697 +#: parse-options.c:910 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:700 +#: parse-options.c:913 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:739 +#: parse-options.c:952 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:37 +#: parse-options.c:966 +#, c-format +msgid "alias of --%s" +msgstr "alias de --%s" + +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "opción `%s' espera un valor numérico" + +#: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "fecha de expiración mal formada: '%s'" -#: parse-options-cb.c:109 +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\"" + +#: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "nombre de objeto mal formado '%s'" -#: path.c:894 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "No se pudo hacer que %s fuera escribible por el grupo" -#: pathspec.c:129 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Carácter de escape '\\' no permitido como último carácter en el valor attr" -#: pathspec.c:147 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Solo una especificación 'attr' es permitida." -#: pathspec.c:150 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "especificación attr no puede estar vacía" -#: pathspec.c:193 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nombre de atributo %s inválido" -#: pathspec.c:258 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles" -#: pathspec.c:265 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -3592,128 +5194,200 @@ msgstr "" "la configuración global de 'literal' para patrones de ruta es incompatible " "con las demás configuraciones globales de patrones de ruta" -#: pathspec.c:305 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parámetro no válido para el prefijo 'magic pathspec'" -#: pathspec.c:326 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magic pathspec inválido '%.*s' en '%s'" -#: pathspec.c:331 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta ')' al final del magic pathspec en '%s'" -#: pathspec.c:369 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magic pathspec '%c' no implementado en '%s'" -#: pathspec.c:428 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' y 'glob' son incompatibles" -#: pathspec.c:441 +#: pathspec.c:442 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' está fuera del repositorio" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: '%s' está fuera del repositorio en '%s'" -#: pathspec.c:515 +#: pathspec.c:517 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (nemotécnico: '%c')" -#: pathspec.c:525 +#: pathspec.c:527 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec no soportado por este comando: %s" -#: pathspec.c:592 +#: pathspec.c:594 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" -#: pkt-line.c:104 +#: pathspec.c:639 +#, c-format +msgid "line is badly quoted: %s" +msgstr "la línea está mál citada: %s" + +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "no es posible escribir flush packet" + +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "no es posible escribir delim packet" + +#: pkt-line.c:106 msgid "flush packet write failed" msgstr "limpieza de escritura de paquetes falló" -#: pkt-line.c:142 pkt-line.c:228 +#: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "error de protocolo: línea imposiblemente larga" -#: pkt-line.c:158 pkt-line.c:160 +#: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "escritura de paquetes con formato falló" -#: pkt-line.c:192 +#: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete" -#: pkt-line.c:199 pkt-line.c:206 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "escritura de paquetes falló" -#: pkt-line.c:291 +#: pkt-line.c:295 msgid "read error" msgstr "error de lectura" -#: pkt-line.c:299 +#: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "el remoto se colgó de manera inesperada" -#: pkt-line.c:327 +#: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "error de protocolo: mal caracter de largo de línea: %.4s" -#: pkt-line.c:337 pkt-line.c:342 +#: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "error de protocolo: mal largo de línea %d" -#: preload-index.c:118 +#: pkt-line.c:362 +#, c-format +msgid "remote error: %s" +msgstr "error remoto: %s" + +#: preload-index.c:119 msgid "Refreshing index" msgstr "Refrescando index" -#: preload-index.c:137 +#: preload-index.c:138 #, c-format msgid "unable to create threaded lstat: %s" msgstr "no es posible crear lstat hilado: %s" -#: pretty.c:962 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: range-diff.c:56 +#: promisor-remote.c:23 +msgid "Remote with no URL" +msgstr "Remoto sin URL" + +#: promisor-remote.c:58 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "nombre remoto promisor no puede comenzar con '/': %s" + +#: range-diff.c:75 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:59 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:74 sequencer.c:4764 +#: range-diff.c:96 sequencer.c:5020 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:224 +#: range-diff.c:122 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "no se puede analizar git header '%.*s'" + +#: range-diff.c:285 msgid "failed to generate diff" msgstr "falló al generar diff" -#: range-diff.c:455 range-diff.c:457 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" -#: read-cache.c:1490 +#: read-cache.c:680 +#, c-format +msgid "will not add file alias '%s' ('%s' already exists in index)" +msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)" + +#: read-cache.c:696 +msgid "cannot create an empty blob in the object database" +msgstr "no se puede crear un blob vacío en la base de datos de objetos" + +#: read-cache.c:718 +#, c-format +msgid "%s: can only add regular files, symbolic links or git-directories" +msgstr "" +"%s: solo puede agregar archivos regulares, symbolic links o git-directories" + +#: read-cache.c:723 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' no tiene un commit checked out" + +#: read-cache.c:775 +#, c-format +msgid "unable to index file '%s'" +msgstr "no es posible indexar archivo '%s'" + +#: read-cache.c:794 +#, c-format +msgid "unable to add '%s' to index" +msgstr "no es posible agregar '%s' al index" + +#: read-cache.c:805 +#, c-format +msgid "unable to stat '%s'" +msgstr "incapaz de correr stat en '%s'" + +#: read-cache.c:1330 +#, c-format +msgid "'%s' appears as both a file and as a directory" +msgstr "'%s' parece ser un directorio y un archivo a la vez" + +#: read-cache.c:1536 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1604 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -3722,7 +5396,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1614 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -3731,60 +5405,161 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1792 +#: read-cache.c:1717 +#, c-format +msgid "bad signature 0x%08x" +msgstr "mala firma 0x%08x" + +#: read-cache.c:1720 +#, c-format +msgid "bad index version %d" +msgstr "mala versión del índice %d" + +#: read-cache.c:1729 +msgid "bad index file sha1 signature" +msgstr "mala firma sha1 del archivo index" + +#: read-cache.c:1759 +#, c-format +msgid "index uses %.4s extension, which we do not understand" +msgstr "index usa %.4s extensiones, cosa que no entendemos" + +#: read-cache.c:1761 +#, c-format +msgid "ignoring %.4s extension" +msgstr "ignorando extensión %.4s" + +#: read-cache.c:1798 +#, c-format +msgid "unknown index entry format 0x%08x" +msgstr "formato de index desconocido 0x%08x" + +#: read-cache.c:1814 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nombre malformado en el index, cerca a ruta '%s'" -#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458 -#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585 -#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343 -#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144 -#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329 +#: read-cache.c:1871 +msgid "unordered stage entries in index" +msgstr "entradas en stage desordenadas en index" + +#: read-cache.c:1874 +#, c-format +msgid "multiple stage entries for merged file '%s'" +msgstr "múltiples entradas extrañas para archivo fusionado '%s'" + +#: read-cache.c:1877 +#, c-format +msgid "unordered stage entries for '%s'" +msgstr "entradas de stage desordenadas para '%s'" + +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "archivo índice corrompido" -#: read-cache.c:2101 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2114 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entires: %s" -#: read-cache.c:2201 +#: read-cache.c:2170 +#, c-format +msgid "%s: index file open failed" +msgstr "%s: falló al abrir el archivo index" + +#: read-cache.c:2174 +#, c-format +msgid "%s: cannot stat the open index" +msgstr "%s: no se puede hacer stat del index abierto" + +#: read-cache.c:2178 +#, c-format +msgid "%s: index file smaller than expected" +msgstr "%s: archivo index más pequeño de lo esperado" + +#: read-cache.c:2182 +#, c-format +msgid "%s: unable to map index file" +msgstr "%s: no se pudo mapear el archivo index" + +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2228 +#: read-cache.c:2251 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086 +#: read-cache.c:2283 +#, c-format +msgid "could not freshen shared index '%s'" +msgstr "no se pudo refrescar el index compartido '%s'" + +#: read-cache.c:2330 +#, c-format +msgid "broken index, expect %s in %s, got %s" +msgstr "index roto, se esperaba %s en %s, se obtuvo %s" + +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:3068 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3080 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: rebase-interactive.c:10 +#: read-cache.c:3179 +#, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "no se pudo arreglar bits de permisos en '%s'" + +#: read-cache.c:3328 +#, c-format +msgid "%s: cannot drop to stage #0" +msgstr "%s: no se puede eliminar a stage #0" + +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git " +"rebase --continue'.\n" +"O se puede abortar el rebase con 'git rebase --abort'.\n" + +#: rebase-interactive.c:33 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." + +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -3826,7 +5601,14 @@ msgstr "" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:63 +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "Rebase %s en %s (%d comando)" +msgstr[1] "Rebase %s en %s (%d comandos)" + +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -3834,15 +5616,15 @@ msgstr "" "\n" "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" "\n" -"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n" +"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n" -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -3851,12 +5633,12 @@ msgid "" "\n" msgstr "" "\n" -"Esta editando el archivo TODO de un rebase interactivo.\n" -"Para continuar el rebase después de editar, ejecute:\n" +"Estás editando el archivo TODO de un rebase interactivo.\n" +"Para continuar el rebase después de editar, ejecuta:\n" " git rebase --continue\n" "\n" -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -3866,125 +5648,161 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900 -msgid "Note that empty commits are commented out" -msgstr "Tenga en cuenta que los commits vacíos están comentados" +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#, c-format +msgid "could not write '%s'" +msgstr "no se pudo escribir '%s'" -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186 -#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 +#: builtin/rebase.c:234 +#, c-format +msgid "could not write '%s'." +msgstr "no se pudo escribir '%s'." + +#: rebase-interactive.c:193 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Peligro: algunos commits pueden haber sido botados de forma accidental.\n" +"Commits botados (empezando con el más nuevo):\n" + +#: rebase-interactive.c:200 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un " +"commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de " +"advertencias.\n" +"Los posibles comportamientos son: ignore,warn,error.\n" +"\n" + +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 +#: builtin/rebase.c:246 #, c-format msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: refs.c:192 +#: refs.c:262 #, c-format msgid "%s does not point to a valid object!" -msgstr "%s no apunta a ningún objeto válido!" +msgstr "¡%s no apunta a ningún objeto válido!" -#: refs.c:583 +#: refs.c:667 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorando referencia rota %s" -#: refs.c:585 ref-filter.c:1951 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: refs.c:711 +#: refs.c:804 #, c-format msgid "could not open '%s' for writing: %s" msgstr "no se pudo abrir '%s' para escritura: %s" -#: refs.c:721 refs.c:772 +#: refs.c:814 refs.c:865 #, c-format msgid "could not read ref '%s'" msgstr "no se pudo leer la referencia '%s'" -#: refs.c:727 +#: refs.c:820 #, c-format msgid "ref '%s' already exists" msgstr "ref '%s' ya existe" -#: refs.c:732 +#: refs.c:825 #, c-format msgid "unexpected object ID when writing '%s'" -msgstr "ID de objecto inesperado cuando se escribía '%s'" +msgstr "ID de objecto inesperado al escribir '%s'" -#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636 -#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788 -#: wrapper.c:656 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "no se pudo escribir en '%s'" -#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:728 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:1029 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" -#: refs.c:774 +#: refs.c:867 #, c-format msgid "unexpected object ID when deleting '%s'" -msgstr "ID de objecto inesperado cuando se borraba '%s'" +msgstr "ID de objecto inesperado al borrar '%s'" -#: refs.c:905 +#: refs.c:998 #, c-format msgid "log for ref %s has gap after %s" msgstr "log de ref %s tiene un vacío tras %s" -#: refs.c:911 +#: refs.c:1004 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "log de ref %s finalizado inesperadamente en %s" -#: refs.c:969 +#: refs.c:1063 #, c-format msgid "log for %s is empty" msgstr "log de %s está vacío" -#: refs.c:1061 +#: refs.c:1155 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "rehusando actualizar ref con mal nombre '%s'" -#: refs.c:1137 +#: refs.c:1231 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref falló para ref '%s': %s" -#: refs.c:1911 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "múltiples actualizaciones para ref '%s' no permitidas" -#: refs.c:1943 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs.c:2039 refs.c:2069 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe; no se puede crear '%s'" -#: refs.c:2045 refs.c:2080 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no se puede procesar '%s' y '%s' al mismo tiempo" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "no se pudo eliminar la referencia %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1245 refs/packed-backend.c:1545 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" @@ -3994,350 +5812,485 @@ msgstr "no se pudo eliminar la referencia: %s" msgid "invalid refspec '%s'" msgstr "refspec inválido: '%s'" -#: ref-filter.c:39 wt-status.c:1855 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "desaparecido" -#: ref-filter.c:40 +#: ref-filter.c:43 #, c-format msgid "ahead %d" msgstr "adelante %d" -#: ref-filter.c:41 +#: ref-filter.c:44 #, c-format msgid "behind %d" msgstr "detrás %d" -#: ref-filter.c:42 +#: ref-filter.c:45 #, c-format msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:138 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:140 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:162 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:166 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:168 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:223 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningún argumento" -#: ref-filter.c:235 +#: ref-filter.c:272 #, c-format -msgid "%%(objectsize) does not take arguments" -msgstr "%%(objectsize) no toma argumentos" +msgid "unrecognized %%(objectsize) argument: %s" +msgstr "%%(objectsize) no reconocido argumento: %s" -#: ref-filter.c:247 +#: ref-filter.c:280 +#, c-format +msgid "%%(deltabase) does not take arguments" +msgstr "%%(deltabase) no toma argumentos" + +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:256 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no toma ningún argumento" -#: ref-filter.c:278 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:307 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:309 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:324 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positivo esperado objectname:short=%s" -#: ref-filter.c:328 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argumento: %s no reconocido %%(objectname)" -#: ref-filter.c:358 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:370 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:377 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:386 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:394 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:412 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:508 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:535 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:539 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data" -#: ref-filter.c:663 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:726 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:728 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" -msgstr "formato: átomo %%(then) usado mas de una vez" +msgstr "formato: átomo %%(then) usado más de una vez" -#: ref-filter.c:730 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:758 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:760 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" -#: ref-filter.c:762 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" -msgstr "formato: átomo %%(else) usado mas de una vez" +msgstr "formato: átomo %%(else) usado más de una vez" -#: ref-filter.c:777 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:834 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1424 +#: ref-filter.c:1488 #, c-format -msgid "(no branch, rebasing %s)" -msgstr "(no hay rama, rebasando %s)" +msgid "no branch, rebasing %s" +msgstr "no hay rama, rebasando %s" -#: ref-filter.c:1427 -#, c-format -msgid "(no branch, rebasing detached HEAD %s)" -msgstr "(no hay rama, rebasando con HEAD desacoplado %s)" - -#: ref-filter.c:1430 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(no hay rama, comenzando biseccón en %s)" - -#. TRANSLATORS: make sure this matches "HEAD -#. detached at " in wt-status.c -#. -#: ref-filter.c:1438 +#: ref-filter.c:1491 #, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD desacoplado en %s)" +msgid "no branch, rebasing detached HEAD %s" +msgstr "(o hay rama, rebasando con HEAD desacoplado %s" -#. TRANSLATORS: make sure this matches "HEAD -#. detached from " in wt-status.c -#. -#: ref-filter.c:1445 +#: ref-filter.c:1494 #, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD desacoplado de %s)" +msgid "no branch, bisect started on %s" +msgstr "no hay rama, comenzando biseccón en %s" -#: ref-filter.c:1449 -msgid "(no branch)" -msgstr "(sin rama)" +#: ref-filter.c:1504 +msgid "no branch" +msgstr "sin rama" -#: ref-filter.c:1483 ref-filter.c:1638 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1491 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:1857 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:1946 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2232 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2338 +#: ref-filter.c:2489 +#, c-format +msgid "option `%s' is incompatible with --merged" +msgstr "opción `%s' es incompatible con --merged" + +#: ref-filter.c:2492 +#, c-format +msgid "option `%s' is incompatible with --no-merged" +msgstr "opción `%s' es incompatible con --no-merged" + +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: remote.c:607 +#: ref-filter.c:2507 +#, c-format +msgid "option `%s' must point to a commit" +msgstr "opción '%s' debe apuntar a un commit" + +#: remote.c:366 +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "config remote shorthand no puede comenzar con '/': %s" + +#: remote.c:414 +msgid "more than one receivepack given, using the first" +msgstr "más de un receivepack dado, usando el primero" + +#: remote.c:422 +msgid "more than one uploadpack given, using the first" +msgstr "más de un uploadpack dado, usando el primero" + +#: remote.c:612 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:611 +#: remote.c:616 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:615 +#: remote.c:620 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:623 -msgid "Internal error" -msgstr "Error interno" +#: remote.c:688 +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "llave '%s' de patrón no tuvo '*'" + +#: remote.c:698 +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "valor '%s' del patrón no tiene '*'" + +#: remote.c:1004 +#, c-format +msgid "src refspec %s does not match any" +msgstr "src refsoec %s: no concuerda con ninguno" -#: remote.c:1569 remote.c:1670 +#: remote.c:1009 +#, c-format +msgid "src refspec %s matches more than one" +msgstr "src refspec %s concuerda con más de uno" + +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is +#. the <src>. +#. +#: remote.c:1024 +#, c-format +msgid "" +"The destination you provided is not a full refname (i.e.,\n" +"starting with \"refs/\"). We tried to guess what you meant by:\n" +"\n" +"- Looking for a ref that matches '%s' on the remote side.\n" +"- Checking if the <src> being pushed ('%s')\n" +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" +" refs/{heads,tags}/ prefix on the remote side.\n" +"\n" +"Neither worked, so we gave up. You must fully qualify the ref." +msgstr "" +"El destino que provees no es un full refname (i.e.,\n" +"comienza con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n" +"\n" +"- Buscando un ref que concuerde con '%s' en el lado remoto.\n" +"- Revisando si el <src> es usado en el push('%s')\n" +" es un ref en \"refs/{heads,tags}/\". Si es así, agregamos el prefijo\n" +" refs/{heads,tags}/ correspondiente al lado remoto.\n" +"\n" +"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el " +"full ref." + +#: remote.c:1044 +#, c-format +msgid "" +"The <src> part of the refspec is a commit object.\n" +"Did you mean to create a new branch by pushing to\n" +"'%s:refs/heads/%s'?" +msgstr "" +"La parte <src> del refspec es un objeto commit.\n" +"¿Quisiste crear un branch nuevo mediante un push a\n" +"'%s:refs/heads/%s'?" + +#: remote.c:1049 +#, c-format +msgid "" +"The <src> part of the refspec is a tag object.\n" +"Did you mean to create a new tag by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"The <src> part of the refspec is a tag object.\n" +"Did you mean to create a new tag by pushing to\n" +"'%s:refs/tags/%s'?" + +#: remote.c:1054 +#, c-format +msgid "" +"The <src> part of the refspec is a tree object.\n" +"Did you mean to tag a new tree by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"La parte <src> del refspec es un objeto tree.\n" +"¿Quisiste crear un tag nuevo mediante un push a\n" +"'%s:refs/heads/%s'?" + +#: remote.c:1059 +#, c-format +msgid "" +"The <src> part of the refspec is a blob object.\n" +"Did you mean to tag a new blob by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"La parte <src> del refspec es un objeto blob.\n" +"¿Quisiste crear un tag nuevo mediante un push a\n" +"'%s:refs/heads/%s'?" + +#: remote.c:1095 +#, c-format +msgid "%s cannot be resolved to branch" +msgstr "%s no puede ser resolver a un branch" + +#: remote.c:1106 +#, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "no es posible borrar '%s': ref remoto no existe" + +#: remote.c:1118 +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "dst refspec %s concuerda con más de uno" + +#: remote.c:1125 +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "dst ref %s recibe de más de un src" + +#: remote.c:1628 remote.c:1729 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1578 +#: remote.c:1637 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1581 +#: remote.c:1640 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1587 +#: remote.c:1646 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" -#: remote.c:1602 +#: remote.c:1661 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" -#: remote.c:1614 +#: remote.c:1673 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1624 +#: remote.c:1683 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1637 +#: remote.c:1696 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1659 +#: remote.c:1718 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino único" -#: remote.c:1935 +#: remote.c:1844 +#, c-format +msgid "couldn't find remote ref %s" +msgstr "no se puedo encontrar ref remota %s" + +#: remote.c:1857 +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "* Ignorando ref graciosa '%s' localmente" + +#: remote.c:2020 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n" -#: remote.c:1939 +#: remote.c:2024 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:1942 +#: remote.c:2027 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:1946 +#: remote.c:2031 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Tu rama y '%s' refieren a commits diferentes.\n" -#: remote.c:1949 +#: remote.c:2034 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" para detalles)\n" -#: remote.c:1953 +#: remote.c:2038 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n" msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" -#: remote.c:1959 +#: remote.c:2044 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:1962 +#: remote.c:2047 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -4347,11 +6300,11 @@ msgstr[0] "" msgstr[1] "" "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:1970 +#: remote.c:2055 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:1973 +#: remote.c:2058 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -4366,10 +6319,15 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:1983 +#: remote.c:2068 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" +#: remote.c:2251 +#, c-format +msgid "cannot parse expected object name '%s'" +msgstr "no se puede leer el nombre de objeto '%s'" + #: replace-object.c:21 #, c-format msgid "bad replace ref name: %s" @@ -4380,7 +6338,7 @@ msgstr "mal nombre de ref de reemplazo: %s" msgid "duplicate replace ref: %s" msgstr "duplicar ref de reemplazo: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "remplazar profundiad muy elevada para objeto %s" @@ -4393,11 +6351,6 @@ msgstr "MERGE_RR corrupto" msgid "unable to write rerere record" msgstr "incapaz de escribir entrada rerere" -#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162 -#, c-format -msgid "could not write '%s'" -msgstr "no se pudo escribir '%s'" - #: rerere.c:495 #, c-format msgid "there were errors while writing '%s' (%s)" @@ -4448,8 +6401,8 @@ msgstr "no se puede desvincular stray '%s'" msgid "Recorded preimage for '%s'" msgstr "Resolución precargada para '%s'" -#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413 -#: builtin/submodule--helper.c:1423 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -4483,29 +6436,33 @@ msgstr "Se olvidó resolución para '%s'\n" msgid "unable to open rr-cache directory" msgstr "no es posible abrir directorio rr-cache" -#: revision.c:2324 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2327 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "tu rama actual '%s' no tiene ningún commit todavía" -#: revision.c:2523 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: run-command.c:740 +#: revision.c:2712 +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L no soporta todavía formatos de diff fuera de -p y -s" + +#: run-command.c:763 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" -#: run-command.c:1229 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" -#: run-command.c:1293 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -4515,30 +6472,30 @@ msgstr "" "Puedes desactivar esta advertencias con `git config advice.ignoredHook " "false`." -#: send-pack.c:142 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "flush packet inesperado mientras se leía estatus de desempaquetado remoto" -#: send-pack.c:144 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no es posible analizar el estado de desempaquetado remoto: %s" -#: send-pack.c:146 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "desempaquetado remoto falló: %s" -#: send-pack.c:308 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "falló al firmar el certificado de push" -#: send-pack.c:421 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta --signed push" -#: send-pack.c:423 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -4546,42 +6503,47 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed )" -#: send-pack.c:435 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push atómicos (--atomic)" -#: send-pack.c:440 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:183 +#: sequencer.c:191 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit inválido, modo cleanup '%s'" -#: sequencer.c:287 +#: sequencer.c:296 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:313 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#, c-format +msgid "could not remove '%s'" +msgstr "no se pudo eliminar'%s'" + +#: sequencer.c:325 msgid "revert" msgstr "revertir" -#: sequencer.c:315 +#: sequencer.c:327 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:317 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:329 +msgid "rebase" +msgstr "rebase" -#: sequencer.c:319 +#: sequencer.c:331 #, c-format msgid "unknown action: %d" msgstr "acción desconocida: %d" -#: sequencer.c:376 +#: sequencer.c:389 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -4589,7 +6551,7 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:379 +#: sequencer.c:392 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -4599,110 +6561,110 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:392 sequencer.c:2632 +#: sequencer.c:405 sequencer.c:2901 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:399 +#: sequencer.c:412 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652 -#: sequencer.c:2885 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 +#: sequencer.c:3185 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" -#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535 -#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746 -#: builtin/merge.c:1084 builtin/rebase.c:152 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 +#: builtin/rebase.c:593 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: sequencer.c:453 +#: sequencer.c:466 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:457 +#: sequencer.c:470 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:486 +#: sequencer.c:502 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" +#: sequencer.c:541 builtin/tag.c:565 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Modo cleanup inválido %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:575 +#: sequencer.c:635 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:591 +#: sequencer.c:652 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de la caché" -#: sequencer.c:604 +#: sequencer.c:666 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:684 +#: sequencer.c:746 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:695 +#: sequencer.c:757 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719 -#: builtin/am.c:811 builtin/merge.c:1081 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:742 +#: sequencer.c:804 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:747 +#: sequencer.c:809 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:752 +#: sequencer.c:814 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:756 +#: sequencer.c:818 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:761 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:763 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:765 +#: sequencer.c:827 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:825 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "formato de fecha inválido '%s' en '%s'" - -#: sequencer.c:842 +#: sequencer.c:876 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -4732,15 +6694,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:935 -msgid "writing root commit" -msgstr "escribiendo commit raíz" - -#: sequencer.c:1142 +#: sequencer.c:1148 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' falló" -#: sequencer.c:1149 +#: sequencer.c:1154 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4767,7 +6725,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1162 +#: sequencer.c:1167 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4791,299 +6749,347 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1202 +#: sequencer.c:1209 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: sequencer.c:1204 +#: sequencer.c:1211 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: sequencer.c:1250 +#: sequencer.c:1257 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1252 +#: sequencer.c:1259 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1256 +#: sequencer.c:1263 msgid " (root-commit)" msgstr " (commit-raíz)" -#: sequencer.c:1277 +#: sequencer.c:1284 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1279 +#: sequencer.c:1286 #, c-format msgid "HEAD %s is not a commit!" -msgstr "HEAD %s no es un commit!" +msgstr "¡HEAD %s no es un commit!" -#: sequencer.c:1283 builtin/commit.c:1543 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1334 sequencer.c:1934 +#: sequencer.c:1342 sequencer.c:1968 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: sequencer.c:1361 sequencer.c:1416 +#: sequencer.c:1386 sequencer.c:1447 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858 -#: builtin/merge.c:883 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 +#: builtin/merge.c:911 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1443 +#: sequencer.c:1474 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1448 +#: sequencer.c:1479 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1546 sequencer.c:1654 +#: sequencer.c:1562 sequencer.c:1673 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1601 sequencer.c:1626 +#: sequencer.c:1620 sequencer.c:1645 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:1611 sequencer.c:4744 +#: sequencer.c:1630 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1613 sequencer.c:2912 +#: sequencer.c:1632 sequencer.c:3212 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1615 +#: sequencer.c:1634 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1621 +#: sequencer.c:1640 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1628 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1636 +#: sequencer.c:1655 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1643 +#: sequencer.c:1662 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1649 +#: sequencer.c:1668 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:1732 +#: sequencer.c:1756 msgid "your index file is unmerged." msgstr "tu archivo índice no está fusionado." -#: sequencer.c:1739 +#: sequencer.c:1763 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raíz" -#: sequencer.c:1758 +#: sequencer.c:1782 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "el commit %s es una fusión pero no se proporcionó la opción -m." -#: sequencer.c:1766 +#: sequencer.c:1790 sequencer.c:1798 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1770 -#, c-format -msgid "mainline was specified but commit %s is not a merge." -msgstr "línea principal especificada pero el commit %s no es una fusión." - -#: sequencer.c:1776 +#: sequencer.c:1804 #, c-format msgid "cannot get commit message for %s" msgstr "no se puede obtener el mensaje de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1795 +#: sequencer.c:1823 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1860 +#: sequencer.c:1888 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1915 +#: sequencer.c:1943 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1916 +#: sequencer.c:1944 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1974 +#: sequencer.c:1961 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n" + +#: sequencer.c:2018 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falló al leer el índice" -#: sequencer.c:1981 +#: sequencer.c:2025 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falló al refrescar el índice" -#: sequencer.c:2062 +#: sequencer.c:2102 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2071 +#: sequencer.c:2111 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2130 +#: sequencer.c:2142 +#, c-format +msgid "could not parse '%s'" +msgstr "no se puede analizar '%s'" + +#: sequencer.c:2203 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:2138 +#: sequencer.c:2214 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2209 +#: sequencer.c:2298 +msgid "cancelling a cherry picking in progress" +msgstr "cancelando cherry-pick en progreso" + +#: sequencer.c:2305 +msgid "cancelling a revert in progress" +msgstr "cancelando revert en progreso" + +#: sequencer.c:2349 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2211 +#: sequencer.c:2351 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2216 +#: sequencer.c:2356 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:2227 +#: sequencer.c:2367 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2229 +#: sequencer.c:2369 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2299 +#: sequencer.c:2447 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido para %s: %s" -#: sequencer.c:2380 +#: sequencer.c:2540 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2396 +#: sequencer.c:2556 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2479 sequencer.c:4005 +#: sequencer.c:2644 sequencer.c:4361 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:2487 -msgid "a cherry-pick or revert is already in progress" -msgstr "un cherry-pick o revert ya está en progreso" +#: sequencer.c:2660 +msgid "revert is already in progress" +msgstr "revert ya está en progreso" -#: sequencer.c:2488 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\"" +#: sequencer.c:2662 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" + +#: sequencer.c:2665 +msgid "cherry-pick is already in progress" +msgstr "cherry-pick ya está en progreso" + +#: sequencer.c:2667 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2491 +#: sequencer.c:2681 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2505 +#: sequencer.c:2696 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2560 sequencer.c:3761 +#: sequencer.c:2756 sequencer.c:4099 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:2562 +#: sequencer.c:2758 sequencer.c:2769 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2564 sequencer.c:2599 +#: sequencer.c:2760 sequencer.c:2804 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2585 builtin/grep.c:721 +#: sequencer.c:2790 builtin/grep.c:724 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2587 +#: sequencer.c:2792 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2588 +#: sequencer.c:2793 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2594 +#: sequencer.c:2799 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto" -#: sequencer.c:2605 +#: sequencer.c:2810 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!" +msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!" -#: sequencer.c:2709 sequencer.c:3679 +#: sequencer.c:2851 +msgid "no revert in progress" +msgstr "no hay revert en progreso" + +#: sequencer.c:2859 +msgid "no cherry-pick in progress" +msgstr "ningún cherry-pick en progreso" + +#: sequencer.c:2869 +msgid "failed to skip the commit" +msgstr "falló al escribir el commit" + +#: sequencer.c:2876 +msgid "there is nothing to skip" +msgstr "no hay nada que saltar" + +#: sequencer.c:2879 +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"¿ya has hecho el commit?\n" +"intenta \"git %s --continue\"" + +#: sequencer.c:3003 sequencer.c:4011 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:2747 sequencer.c:3659 +#: sequencer.c:3042 sequencer.c:3991 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:2762 +#: sequencer.c:3059 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:2770 +#: sequencer.c:3067 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5094,35 +7100,30 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"Puede enmendar el commit ahora, con\n" +"Puedes enmendar el commit ahora, con\n" "\n" "\tgit commit --amend %s\n" "\n" -"Una vez que esté satisfecho con los cambios, ejecute\n" +"Una vez que estés satisfecho con los cambios, ejecuta\n" "\n" "\tgit rebase --continue\n" -#: sequencer.c:2780 +#: sequencer.c:3077 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:2787 +#: sequencer.c:3084 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019 -#: builtin/rebase.c:1372 builtin/rebase.c:1426 -msgid "could not read index" -msgstr "no se pudo leer índice" - -#: sequencer.c:2829 +#: sequencer.c:3129 #, c-format msgid "" "execution failed: %s\n" @@ -5137,11 +7138,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2835 +#: sequencer.c:3135 msgid "and made changes to the index and/or the working tree\n" msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" -#: sequencer.c:2841 +#: sequencer.c:3141 #, c-format msgid "" "execution succeeded: %s\n" @@ -5158,76 +7159,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2902 +#: sequencer.c:3202 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:2954 +#: sequencer.c:3256 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:2959 +#: sequencer.c:3261 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: sequencer.c:3015 builtin/rebase.c:604 -msgid "could not write index" -msgstr "no se pudo escribir índice" - -#: sequencer.c:3042 +#: sequencer.c:3344 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3068 +#: sequencer.c:3375 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3090 +#: sequencer.c:3397 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3099 +#: sequencer.c:3406 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3111 +#: sequencer.c:3418 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]" -#: sequencer.c:3126 +#: sequencer.c:3434 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3274 +#: sequencer.c:3594 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3290 +#: sequencer.c:3610 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:3358 builtin/rebase.c:268 +#: sequencer.c:3679 builtin/rebase.c:737 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3370 +#: sequencer.c:3691 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3373 builtin/rebase.c:284 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -5239,31 +7236,26 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3427 -#, c-format -msgid "could not checkout %s" -msgstr "no se puede hacer checkout a %s" - -#: sequencer.c:3441 +#: sequencer.c:3755 #, c-format msgid "%s: not a valid OID" msgstr "%s no es OID válido" -#: sequencer.c:3446 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3461 +#: sequencer.c:3775 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3463 +#: sequencer.c:3777 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3471 +#: sequencer.c:3785 #, c-format msgid "" "Could not execute the todo command\n" @@ -5284,48 +7276,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3543 +#: sequencer.c:3869 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:3622 +#: sequencer.c:3940 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:3667 +#: sequencer.c:3999 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:3672 sequencer.c:4741 +#: sequencer.c:4004 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:3686 +#: sequencer.c:4018 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:3772 +#: sequencer.c:4111 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:3781 +#: sequencer.c:4120 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:3783 +#: sequencer.c:4122 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:3785 +#: sequencer.c:4124 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:3788 +#: sequencer.c:4127 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -5336,125 +7328,59 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:3824 sequencer.c:3862 +#: sequencer.c:4163 sequencer.c:4202 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:3877 +#: sequencer.c:4217 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:3884 +#: sequencer.c:4224 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:3982 +#: sequencer.c:4338 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:3986 +#: sequencer.c:4342 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4021 +#: sequencer.c:4377 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4466 +#: sequencer.c:4846 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4469 +#: sequencer.c:4849 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "lista de pendientes inutilizable: '%s'" - -#: sequencer.c:4620 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "" -"opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." - -#: sequencer.c:4690 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"Peligro: algunos commits pueden haber sido botados de forma accidental.\n" -"Commits botados (empezando con el mas nuevo):\n" - -#: sequencer.c:4697 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un " -"commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de " -"advertencias.\n" -"Los posibles comportamientos son: ignore,warn,error.\n" -"\n" - -#: sequencer.c:4710 -#, c-format -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git " -"rebase --continue'.\n" -"O se puede abortar el rebase con 'git rebase --abort'.\n" - -#: sequencer.c:4848 sequencer.c:4886 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:4852 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "Rebase %s en %s (%d comando)" -msgstr[1] "Rebase %s en %s (%d comandos)" - -#: sequencer.c:4864 -#, c-format -msgid "could not copy '%s' to '%s'." -msgstr "no se pudo copiar '%s' a '%s'." - -#: sequencer.c:4868 sequencer.c:4897 -msgid "could not transform the todo list" -msgstr "no se pudo transformar lista de pendientes" - -#: sequencer.c:4900 +#: sequencer.c:5119 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:4983 +#: sequencer.c:5213 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." -#: setup.c:123 +#: setup.c:124 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' está fuera del repositorio" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' está fuera del repositorio en '%s'" -#: setup.c:172 +#: setup.c:175 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -5464,7 +7390,7 @@ msgstr "" "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " "localmente." -#: setup.c:185 +#: setup.c:188 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -5476,12 +7402,12 @@ msgstr "" "Use '--' para separar las rutas de las revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:234 +#: setup.c:254 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "opción '%s' debe venir antes de argumentos no opcionales" -#: setup.c:253 +#: setup.c:273 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -5492,95 +7418,95 @@ msgstr "" "Use '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:389 +#: setup.c:409 msgid "unable to set up work tree using invalid config" msgstr "" "no es posible configurar el directorio de trabajo usando una configuración " "inválida" -#: setup.c:393 +#: setup.c:413 msgid "this operation must be run in a work tree" msgstr "esta operación debe ser realizada en un árbol de trabajo" -#: setup.c:527 +#: setup.c:559 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:535 +#: setup.c:567 msgid "unknown repository extensions found:" msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:554 +#: setup.c:586 #, c-format msgid "error opening '%s'" msgstr "error abriendo '%s'" -#: setup.c:556 +#: setup.c:588 #, c-format msgid "too large to be a .git file: '%s'" msgstr "muy grande para ser un archivo .git: '%s'" -#: setup.c:558 +#: setup.c:590 #, c-format msgid "error reading %s" msgstr "error leyendo %s" -#: setup.c:560 +#: setup.c:592 #, c-format msgid "invalid gitfile format: %s" msgstr "formato gitfile inválido: %s" -#: setup.c:562 +#: setup.c:594 #, c-format msgid "no path in gitfile: %s" msgstr "no hay ruta en gitfile: %s" -#: setup.c:564 +#: setup.c:596 #, c-format msgid "not a git repository: %s" msgstr "no es un repositorio git: %s" -#: setup.c:663 +#: setup.c:695 #, c-format msgid "'$%s' too big" msgstr "'$%s' muy grande" -#: setup.c:677 +#: setup.c:709 #, c-format msgid "not a git repository: '%s'" msgstr "no es un repositorio git: '%s'" -#: setup.c:706 setup.c:708 setup.c:739 +#: setup.c:738 setup.c:740 setup.c:771 #, c-format msgid "cannot chdir to '%s'" msgstr "no se puede aplicar chdir a '%s'" -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 msgid "cannot come back to cwd" msgstr "no se puede volver a cwd" -#: setup.c:837 -#, c-format -msgid "not a git repository (or any of the parent directories): %s" -msgstr "" -"no es un repositorio git (ni ninguno de los directorios superiores): %s" - -#: setup.c:848 +#: setup.c:870 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "falló al determinar '%*s%s%s'" -#: setup.c:1078 +#: setup.c:1108 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1090 setup.c:1096 +#: setup.c:1117 setup.c:1123 #, c-format msgid "cannot change to '%s'" msgstr "no se puede cambiar a '%s'" -#: setup.c:1109 +#: setup.c:1128 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "" +"no es un repositorio git (ni ninguno de los directorios superiores): %s" + +#: setup.c:1134 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -5590,7 +7516,7 @@ msgstr "" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1192 +#: setup.c:1245 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -5599,287 +7525,292 @@ msgstr "" "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" "El dueño de los archivos tiene que tener permisos de lectura y escritura." -#: setup.c:1235 +#: setup.c:1289 msgid "open /dev/null or dup failed" msgstr "falló al abrir /dev/null o dup" -#: setup.c:1250 +#: setup.c:1304 msgid "fork failed" msgstr "falló fork" -#: setup.c:1255 +#: setup.c:1309 msgid "setsid failed" msgstr "falló setsid" -#: sha1-file.c:381 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates" -#: sha1-file.c:432 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "incapaz de normalizar la ruta de objeto alterno: %s" -#: sha1-file.c:503 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" -#: sha1-file.c:510 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "incapaz de normalizar directorio de objeto: %s" -#: sha1-file.c:565 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "no es posible hacer fdopen en lockfile alternos" -#: sha1-file.c:583 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "no es posible leer archivos alternos" -#: sha1-file.c:590 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "no es posible mover archivos alternos en el lugar" -#: sha1-file.c:625 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: sha1-file.c:651 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "repositorio de referencia '%s' como un checkout vinculado no es soportado " "todavía." -#: sha1-file.c:657 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: sha1-file.c:663 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: sha1-file.c:671 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" -#: sha1-file.c:781 +#: sha1-file.c:791 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "línea inválida mientras se analizaban refs alternas: %s" + +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" -#: sha1-file.c:806 +#: sha1-file.c:964 msgid "mmap failed" msgstr "mmap falló" -#: sha1-file.c:973 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "archivo de objeto %s está vacío" -#: sha1-file.c:1093 sha1-file.c:2215 +#: sha1-file.c:1263 sha1-file.c:2443 #, c-format msgid "corrupt loose object '%s'" msgstr "objeto perdido corrupto '%s'" -#: sha1-file.c:1095 sha1-file.c:2219 +#: sha1-file.c:1265 sha1-file.c:2447 #, c-format msgid "garbage at end of loose object '%s'" msgstr "basura al final del objeto perdido '%s'" -#: sha1-file.c:1137 +#: sha1-file.c:1307 msgid "invalid object type" msgstr "tipo de objeto inválido" -#: sha1-file.c:1219 +#: sha1-file.c:1391 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "no es posible desempacar header %s con --allow-unknown-type" -#: sha1-file.c:1222 +#: sha1-file.c:1394 #, c-format msgid "unable to unpack %s header" msgstr "incapaz de desempaquetar header %s" -#: sha1-file.c:1228 +#: sha1-file.c:1400 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "no es posible analizar header %s con --allow-unknown-type" -#: sha1-file.c:1231 +#: sha1-file.c:1403 #, c-format msgid "unable to parse %s header" msgstr "incapaz de analizar header %s" -#: sha1-file.c:1422 +#: sha1-file.c:1629 #, c-format msgid "failed to read object %s" msgstr "falló al leer objeto %s" -#: sha1-file.c:1426 +#: sha1-file.c:1633 #, c-format msgid "replacement %s not found for %s" msgstr "reemplazo %s no encontrado para %s" -#: sha1-file.c:1430 +#: sha1-file.c:1637 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "objeto perdido %s (guardado en %s) está corrompido" -#: sha1-file.c:1434 +#: sha1-file.c:1641 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paquete de objeto %s (guardado en %s) está corrompido" -#: sha1-file.c:1536 +#: sha1-file.c:1746 #, c-format -msgid "unable to write sha1 filename %s" -msgstr "incapaz de escribir el nombre de archivo sha1 %s" +msgid "unable to write file %s" +msgstr "no es posible escribir archivo %s" -#: sha1-file.c:1543 +#: sha1-file.c:1753 #, c-format msgid "unable to set permission to '%s'" msgstr "no se pudo poner permisos a '%s'" -#: sha1-file.c:1550 +#: sha1-file.c:1760 msgid "file write error" msgstr "falló de escritura" -#: sha1-file.c:1569 -msgid "error when closing sha1 file" -msgstr "error cerrando el archivo sha1" +#: sha1-file.c:1780 +msgid "error when closing loose object file" +msgstr "error cerrando el archivo de objeto suelto" -#: sha1-file.c:1635 +#: sha1-file.c:1845 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permisos insuficientes para agregar un objeto a la base de datos del " "repositorio %s" -#: sha1-file.c:1637 +#: sha1-file.c:1847 msgid "unable to create temporary file" msgstr "no es posible crear un archivo temporal" -#: sha1-file.c:1661 -msgid "unable to write sha1 file" -msgstr "incapaz de escribir archivo sha1" +#: sha1-file.c:1871 +msgid "unable to write loose object file" +msgstr "no es posible escribir el archivo de objeto suelto" -#: sha1-file.c:1667 +#: sha1-file.c:1877 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no es posible desinflar el objeto nuevo %s (%d)" -#: sha1-file.c:1671 +#: sha1-file.c:1881 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd en objeto %s falló (%d)" -#: sha1-file.c:1675 +#: sha1-file.c:1885 #, c-format msgid "confused by unstable object source data for %s" msgstr "confundido por fuente de data de objetos inestable para %s" -#: sha1-file.c:1685 builtin/pack-objects.c:918 +#: sha1-file.c:1895 builtin/pack-objects.c:1054 #, c-format msgid "failed utime() on %s" msgstr "falló utime() en %s" -#: sha1-file.c:1760 +#: sha1-file.c:1972 #, c-format -msgid "cannot read sha1_file for %s" -msgstr "no se puede leer sha1_file para %s" +msgid "cannot read object for %s" +msgstr "no se pudo leer el objeto para %s" -#: sha1-file.c:1805 +#: sha1-file.c:2011 msgid "corrupt commit" msgstr "commit corrupto" -#: sha1-file.c:1813 +#: sha1-file.c:2019 msgid "corrupt tag" msgstr "tag corrupto" -#: sha1-file.c:1912 +#: sha1-file.c:2119 #, c-format msgid "read error while indexing %s" msgstr "error leyendo al indexar %s" -#: sha1-file.c:1915 +#: sha1-file.c:2122 #, c-format msgid "short read while indexing %s" msgstr "lectura corta al indexar %s" -#: sha1-file.c:1988 sha1-file.c:1997 +#: sha1-file.c:2195 sha1-file.c:2205 #, c-format msgid "%s: failed to insert into database" msgstr "%s: falló al insertar en la base de datos" -#: sha1-file.c:2003 +#: sha1-file.c:2211 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo de archivo no soportado" -#: sha1-file.c:2027 +#: sha1-file.c:2235 #, c-format msgid "%s is not a valid object" msgstr "%s no es objeto válido" -#: sha1-file.c:2029 +#: sha1-file.c:2237 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no es un objeto '%s' válido" -#: sha1-file.c:2056 builtin/index-pack.c:154 +#: sha1-file.c:2264 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: sha1-file.c:2226 sha1-file.c:2278 +#: sha1-file.c:2454 sha1-file.c:2507 #, c-format -msgid "sha1 mismatch for %s (expected %s)" -msgstr "sha1 no concuerda para %s (se esperaba %s)" +msgid "hash mismatch for %s (expected %s)" +msgstr "hash no concuerda para %s (se esperaba %s)" -#: sha1-file.c:2250 +#: sha1-file.c:2478 #, c-format msgid "unable to mmap %s" msgstr "no es posible hacer mmap a %s" -#: sha1-file.c:2255 +#: sha1-file.c:2483 #, c-format msgid "unable to unpack header of %s" msgstr "incapaz de desempaquetar header de %s" -#: sha1-file.c:2261 +#: sha1-file.c:2489 #, c-format msgid "unable to parse header of %s" msgstr "incapaz de analizar header de %s" -#: sha1-file.c:2272 +#: sha1-file.c:2500 #, c-format msgid "unable to unpack contents of %s" msgstr "no es posible desempaquetar contenidos de %s" -#: sha1-name.c:476 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "SHA1 %s corto es ambiguo" -#: sha1-name.c:487 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Los candidatos son:" -#: sha1-name.c:770 +#: sha1-name.c:796 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" @@ -5889,77 +7820,287 @@ msgstr "" "porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n" "tal vez sean creadas por error. Por ejemplo,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por " "favor\n" -"examine estas refs y tal vez bórrelas. Silencie este mensaje \n" +"examina estas refs y tal vez bórralas. Silencia este mensaje \n" "ejecutando \"git config advice.objectNameWarning false\"" -#: submodule.c:116 submodule.c:145 +#: sha1-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "log para '%.*s' solo va hasta %s" + +#: sha1-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "log para '%.*s' solo tiene %d entradas" + +#: sha1-name.c:1689 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "la ruta '%s' existe en disco, pero no en '%.*s'" + +#: sha1-name.c:1695 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"ruta '%s' existe, pero no '%s'\n" +"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?" + +#: sha1-name.c:1704 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "ruta '%s' no existe en '%.*s'" + +#: sha1-name.c:1732 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"ruta '%s' está en el index, pero no en stage %d\n" +"ayuda:¿Quisiste decir: '%d:%s'?" + +#: sha1-name.c:1748 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"ruta '%s' está en el index, pero no '%s'\n" +"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?" + +#: sha1-name.c:1756 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "ruta '%s' existe en el disco, pero no en el index" + +#: sha1-name.c:1758 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "ruta '%s' no existe (ni en disco ni en el index)" + +#: sha1-name.c:1771 +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo" + +#: sha1-name.c:1909 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "nombre de objeto no válido: '%.*s'." + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:837 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u GiB" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:839 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u GiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:847 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u MiB" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:849 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u MiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:856 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u KiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:858 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u KiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:864 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u byte" +msgstr[1] "%u bytes" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:866 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u bytes/s" +msgstr[1] "%u bytes/s" + +#: strbuf.c:1164 +#, c-format +msgid "could not edit '%s'" +msgstr "no se pudo editar '%s'" + +#: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero" -#: submodule.c:120 submodule.c:149 +#: submodule.c:118 submodule.c:147 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s" -#: submodule.c:156 +#: submodule.c:154 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "No se pudo eliminar la entrada %s de .gitmodules" -#: submodule.c:167 +#: submodule.c:165 msgid "staging updated .gitmodules failed" msgstr "falló realizar stage a los .gitmodules actualizados" -#: submodule.c:329 +#: submodule.c:327 #, c-format msgid "in unpopulated submodule '%s'" msgstr "en el submódulo no poblado '%s'" -#: submodule.c:360 +#: submodule.c:358 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" -#: submodule.c:857 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "mal argumento --ignore-submodules: %s" + +#: submodule.c:815 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado " +"igual. Saltandolo." + +#: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985 +#: submodule.c:995 +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" +"no se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " +"el submódulo %s" + +#: submodule.c:1118 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "proceso para submódulo '%s' falló" + +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." -msgstr "Falló al resolver HEAD como un ref valido." +msgstr "Falló al resolver HEAD como un ref válido." + +#: submodule.c:1158 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "Empujando submódulo '%s'\n" + +#: submodule.c:1161 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "No es posible hacer push al submódulo '%s'\n" + +#: submodule.c:1453 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Haciendo fetch al submódulo %s%s\n" -#: submodule.c:1404 +#: submodule.c:1483 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "No pudo acceder al submódulo '%s'\n" + +#: submodule.c:1637 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Errores durante el fetch del submódulo:\n" +"%s" + +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1542 +#: submodule.c:1679 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "No se pudo ejecutar 'git status --procelain=2' en el submódulo %s" + +#: submodule.c:1720 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "'git status --procelain=2' falló en el submódulo %s" + +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" -#: submodule.c:1555 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" -#: submodule.c:1648 +#: submodule.c:1828 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'" + +#: submodule.c:1855 submodule.c:2165 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "no pudo recursar en el submódulo '%s'" + +#: submodule.c:1876 +msgid "could not reset submodule index" +msgstr "no se pudo reiniciar el index del submódulo" + +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1700 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:1747 +#: submodule.c:2038 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'" + +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -5967,12 +8108,17 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:1759 submodule.c:1815 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:1766 +#: submodule.c:2075 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "rechazando mover '%s' dentro de un directorio git existente" + +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -5983,42 +8129,37 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:1850 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "no pudo recursar en el submódulo '%s'" - -#: submodule.c:1894 +#: submodule.c:2209 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:1933 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignorando submódulo sospechoso: %s" -#: submodule-config.c:296 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "no se permiten valores negativos para submodule.fetchjobs" -#: submodule-config.c:390 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "ignorando '%s' ya que puede ser interpretado como una opción de línea de " "comando: %s" -#: submodule-config.c:479 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "valor inválido para %s" -#: submodule-config.c:754 +#: submodule-config.c:765 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No se pudo actualizar la entrada %s de .gitmodules" @@ -6034,7 +8175,7 @@ msgstr "ejecución del comando de remolque '%s' falló" msgid "unknown value '%s' for key '%s'" msgstr "valor '%s' desconocido para la clave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "más de un %s" @@ -6053,7 +8194,7 @@ msgstr "no se pudo leer el archivo de entrada '%s'" msgid "could not read from stdin" msgstr "no se pudo leer desde stdin" -#: trailer.c:1011 builtin/am.c:47 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "no se pudo definir %s" @@ -6082,39 +8223,47 @@ msgstr "no se pudo renombrar el archivo temporal a %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "no se pudo leer el conjunto '%s'" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opción inválida '%s'" -#: transport.c:616 +#: transport.c:266 +msgid "see protocol.version in 'git help config' for more details" +msgstr "ver protocol.version en 'git help config' para más información" + +#: transport.c:267 +msgid "server options require protocol version 2 or later" +msgstr "opciones del servidor requieren protocolo versión 2 o posterior" + +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "no se pudo analizar valor de configuración transport.color.*" -#: transport.c:689 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "soporte para protocolo v2 no implementado todavía" -#: transport.c:816 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconocido para configuración '%s': %s" -#: transport.c:882 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "transporte '%s' no permitido" -#: transport.c:936 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync ya no es soportado" -#: transport.c:1031 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -6123,7 +8272,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:1035 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -6150,37 +8299,32 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:1043 +#: transport.c:1056 msgid "Aborting." msgstr "Abortando." -#: transport.c:1182 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" -#: transport.c:1315 transport-helper.c:643 +#: transport.c:1345 transport-helper.c:657 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" -#: transport.c:1419 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "línea inválida mientras se analizaban refs alternas: %s" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "escritura total al helper remoto falló" -#: transport-helper.c:132 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "no es posible encontrar helper remoto para '%s'" -#: transport-helper.c:148 transport-helper.c:557 +#: transport-helper.c:160 transport-helper.c:571 msgid "can't dup helper output fd" msgstr "no se puede duplicar output de fd del helper" -#: transport-helper.c:199 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -6189,99 +8333,104 @@ msgstr "" "capacidad mandatoria desconocida %s; este helper remoto probablemente " "necesita una nueva versión de Git" -#: transport-helper.c:205 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "este helper remoto debería implementar capacidad refspec" -#: transport-helper.c:272 transport-helper.c:412 +#: transport-helper.c:284 transport-helper.c:425 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s dijo inesperadamente: '%s'" -#: transport-helper.c:401 +#: transport-helper.c:414 #, c-format msgid "%s also locked %s" msgstr "%s también bloqueó %s" -#: transport-helper.c:479 +#: transport-helper.c:493 msgid "couldn't run fast-import" msgstr "no se pudo ejecutar fast-import" -#: transport-helper.c:502 +#: transport-helper.c:516 msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:531 transport-helper.c:1091 +#: transport-helper.c:545 transport-helper.c:1134 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" -#: transport-helper.c:576 +#: transport-helper.c:590 #, c-format msgid "unknown response to connect: %s" msgstr "respuesta para conectar desconocida: %s" -#: transport-helper.c:598 +#: transport-helper.c:612 msgid "setting remote service path not supported by protocol" msgstr "configurando servicio de ruta remota no soportado por el protocolo" -#: transport-helper.c:600 +#: transport-helper.c:614 msgid "invalid remote service path" msgstr "ruta de servicio remoto inválida" -#: transport-helper.c:646 +#: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:713 +#: transport-helper.c:736 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:766 +#: transport-helper.c:789 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper reportó estado inesperado de %s" -#: transport-helper.c:827 +#: transport-helper.c:850 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:830 +#: transport-helper.c:853 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:833 +#: transport-helper.c:856 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:840 +#: transport-helper.c:861 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "helper %s no soporta --atomic" + +#: transport-helper.c:867 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:932 +#: transport-helper.c:965 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:937 +#: transport-helper.c:970 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:984 +#: transport-helper.c:1017 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:989 +#: transport-helper.c:1022 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1014 +#: transport-helper.c:1047 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -6290,67 +8439,67 @@ msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" "Tal vez deberías especificar un branch como 'master'.\n" -#: transport-helper.c:1077 +#: transport-helper.c:1120 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1231 +#: transport-helper.c:1272 #, c-format msgid "read(%s) failed" msgstr "leer(%s) falló" -#: transport-helper.c:1258 +#: transport-helper.c:1299 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) falló" -#: transport-helper.c:1307 +#: transport-helper.c:1348 #, c-format msgid "%s thread failed" msgstr "hilo %s falló" -#: transport-helper.c:1311 +#: transport-helper.c:1352 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s falló al unirse: %s" -#: transport-helper.c:1330 transport-helper.c:1334 +#: transport-helper.c:1371 transport-helper.c:1375 #, c-format msgid "can't start thread for copying data: %s" msgstr "no se puede iniciar el hilo para copiar data: %s" -#: transport-helper.c:1371 +#: transport-helper.c:1412 #, c-format msgid "%s process failed to wait" msgstr "proceso %s falló al esperar" -#: transport-helper.c:1375 +#: transport-helper.c:1416 #, c-format msgid "%s process failed" msgstr "proceso %s falló" -#: transport-helper.c:1393 transport-helper.c:1402 +#: transport-helper.c:1434 transport-helper.c:1443 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "objeto de árbol muy corto" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "modo mal formado en la entrada de árbol" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nombre de archivo vacío en la entrada de árbol" -#: tree-walk.c:115 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "archivo de árbol muy corto" -#: unpack-trees.c:112 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -6361,7 +8510,7 @@ msgstr "" "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar " "ramas." -#: unpack-trees.c:114 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -6371,7 +8520,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:117 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -6381,7 +8530,7 @@ msgstr "" "fusionar:\n" "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar." -#: unpack-trees.c:119 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -6391,7 +8540,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:122 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -6400,7 +8549,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n" "%%sPor favor, confirma tus cambios o guárdalos antes de %s." -#: unpack-trees.c:124 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -6409,7 +8558,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n" "%%s" -#: unpack-trees.c:129 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -6419,7 +8568,7 @@ msgstr "" "seguimiento en ellos:\n" "%s" -#: unpack-trees.c:133 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -6429,7 +8578,7 @@ msgstr "" "eliminados al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:135 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -6439,7 +8588,7 @@ msgstr "" "eliminadosal actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:138 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -6449,7 +8598,7 @@ msgstr "" "eliminados al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:140 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -6459,7 +8608,7 @@ msgstr "" "eliminadosal fusionar:\n" "%%s" -#: unpack-trees.c:143 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -6469,7 +8618,7 @@ msgstr "" "eliminados al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:145 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -6479,7 +8628,7 @@ msgstr "" "eliminados al ejecutar %s:\n" "%%s" -#: unpack-trees.c:151 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -6490,7 +8639,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:153 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -6501,7 +8650,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -6511,7 +8660,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:158 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -6521,7 +8670,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%s" -#: unpack-trees.c:161 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -6531,7 +8680,7 @@ msgstr "" "sobrescritos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:163 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -6541,12 +8690,12 @@ msgstr "" "eliminadospor %s:\n" "%%s" -#: unpack-trees.c:171 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir." -#: unpack-trees.c:174 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -6556,7 +8705,7 @@ msgstr "" "actualizadas:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -6567,7 +8716,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -6578,7 +8727,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -6587,16 +8736,16 @@ msgstr "" "No se puede actualizar le submódulo:\n" "%s" -#: unpack-trees.c:254 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "Abortando\n" -#: unpack-trees.c:336 -msgid "Checking out files" -msgstr "Revisando archivos" +#: unpack-trees.c:317 +msgid "Updating files" +msgstr "Actualizando archivos" -#: unpack-trees.c:368 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -6606,6 +8755,10 @@ msgstr "" "en un filesystem case-insensitive) y solo una del grupo\n" "colisionando está en el árbol de trabajo:\n" +#: unpack-trees.c:1445 +msgid "Updating index flags" +msgstr "Actualizando flags del index" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nombre de URL inválido o sufijo '://' faltante" @@ -6635,206 +8788,217 @@ msgstr "numero de puerto inválido" msgid "invalid '..' path segment" msgstr "segmento de ruta '..' inválido" -#: worktree.c:249 builtin/am.c:2100 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Haciendo fetch a objetos" + +#: worktree.c:259 builtin/am.c:2099 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#: worktree.c:295 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' en el árbol de trabajo principal no es el directorio del repositorio" -#: worktree.c:306 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " "trabajo" -#: worktree.c:318 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:324 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' no es un archivo .git, código de error %d" -#: worktree.c:332 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "no es posible acceder '%s'" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" -#: wt-status.c:154 +#: wt-status.c:158 msgid "Unmerged paths:" msgstr "Rutas no fusionadas:" -#: wt-status.c:181 wt-status.c:208 +#: wt-status.c:187 wt-status.c:219 +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr "" +" (usa \"git restore --staged <archivo>...\" para sacar del área de stage)" + +#: wt-status.c:190 wt-status.c:222 #, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)" +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr "" +" (usa \"git restore --source=%s --staged <archivo>...\" para sacar del área " +"de stage)" -#: wt-status.c:183 wt-status.c:210 +#: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)" -#: wt-status.c:187 +#: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (usa \"git add <archivo>...\" para marcar una resolución)" -#: wt-status.c:189 wt-status.c:193 +#: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la " "resolución)" -#: wt-status.c:191 +#: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (usa \"git rm <file>...\" para marcar la resolución)" -#: wt-status.c:202 wt-status.c:1042 +#: wt-status.c:211 wt-status.c:1074 msgid "Changes to be committed:" msgstr "Cambios a ser confirmados:" -#: wt-status.c:220 wt-status.c:1051 +#: wt-status.c:234 wt-status.c:1083 msgid "Changes not staged for commit:" msgstr "Cambios no rastreados para el commit:" -#: wt-status.c:224 +#: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (usa \"git add <archivo>...\" para actualizar lo que será confirmado)" -#: wt-status.c:226 +#: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer " "commit)" -#: wt-status.c:227 +#: wt-status.c:241 msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working directory)" +" (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -" (usa \"git checkout -- <archivo>...\" para descartar los cambios en el " +" (usa \"git restore <archivo>...\" para descartar los cambios en el " "directorio de trabajo)" -#: wt-status.c:229 +#: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (confirmar o descartar el contenido sin seguimiento o modificado en los " "sub-módulos)" -#: wt-status.c:241 +#: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)" -#: wt-status.c:256 +#: wt-status.c:268 msgid "both deleted:" msgstr "ambos borrados:" -#: wt-status.c:258 +#: wt-status.c:270 msgid "added by us:" msgstr "agregado por nosotros:" -#: wt-status.c:260 +#: wt-status.c:272 msgid "deleted by them:" msgstr "borrados por ellos:" -#: wt-status.c:262 +#: wt-status.c:274 msgid "added by them:" msgstr "agregado por ellos:" -#: wt-status.c:264 +#: wt-status.c:276 msgid "deleted by us:" msgstr "borrado por nosotros:" -#: wt-status.c:266 +#: wt-status.c:278 msgid "both added:" msgstr "ambos agregados:" -#: wt-status.c:268 +#: wt-status.c:280 msgid "both modified:" msgstr "ambos modificados:" -#: wt-status.c:278 +#: wt-status.c:290 msgid "new file:" msgstr "nuevo archivo:" -#: wt-status.c:280 +#: wt-status.c:292 msgid "copied:" msgstr "copiado:" -#: wt-status.c:282 +#: wt-status.c:294 msgid "deleted:" msgstr "borrado:" -#: wt-status.c:284 +#: wt-status.c:296 msgid "modified:" msgstr "modificado:" -#: wt-status.c:286 +#: wt-status.c:298 msgid "renamed:" msgstr "renombrado:" -#: wt-status.c:288 +#: wt-status.c:300 msgid "typechange:" msgstr "cambio de tipo:" -#: wt-status.c:290 +#: wt-status.c:302 msgid "unknown:" msgstr "desconocido:" -#: wt-status.c:292 +#: wt-status.c:304 msgid "unmerged:" msgstr "des-fusionado:" -#: wt-status.c:372 +#: wt-status.c:384 msgid "new commits, " msgstr "nuevos commits, " -#: wt-status.c:374 +#: wt-status.c:386 msgid "modified content, " msgstr "contenido modificado, " -#: wt-status.c:376 +#: wt-status.c:388 msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:880 +#: wt-status.c:906 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Tu stash actualmente tiene %d entrada" msgstr[1] "Tu stash actualmente tiene %d entradas" -#: wt-status.c:912 +#: wt-status.c:938 msgid "Submodules changed but not updated:" -msgstr "Submodulos cambiados pero no actualizados:" +msgstr "Submódulos cambiados pero no actualizados:" -#: wt-status.c:914 +#: wt-status.c:940 msgid "Submodule changes to be committed:" -msgstr "Submodulos cambiados listos para realizar commit:" +msgstr "Submódulos cambiados listos para realizar commit:" -#: wt-status.c:996 +#: wt-status.c:1022 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -6842,107 +9006,118 @@ msgstr "" "No modifique o borre la línea de encima.\n" "Todo lo que este por abajo será eliminado." -#: wt-status.c:1097 +#: wt-status.c:1114 +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" +"\n" +"Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n" +"Puedes usar '--no-ahead-behind' para evitar esto.\n" + +#: wt-status.c:1144 msgid "You have unmerged paths." msgstr "Tienes rutas no fusionadas." -#: wt-status.c:1100 +#: wt-status.c:1147 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregla los conflictos y corre \"git commit\"" -#: wt-status.c:1102 +#: wt-status.c:1149 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" para abortar la fusion)" -#: wt-status.c:1106 +#: wt-status.c:1153 msgid "All conflicts fixed but you are still merging." msgstr "Todos los conflictos resueltos pero sigues fusionando." -#: wt-status.c:1109 +#: wt-status.c:1156 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" para concluir la fusión)" -#: wt-status.c:1118 +#: wt-status.c:1165 msgid "You are in the middle of an am session." msgstr "Estás en medio de una sesión am." -#: wt-status.c:1121 +#: wt-status.c:1168 msgid "The current patch is empty." msgstr "El parche actual está vacío." -#: wt-status.c:1125 +#: wt-status.c:1172 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregla los conflictos y luego corre \"git am --continue\"" -#: wt-status.c:1127 +#: wt-status.c:1174 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#: wt-status.c:1129 +#: wt-status.c:1176 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" -#: wt-status.c:1260 +#: wt-status.c:1309 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo no está presente." -#: wt-status.c:1262 +#: wt-status.c:1311 msgid "No commands done." msgstr "No se realizaron los comandos." -#: wt-status.c:1265 +#: wt-status.c:1314 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "El último comando realizado (%d comando realizado):" msgstr[1] "Los últimos comandos realizados (%d comandos realizados):" -#: wt-status.c:1276 +#: wt-status.c:1325 #, c-format msgid " (see more in file %s)" -msgstr " (ver mas en el archivo %s)" +msgstr " (ver más en el archivo %s)" -#: wt-status.c:1281 +#: wt-status.c:1330 msgid "No commands remaining." -msgstr "No quedan mas comandos." +msgstr "No quedan más comandos." -#: wt-status.c:1284 +#: wt-status.c:1333 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Siguiente comando a realizar (%d comando restante):" msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):" -#: wt-status.c:1292 +#: wt-status.c:1341 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" -#: wt-status.c:1304 +#: wt-status.c:1353 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Estás aplicando un rebase de la rama '%s' en '%s." -#: wt-status.c:1309 +#: wt-status.c:1358 msgid "You are currently rebasing." msgstr "Estás aplicando un rebase." -#: wt-status.c:1322 +#: wt-status.c:1371 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" -#: wt-status.c:1324 +#: wt-status.c:1373 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" para omitir este parche)" -#: wt-status.c:1326 +#: wt-status.c:1375 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" -#: wt-status.c:1333 +#: wt-status.c:1382 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" -#: wt-status.c:1337 +#: wt-status.c:1386 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -6950,128 +9125,144 @@ msgstr "" "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1342 +#: wt-status.c:1391 msgid "You are currently splitting a commit during a rebase." msgstr "Estás dividiendo un commit durante un rebase." -#: wt-status.c:1345 +#: wt-status.c:1394 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --" "continue\")" -#: wt-status.c:1349 +#: wt-status.c:1398 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Estás editando un commit mientras se aplica un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1354 +#: wt-status.c:1403 msgid "You are currently editing a commit during a rebase." msgstr "Estás editando un commit durante un rebase." -#: wt-status.c:1357 +#: wt-status.c:1406 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" -#: wt-status.c:1359 +#: wt-status.c:1408 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una vez que estés satisfecho con tus " "cambios)" -#: wt-status.c:1368 +#: wt-status.c:1419 +msgid "Cherry-pick currently in progress." +msgstr "Cherry-pick en progreso actualmente." + +#: wt-status.c:1422 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estás realizando un cherry-picking en el commit %s." -#: wt-status.c:1373 +#: wt-status.c:1429 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1376 +#: wt-status.c:1432 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (ejecuta \"git cherry-pick --continue\" para continuar)" + +#: wt-status.c:1435 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1378 +#: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (usa \"git cherry-pick --skip\" para saltar este parche)" + +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" -#: wt-status.c:1386 +#: wt-status.c:1449 +msgid "Revert currently in progress." +msgstr "Revierte el estado en progreso actual." + +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "Estás revirtiendo el commit %s." -#: wt-status.c:1391 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" -#: wt-status.c:1394 +#: wt-status.c:1461 +msgid " (run \"git revert --continue\" to continue)" +msgstr " (ejecuta \"git revert --continue\" para continuar)" + +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" -#: wt-status.c:1396 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (usa \"git revert --skip\" para omitir este parche)" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" -#: wt-status.c:1406 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estás aplicando un bisect, comenzando en la rama '%s'." -#: wt-status.c:1410 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "Estás aplicando un bisect." -#: wt-status.c:1413 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" para volver a la rama original)" -#: wt-status.c:1611 +#: wt-status.c:1694 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1618 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "rebase interactivo en progreso; en " -#: wt-status.c:1620 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "rebase en progreso; en " -#: wt-status.c:1625 -msgid "HEAD detached at " -msgstr "HEAD desacoplada en " - -#: wt-status.c:1627 -msgid "HEAD detached from " -msgstr "HEAD desacoplada de " - -#: wt-status.c:1630 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." -#: wt-status.c:1647 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Confirmación inicial" -#: wt-status.c:1648 +#: wt-status.c:1731 msgid "No commits yet" msgstr "No hay commits todavía" -#: wt-status.c:1662 +#: wt-status.c:1745 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1664 +#: wt-status.c:1747 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1668 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7079,34 +9270,34 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" "Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n" -"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n" -"nuevos archivos usted mismo (vea 'git help status')." +"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n" +"nuevos archivos tú mismo (vea 'git help status')." -#: wt-status.c:1674 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "Archivos no rastreados no son mostrados %s" -#: wt-status.c:1676 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1682 +#: wt-status.c:1765 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1687 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1690 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1693 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -7115,192 +9306,202 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1696 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " "presentes\n" -#: wt-status.c:1699 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " "hacerles seguimiento)\n" -#: wt-status.c:1702 wt-status.c:1707 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1705 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" -#: wt-status.c:1709 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada para hacer commit, el árbol de trabajo está limpio\n" -#: wt-status.c:1822 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1826 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1857 +#: wt-status.c:1940 msgid "different" msgstr "diferente" -#: wt-status.c:1859 wt-status.c:1867 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "detrás " -#: wt-status.c:1862 wt-status.c:1865 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2374 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2380 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2382 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." -#: builtin/add.c:24 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#, c-format +msgid "failed to unlink '%s'" +msgstr "falló al desvincular '%s'" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opción>] [--] <especificación-de-ruta>..." -#: builtin/add.c:83 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:88 builtin/commit.c:284 +#: builtin/add.c:93 builtin/commit.c:288 msgid "updating files failed" msgstr "falló la actualización de carpetas" -#: builtin/add.c:98 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:173 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:233 builtin/rev-parse.c:895 +#: builtin/add.c:266 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "No se pudo leer el índice" -#: builtin/add.c:244 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:248 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:251 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "falló la edición del parche" -#: builtin/add.c:254 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:256 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "Parche vacío. Abortado." -#: builtin/add.c:261 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:269 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" -#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123 -#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557 -#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "dry run ( ejecución en seco)" -#: builtin/add.c:292 +#: builtin/add.c:325 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305 +#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:294 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:295 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:296 +#: builtin/add.c:329 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:297 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:298 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "grabar solo el hecho de que la ruta será agregada después" -#: builtin/add.c:299 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:302 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)" +msgstr "" +"ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)" -#: builtin/add.c:304 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el índice" -#: builtin/add.c:305 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" -#: builtin/add.c:306 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" -#: builtin/add.c:308 builtin/update-index.c:990 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "sobrescribir el bit ejecutable de los archivos listados" -#: builtin/add.c:310 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:325 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "backend para `git stash -p`" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -7320,192 +9521,212 @@ msgstr "" "Se ha agregado otro repositorio de git dentro del repositorio actual.\n" "Clones del repositorio exterior no tendrán el contenido del \n" "repositorio embebido y no sabrán como obtenerla.\n" -"Si quería agregar un submódulo, use:\n" +"Si querías agregar un submódulo, usa:\n" "\n" "\tgit submodule add <url> %s\n" "\n" -"Si se agrego esta ruta por error, puede eliminar desde el índice \n" +"Si se agrego esta ruta por error, puedes eliminar desde el índice \n" "usando:\n" "\n" "\tgit rm --cached %s\n" "\n" -"Vea \"git help submodule\" para mas información." +"Vea \"git help submodule\" para más información." -#: builtin/add.c:353 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:371 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Use -f si realmente quiere agregarlos.\n" +#: builtin/add.c:410 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"Usa -f si realmente quieres agregarlos.\n" +"Desactiva este mensaje ejecutando\n" +"\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:379 +#: builtin/add.c:419 msgid "adding files failed" msgstr "falló al agregar archivos" -#: builtin/add.c:417 +#: builtin/add.c:447 builtin/commit.c:348 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file es incompatible con --interactive/--patch" + +#: builtin/add.c:464 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file es incompatible con --edit" + +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:424 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" -#: builtin/add.c:428 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" -#: builtin/add.c:443 +#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "--pathspec-from-file es incompatible con argumentos de pathspec" + +#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul requiere --pathspec-from-file" + +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:444 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Tal vez quiso decir 'git add .'?\n" +#: builtin/add.c:514 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"¿Tal vez quisiste decir 'git add.'?\n" +"Desactiva este mensage ejecutando\n" +"\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:363 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "no se pudo analizar el script del autor" -#: builtin/am.c:447 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' fue borrado por el hook de applypatch-msg" -#: builtin/am.c:488 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Línea mal formada: '%s'." -#: builtin/am.c:525 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falló al copiar notas de '%s' a '%s'" -#: builtin/am.c:551 +#: builtin/am.c:542 msgid "fseek failed" msgstr "fall de fseek" -#: builtin/am.c:739 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:804 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "Solo un parche StGIT puede ser aplicado de una vez" -#: builtin/am.c:852 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "timestamp inválido" -#: builtin/am.c:857 builtin/am.c:869 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "línea Date inválida" -#: builtin/am.c:864 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "offset de zona horaria inválido" -#: builtin/am.c:957 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:962 builtin/clone.c:408 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" -#: builtin/am.c:967 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Falló al dividir parches." -#: builtin/am.c:1097 builtin/commit.c:369 -msgid "unable to write index file" -msgstr "no es posible escribir en el archivo índice" - -#: builtin/am.c:1111 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"." +msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." -#: builtin/am.c:1112 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." -#: builtin/am.c:1113 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" "\"." -#: builtin/am.c:1196 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Parche mandado con formato=flowed; espacios al final de las líneas tal vez " "desaparezcan." -#: builtin/am.c:1224 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "El parche está vacío." -#: builtin/am.c:1290 +#: builtin/am.c:1267 #, c-format -msgid "invalid ident line: %.*s" -msgstr "sangría no válida: %.*s" +msgid "missing author line in commit %s" +msgstr "falta línea autor en commit %s" -#: builtin/am.c:1312 +#: builtin/am.c:1270 #, c-format -msgid "unable to parse commit %s" -msgstr "no es posible analizar el commit %s" +msgid "invalid ident line: %.*s" +msgstr "sangría no válida: %.*s" -#: builtin/am.c:1508 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositorio carece de los blobs necesarios para retroceder en una fusión de " "3-vías." -#: builtin/am.c:1510 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1529 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -"Editaste el parche a mano?\n" +"¿Editaste el parche a mano?\n" "No aplica a blobs guardados en su índice." -#: builtin/am.c:1535 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediendo para parchar base y fusión de 3-vías..." -#: builtin/am.c:1561 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Falló al fusionar en los cambios." -#: builtin/am.c:1593 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1659 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "no se puede ser interactivo sin stdin conectado a un terminal." - -#: builtin/am.c:1664 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -7513,67 +9734,72 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1674 +#: builtin/am.c:1653 +#, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " + +#: builtin/am.c:1700 builtin/commit.c:398 +msgid "unable to write index file" +msgstr "no es posible escribir en el archivo índice" -#: builtin/am.c:1724 +#: builtin/am.c:1704 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1764 builtin/am.c:1832 +#: builtin/am.c:1744 builtin/am.c:1812 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1781 +#: builtin/am.c:1761 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1787 +#: builtin/am.c:1767 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1791 -msgid "Use 'git am --show-current-patch' to see the failed patch" -msgstr "Use 'git am --show-current-patch' para ver el parche fallido" +#: builtin/am.c:1771 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido" -#: builtin/am.c:1835 +#: builtin/am.c:1815 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -"Sin cambios - olvidaste usar 'git add'?\n" +"Sin cambios - ¿olvidaste usar 'git add'?\n" "Si no hay nada en el área de stage, las posibilidad es que algo mas\n" "ya haya introducido el mismo cambio; tal vez quieras omitir este parche." -#: builtin/am.c:1842 +#: builtin/am.c:1822 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " "such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -"Todavía tiene rutas sin fusionar en su índice.\n" -"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos " +"Todavía tienes rutas sin fusionar en tu índice.\n" +"Debes realizar 'git add' cada archivo con conflictos resueltos y marcarlos " "como tal.\n" -"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en " -"él." +"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " +"en él." -#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328 -#: builtin/reset.c:336 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:2001 +#: builtin/am.c:1981 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2036 +#: builtin/am.c:2025 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -7581,161 +9807,171 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2129 +#: builtin/am.c:2132 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2165 +#: builtin/am.c:2172 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valor inválido para --show-current-patch: %s" + +#: builtin/am.c:2176 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s" + +#: builtin/am.c:2207 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2166 +#: builtin/am.c:2208 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2172 +#: builtin/am.c:2214 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2174 +#: builtin/am.c:2216 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2176 +#: builtin/am.c:2218 msgid "allow fall back on 3way merging if needed" msgstr "permitir retroceso en fusión de 3-vías si es necesario" -#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58 -#: builtin/repack.c:306 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:812 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2179 +#: builtin/am.c:2221 msgid "add a Signed-off-by line to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2182 +#: builtin/am.c:2224 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2184 +#: builtin/am.c:2226 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2186 +#: builtin/am.c:2228 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2188 +#: builtin/am.c:2230 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2190 +#: builtin/am.c:2232 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2193 +#: builtin/am.c:2235 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2196 +#: builtin/am.c:2238 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219 -#: builtin/am.c:2225 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 +#: builtin/am.c:2267 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239 -#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854 -#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 -#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386 -#: parse-options.h:144 parse-options.h:146 parse-options.h:268 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 +#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 +#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38 -#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2222 +#: builtin/am.c:2264 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2228 +#: builtin/am.c:2270 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2230 +#: builtin/am.c:2272 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2233 +#: builtin/am.c:2275 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2236 +#: builtin/am.c:2278 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2239 +#: builtin/am.c:2281 msgid "restore the original branch and abort the patching operation." msgstr "restaurar la rama original y abortar la operación de parchado." -#: builtin/am.c:2242 +#: builtin/am.c:2284 msgid "abort the patching operation but keep HEAD where it is." msgstr "abortar la operación de parchado pero mantener HEAD donde está." -#: builtin/am.c:2245 -msgid "show the patch being applied." -msgstr "muestra el parche siendo aplicado." +#: builtin/am.c:2288 +msgid "show the patch being applied" +msgstr "muestra el parche siendo aplicado" -#: builtin/am.c:2249 +#: builtin/am.c:2293 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2251 +#: builtin/am.c:2295 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273 -#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183 -#: builtin/revert.c:113 builtin/tag.c:402 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 +#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 +#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 msgid "GPG-sign commits" msgstr "Commits con firma GPG" -#: builtin/am.c:2257 +#: builtin/am.c:2301 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2275 +#: builtin/am.c:2319 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" -"será removida. Por favor no la use más." +"será eliminada. Por favor no la use más." -#: builtin/am.c:2282 +#: builtin/am.c:2326 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2297 +#: builtin/am.c:2341 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe en el mbox dado." -#: builtin/am.c:2321 +#: builtin/am.c:2365 #, c-format msgid "" "Stray %s directory found.\n" @@ -7744,10 +9980,14 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2327 +#: builtin/am.c:2371 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." +#: builtin/am.c:2381 +msgid "interactive mode requires patches on the command line" +msgstr "modo interactivo requiere parches en la línea de comando" + #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<opciones>] [<parche>...]" @@ -7765,86 +10005,300 @@ msgstr "no se pudo direccionar la salida" msgid "git archive: Remote with no URL" msgstr "git archive: Remote sin URL" -#: builtin/archive.c:58 +#: builtin/archive.c:61 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet" -#: builtin/archive.c:61 +#: builtin/archive.c:64 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:64 +#: builtin/archive.c:65 msgid "git archive: protocol error" msgstr "git archive: error de protocolo" -#: builtin/archive.c:68 +#: builtin/archive.c:69 msgid "git archive: expected a flush" msgstr "git archive: se esperaba un flush" -#: builtin/bisect--helper.c:12 +#: builtin/bisect--helper.c:22 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:13 +#: builtin/bisect--helper.c:23 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" -#: builtin/bisect--helper.c:14 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" -#: builtin/bisect--helper.c:46 +#: builtin/bisect--helper.c:25 +msgid "git bisect--helper --bisect-reset [<commit>]" +msgstr "git bisect--helper --bisect-reset [<commit>]" + +#: builtin/bisect--helper.c:26 +msgid "" +"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " +"<bad_term>" +msgstr "" +"git bisect--helper --bisect-write [--no-log] <estado> <revision> <buen_term> " +"<mal_term>" + +#: builtin/bisect--helper.c:27 +msgid "" +"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " +"<bad_term>" +msgstr "" +"git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> " +"<mal_term>" + +#: builtin/bisect--helper.c:28 +msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]" + +#: builtin/bisect--helper.c:29 +msgid "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" +msgstr "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" + +#: builtin/bisect--helper.c:30 +msgid "" +"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" +"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{old,good}=<término> --term-{new," +"bad}=<término>][--no-checkout] [<malo> [<bueno>...]] [--] [<rutas>...]" + +#: builtin/bisect--helper.c:86 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' no es un término válido" -#: builtin/bisect--helper.c:50 +#: builtin/bisect--helper.c:90 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "no se puede usar el comando nativo '%s' como un término" -#: builtin/bisect--helper.c:60 +#: builtin/bisect--helper.c:100 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "no se puede cambiar el significado del término '%s'" -#: builtin/bisect--helper.c:71 +#: builtin/bisect--helper.c:111 msgid "please use two different terms" msgstr "por favor use dos términos diferentes" -#: builtin/bisect--helper.c:78 +#: builtin/bisect--helper.c:118 msgid "could not open the file BISECT_TERMS" msgstr "no se pudo abrir el archivo BISECT_TERMS" -#: builtin/bisect--helper.c:120 +#: builtin/bisect--helper.c:155 +#, c-format +msgid "We are not bisecting.\n" +msgstr "No estamos bisecando.\n" + +#: builtin/bisect--helper.c:163 +#, c-format +msgid "'%s' is not a valid commit" +msgstr "'%s' no es un commit válido" + +#: builtin/bisect--helper.c:172 +#, c-format +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." +msgstr "" +"no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " +"<commit>'." + +#: builtin/bisect--helper.c:216 +#, c-format +msgid "Bad bisect_write argument: %s" +msgstr "Mal argumento bisect_write: %s" + +#: builtin/bisect--helper.c:221 +#, c-format +msgid "couldn't get the oid of the rev '%s'" +msgstr "no se puede obtener el oid de la rev '%s'" + +#: builtin/bisect--helper.c:233 +#, c-format +msgid "couldn't open the file '%s'" +msgstr "no se pudo abrir el archivo '%s'" + +#: builtin/bisect--helper.c:259 +#, c-format +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s" + +#: builtin/bisect--helper.c:286 +#, c-format +msgid "" +"You need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"Tienes que dar al menos un %s y un %s revision.\n" +"Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso." + +#: builtin/bisect--helper.c:290 +#, c-format +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"Tienes que comenzar por \"git bisect start\".\n" +"Después tienes que entregar al menos un %s y una revision %s.\n" +"Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso." + +#: builtin/bisect--helper.c:310 +#, c-format +msgid "bisecting only with a %s commit" +msgstr "haciendo bisect solo con un commit %s" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:318 +msgid "Are you sure [Y/n]? " +msgstr "¿Estás seguro [Y/n]? " + +#: builtin/bisect--helper.c:379 +msgid "no terms defined" +msgstr "no hay términos definidos" + +#: builtin/bisect--helper.c:382 +#, c-format +msgid "" +"Your current terms are %s for the old state\n" +"and %s for the new state.\n" +msgstr "" +"Tus términos actuales son %s para el estado viejo\n" +"y %s para el estado nuevo.\n" + +#: builtin/bisect--helper.c:392 +#, c-format +msgid "" +"invalid argument %s for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"argumento inválido %s para 'git bisect terms'.\n" +"Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new." + +#: builtin/bisect--helper.c:478 +#, c-format +msgid "unrecognized option: '%s'" +msgstr "opción desconocida: '%s'" + +#: builtin/bisect--helper.c:482 +#, c-format +msgid "'%s' does not appear to be a valid revision" +msgstr "'%s' no parece ser una revisión válida" + +#: builtin/bisect--helper.c:514 +msgid "bad HEAD - I need a HEAD" +msgstr "mal HEAD - Necesito un HEAD" + +#: builtin/bisect--helper.c:529 +#, c-format +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." +msgstr "" +"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'." + +#: builtin/bisect--helper.c:550 +msgid "won't bisect on cg-seek'ed tree" +msgstr "no se bisecará en un árbol con cg-seek" + +#: builtin/bisect--helper.c:553 +msgid "bad HEAD - strange symbolic ref" +msgstr "mal HEAD - ref simbólico extraño" + +#: builtin/bisect--helper.c:577 +#, c-format +msgid "invalid ref: '%s'" +msgstr "ref inválido: '%s'" + +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:122 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "escribe los términos a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:124 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "limpiar el estado de bisección" -#: builtin/bisect--helper.c:126 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "revisar por revs esperados" -#: builtin/bisect--helper.c:128 +#: builtin/bisect--helper.c:641 +msgid "reset the bisection state" +msgstr "reiniciar el estado de bisect" + +#: builtin/bisect--helper.c:643 +msgid "write out the bisection state in BISECT_LOG" +msgstr "escribir el estado de bisect en BISECT_LOG" + +#: builtin/bisect--helper.c:645 +msgid "check and set terms in a bisection state" +msgstr "revisar y configurar los terms en el estado de bisect" + +#: builtin/bisect--helper.c:647 +msgid "check whether bad or good terms exist" +msgstr "revisar si existen términos malos o buenos" + +#: builtin/bisect--helper.c:649 +msgid "print out the bisect terms" +msgstr "imprimir los terms del bisect" + +#: builtin/bisect--helper.c:651 +msgid "start the bisect session" +msgstr "comenzar la sesión de bisect" + +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:655 +msgid "no log for BISECT_WRITE" +msgstr "no hay log para BISECT_WRITE" + +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "--write-terms requiere dos argumentos" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no requiere argumentos" +#: builtin/bisect--helper.c:684 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset requiere un commit o ningún argumento" + +#: builtin/bisect--helper.c:688 +msgid "--bisect-write requires either 4 or 5 arguments" +msgstr "--bisect-write requiere entre 4 o 5 argumentos" + +#: builtin/bisect--helper.c:694 +msgid "--check-and-set-terms requires 3 arguments" +msgstr "--bisect-clean-state no requiere argumentos" + +#: builtin/bisect--helper.c:700 +msgid "--bisect-next-check requires 2 or 3 arguments" +msgstr "--bisect-next-check requiere 2 o 3 argumentos" + +#: builtin/bisect--helper.c:706 +msgid "--bisect-terms requires 0 or 1 argument" +msgstr "--bisect-terms requiere 0 o 1 argumentos" + #: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" @@ -7853,133 +10307,146 @@ msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> están documentadas en git-rev-list(1)" -#: builtin/blame.c:406 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "esperando un color: %s" -#: builtin/blame.c:413 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "tiene que terminar con un color" -#: builtin/blame.c:700 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "color inválido '%s' en color.blame.repeatedLines" -#: builtin/blame.c:718 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "valor inválido para blame.coloring" -#: builtin/blame.c:793 +#: builtin/blame.c:822 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "no se pudo encontrar revision %s para ignorar" + +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" -#: builtin/blame.c:794 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)" -#: builtin/blame.c:795 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "No tratar commits raíces como extremos (Default: off)" -#: builtin/blame.c:796 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:797 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Forzar el reporte de progreso" -#: builtin/blame.c:798 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Mostrar la puntuación de salida de las entradas de blame" -#: builtin/blame.c:799 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "Mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:800 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "Mostrar número de línea original (Default: off)" -#: builtin/blame.c:801 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "Mostrar en un formato diseñado para consumo de máquina" -#: builtin/blame.c:802 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar en formato porcelana con información de commit por línea" -#: builtin/blame.c:803 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar el mismo modo salida como git-annotate (Default: off)" -#: builtin/blame.c:804 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:805 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:806 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "Suprimir nombre del autor y timestamp (Default: off)" -#: builtin/blame.c:807 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar en cambio el email del autor (Default: off)" -#: builtin/blame.c:808 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignorar diferencias de espacios en blanco" -#: builtin/blame.c:809 +#: builtin/blame.c:860 builtin/log.c:1702 +msgid "rev" +msgstr "rev" + +#: builtin/blame.c:860 +msgid "Ignore <rev> when blaming" +msgstr "Ignorar <rev> durante el blame" + +#: builtin/blame.c:861 +msgid "Ignore revisions from <file>" +msgstr "Ignorar revisiones de <archivo>" + +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" -msgstr "colorear metadata redundante de lineas previas de manera diferente" +msgstr "colorear metadata redundante de líneas previas de manera diferente" -#: builtin/blame.c:810 +#: builtin/blame.c:863 msgid "color lines by age" -msgstr "colorear lineas por edad" - -#: builtin/blame.c:817 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Usar un heurístico experimental para mejorar los diffs" +msgstr "colorear líneas por edad" -#: builtin/blame.c:819 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Ocupo más ciclos para encontrar mejoras resultados" -#: builtin/blame.c:820 +#: builtin/blame.c:865 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" -#: builtin/blame.c:821 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "Usar contenido de <archivo> como imagen final" -#: builtin/blame.c:822 builtin/blame.c:823 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "puntaje" -#: builtin/blame.c:822 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "Encontrar copias de líneas entre y a través de archivos" -#: builtin/blame.c:823 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "Encontrar movimientos de líneas entre y a través de archivos" -#: builtin/blame.c:824 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:824 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "Procesar solo el rango de líneas n,m, contando desde 1" -#: builtin/blame.c:873 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -7991,18 +10458,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:924 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "hace 4 años, 11 meses" -#: builtin/blame.c:1011 +#: builtin/blame.c:1079 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "archivo %s tiene solo %lu línea" msgstr[1] "archivo %s tiene solo %lu líneas" -#: builtin/blame.c:1057 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "Blaming a líneas" @@ -8034,7 +10501,7 @@ msgstr "git branch [<opciones>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<opciones>] [-r | -a] [--formato]" -#: builtin/branch.c:151 +#: builtin/branch.c:154 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -8043,7 +10510,7 @@ msgstr "" "borrando la rama '%s' que ha sido fusionada en\n" " '%s', pero aún no ha sido fusionada a HEAD." -#: builtin/branch.c:155 +#: builtin/branch.c:158 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -8052,130 +10519,139 @@ msgstr "" "no borrando rama '%s' que todavía no ha sido fusionada \n" "\ta '%s', aunque se fusione con HEAD." -#: builtin/branch.c:169 +#: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "No se pudo encontrar el objeto commit para '%s'" -#: builtin/branch.c:173 +#: builtin/branch.c:176 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "La rama '%s' no ha sido fusionada completamente.\n" -"Si está seguro de querer borrarla, ejecute 'git branch -D %s'." +"Si estás seguro de querer borrarla, ejecuta 'git branch -D %s'." -#: builtin/branch.c:186 +#: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "Falló de actualización de config-file" -#: builtin/branch.c:217 +#: builtin/branch.c:220 msgid "cannot use -a with -d" msgstr "no se puede usar-a con -d" -#: builtin/branch.c:223 +#: builtin/branch.c:226 msgid "Couldn't look up commit object for HEAD" msgstr "No se pudo revisar el objeto commit para HEAD" -#: builtin/branch.c:237 +#: builtin/branch.c:240 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'" -#: builtin/branch.c:252 +#: builtin/branch.c:255 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "rama de rastreo remoto '%s' no encontrada." -#: builtin/branch.c:253 +#: builtin/branch.c:256 #, c-format msgid "branch '%s' not found." msgstr "rama '%s' no encontrada." -#: builtin/branch.c:268 +#: builtin/branch.c:271 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Error al eliminar la rama de rastreo remota '%s'" -#: builtin/branch.c:269 +#: builtin/branch.c:272 #, c-format msgid "Error deleting branch '%s'" msgstr "Error al eliminar la rama '%s'" -#: builtin/branch.c:276 +#: builtin/branch.c:279 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Eliminada la rama de rastreo remota %s (era %s).\n" -#: builtin/branch.c:277 +#: builtin/branch.c:280 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Eliminada la rama %s (era %s)..\n" -#: builtin/branch.c:421 builtin/tag.c:59 +#: builtin/branch.c:429 builtin/tag.c:61 msgid "unable to parse format string" msgstr "no es posible analizar el string de formato" -#: builtin/branch.c:458 +#: builtin/branch.c:460 +msgid "could not resolve HEAD" +msgstr "no se pudo resolver HEAD" + +#: builtin/branch.c:466 +#, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) apunta fuera de refs/heads/" + +#: builtin/branch.c:481 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Rama %s está siendo rebasada en %s" -#: builtin/branch.c:462 +#: builtin/branch.c:485 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Rama %s está siendo bisecada en %s" -#: builtin/branch.c:479 +#: builtin/branch.c:502 msgid "cannot copy the current branch while not on any." msgstr "no se puede copiar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:481 +#: builtin/branch.c:504 msgid "cannot rename the current branch while not on any." msgstr "no se puede renombrar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:492 +#: builtin/branch.c:515 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nombre de rama inválido: '%s'" -#: builtin/branch.c:519 +#: builtin/branch.c:542 msgid "Branch rename failed" msgstr "Cambio de nombre de rama fallido" -#: builtin/branch.c:521 +#: builtin/branch.c:544 msgid "Branch copy failed" msgstr "Copiado de rama fallido" -#: builtin/branch.c:525 +#: builtin/branch.c:548 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Copia creada de la rama malnombrada '%s'" -#: builtin/branch.c:528 +#: builtin/branch.c:551 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Rama mal llamada '%s' renombrada" -#: builtin/branch.c:534 +#: builtin/branch.c:557 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!" -#: builtin/branch.c:543 +#: builtin/branch.c:566 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La rama está renombrada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:545 +#: builtin/branch.c:568 msgid "Branch is copied, but update of config-file failed" msgstr "" "La rama está copiada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:561 +#: builtin/branch.c:584 #, c-format msgid "" "Please edit the description for the branch\n" @@ -8184,188 +10660,182 @@ msgid "" msgstr "" "Por favor, edita la descripción para la rama\n" "%s\n" -"Las líneas que comiencen con '%c' serán removidas.\n" +"Las líneas que comiencen con '%c' serán eliminadas.\n" -#: builtin/branch.c:594 +#: builtin/branch.c:618 msgid "Generic options" msgstr "Opciones genéricas" -#: builtin/branch.c:596 +#: builtin/branch.c:620 msgid "show hash and subject, give twice for upstream branch" msgstr "mostrar hash y tema, dar dos veces para rama upstream" -#: builtin/branch.c:597 +#: builtin/branch.c:621 msgid "suppress informational messages" msgstr "suprimir mensajes informativos" -#: builtin/branch.c:598 +#: builtin/branch.c:622 msgid "set up tracking mode (see git-pull(1))" msgstr "configurando modo tracking (mirar git-pull(1))" -#: builtin/branch.c:600 +#: builtin/branch.c:624 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:602 builtin/rebase--interactive.c:180 +#: builtin/branch.c:626 builtin/rebase.c:513 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:602 +#: builtin/branch.c:626 msgid "change the upstream info" msgstr "cambiar info de upstream" -#: builtin/branch.c:603 -msgid "Unset the upstream info" -msgstr "Desconfigurando la info de upstream" +#: builtin/branch.c:627 +msgid "unset the upstream info" +msgstr "desconfigurando la info de upstream" -#: builtin/branch.c:604 +#: builtin/branch.c:628 msgid "use colored output" msgstr "usar salida con colores" -#: builtin/branch.c:605 +#: builtin/branch.c:629 msgid "act on remote-tracking branches" msgstr "actuar en ramas de traqueo remoto" -#: builtin/branch.c:607 builtin/branch.c:609 +#: builtin/branch.c:631 builtin/branch.c:633 msgid "print only branches that contain the commit" msgstr "mostrar solo ramas que contienen el commit" -#: builtin/branch.c:608 builtin/branch.c:610 +#: builtin/branch.c:632 builtin/branch.c:634 msgid "print only branches that don't contain the commit" msgstr "mostrar solo ramas que no contienen el commit" -#: builtin/branch.c:613 +#: builtin/branch.c:637 msgid "Specific git-branch actions:" msgstr "Acciones específicas de git-branch:" -#: builtin/branch.c:614 +#: builtin/branch.c:638 msgid "list both remote-tracking and local branches" msgstr "listar ramas de remote-tracking y locales" -#: builtin/branch.c:616 +#: builtin/branch.c:640 msgid "delete fully merged branch" msgstr "borrar ramas totalmente fusionadas" -#: builtin/branch.c:617 +#: builtin/branch.c:641 msgid "delete branch (even if not merged)" msgstr "borrar rama (incluso si no está fusionada)" -#: builtin/branch.c:618 +#: builtin/branch.c:642 msgid "move/rename a branch and its reflog" msgstr "mover/renombrar una rama y su reflog" -#: builtin/branch.c:619 +#: builtin/branch.c:643 msgid "move/rename a branch, even if target exists" msgstr "mover/renombrar una rama, incluso si el destino existe" -#: builtin/branch.c:620 +#: builtin/branch.c:644 msgid "copy a branch and its reflog" msgstr "copiar una rama y su reflog" -#: builtin/branch.c:621 +#: builtin/branch.c:645 msgid "copy a branch, even if target exists" msgstr "copiar una rama, incluso si el objetivo existe" -#: builtin/branch.c:622 +#: builtin/branch.c:646 msgid "list branch names" msgstr "listar nombres de ramas" -#: builtin/branch.c:623 +#: builtin/branch.c:647 +msgid "show current branch name" +msgstr "muestra el nombre de branch actual" + +#: builtin/branch.c:648 msgid "create the branch's reflog" msgstr "crea el reflog de la rama" -#: builtin/branch.c:625 +#: builtin/branch.c:650 msgid "edit the description for the branch" msgstr "edita la descripción de la rama" -#: builtin/branch.c:626 +#: builtin/branch.c:651 msgid "force creation, move/rename, deletion" msgstr "fuerza la creación,movimiento/renombrado,borrado" -#: builtin/branch.c:627 +#: builtin/branch.c:652 msgid "print only branches that are merged" msgstr "muestra solo ramas que han sido fusionadas" -#: builtin/branch.c:628 +#: builtin/branch.c:653 msgid "print only branches that are not merged" msgstr "muestra solo ramas que no han sido fusionadas" -#: builtin/branch.c:629 +#: builtin/branch.c:654 msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:415 -msgid "key" -msgstr "clave" - -#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:416 -msgid "field name to sort on" -msgstr "nombre del campo por el cuál ordenar" - -#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581 -#: builtin/tag.c:418 +#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 +#: builtin/tag.c:433 msgid "object" msgstr "objeto" -#: builtin/branch.c:634 +#: builtin/branch.c:658 msgid "print only branches of the object" msgstr "imprimir sólo las ramas del objeto" -#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 -#: builtin/verify-tag.c:39 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:660 builtin/clone.c:739 +#: builtin/branch.c:684 builtin/clone.c:785 msgid "HEAD not found below refs/heads!" -msgstr "HEAD no encontrado abajo de refs/heads!" +msgstr "¡HEAD no encontrado abajo de refs/heads!" -#: builtin/branch.c:683 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:725 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripción al HEAD desacoplado" -#: builtin/branch.c:730 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "no se puede editar la descripción de más de una rama" -#: builtin/branch.c:737 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aún no hay commits en la rama '%s'." -#: builtin/branch.c:740 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:755 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operación de copiado" -#: builtin/branch.c:764 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operación de renombrado" -#: builtin/branch.c:769 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:773 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -8373,37 +10843,40 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:776 builtin/branch.c:798 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:780 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:792 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:796 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:802 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Rama '%s' no tiene información de upstream" -#: builtin/branch.c:812 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" +#: builtin/branch.c:841 +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list <pattern>?" msgstr "" -"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama" +"Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n" +"¿Quisiste usar: -a|-r --list <patrón>?" -#: builtin/branch.c:815 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -8411,20 +10884,65 @@ msgstr "" "la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--" "set-upstream-to' en cambio." -#: builtin/bundle.c:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s está bien\n" +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "git bundle create [<opciones>] <file> <git-rev-list args>" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [<options>] <file>" +msgstr "git bundle verify [<opciones>] <archivo>" + +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]" -#: builtin/bundle.c:58 +#: builtin/bundle.c:66 builtin/pack-objects.c:3375 +msgid "do not show progress meter" +msgstr "no mostrar medidor de progreso" + +#: builtin/bundle.c:68 builtin/pack-objects.c:3377 +msgid "show progress meter" +msgstr "mostrar medidor de progreso" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3379 +msgid "show progress meter during object writing phase" +msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3382 +msgid "similar to --all-progress when progress meter is shown" +msgstr "similar a --all-progress cuando medidor de progreso es mostrado" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "Se necesita un repositorio para agrupar." -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "no mostrar detalles del bundle" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s está bien\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/cat-file.c:587 +#: builtin/bundle.c:168 builtin/remote.c:1686 +msgid "be verbose; must be placed before a subcommand" +msgstr "ser verboso; tiene que ser agregado antes de un subcomando" + +#: builtin/bundle.c:190 builtin/remote.c:1717 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sub-comando desconocido: %s" + +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -8432,7 +10950,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" -#: builtin/cat-file.c:588 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -8440,133 +10958,133 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:609 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "solo se puede especificar una opción batch" -#: builtin/cat-file.c:627 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puede ser: blob, tree, commit, tag" -#: builtin/cat-file.c:628 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "mostrar el tipo del objeto" -#: builtin/cat-file.c:629 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "mostrar el tamaño del objeto" -#: builtin/cat-file.c:631 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "salir con cero cuando no haya error" -#: builtin/cat-file.c:632 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "realizar pretty-print del contenido del objeto" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, ejecuta filters en el contenido del objeto" -#: builtin/cat-file.c:637 git-submodule.sh:857 +#: builtin/cat-file.c:645 git-submodule.sh:1002 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "use una ruta específica para --textconv/--filters" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permita -s y -t para trabajar con objetos rotos o corruptos" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "salida buffer --batch" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "mostrar info y content de los objetos alimentados por standard input" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "mostrar info de los objetos alimentados por standard input" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" -#: builtin/cat-file.c:653 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos los objetos con --batch o --batch-check" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "no ordenar el output de --batch-all-objects" -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..." -#: builtin/check-attr.c:13 +#: builtin/check-attr.c:14 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "report all attributes set on file" msgstr "reportar todos los atributos configurados en el archivo" -#: builtin/check-attr.c:21 +#: builtin/check-attr.c:22 msgid "use .gitattributes only from the index" msgstr "use .gitattributes solo desde el índice" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 msgid "read file names from stdin" msgstr "leer nombres de archivos de stdin" -#: builtin/check-attr.c:24 builtin/check-ignore.c:26 +#: builtin/check-attr.c:25 builtin/check-ignore.c:27 msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517 -#: builtin/worktree.c:495 +#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:29 msgid "show non-matching input paths" msgstr "mostrar rutas de entrada que no concuerdan" -#: builtin/check-ignore.c:30 +#: builtin/check-ignore.c:31 msgid "ignore index when checking" msgstr "ignorar el índice cuando se revise" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "no se puede especificar los nombres de rutas con --stdin" -#: builtin/check-ignore.c:162 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z sólo tiene sentido con --stdin" -#: builtin/check-ignore.c:164 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "ruta no especificada" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet solo es válido con un nombre de ruta único" -#: builtin/check-ignore.c:170 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "no se puede tener ambos --quiet y --verbose" -#: builtin/check-ignore.c:173 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching sólo es válida con --verbose" @@ -8587,56 +11105,56 @@ msgstr "no es posible analizar el contacto: %s" msgid "no contacts specified" msgstr "contactos no especificados" -#: builtin/checkout-index.c:128 +#: builtin/checkout-index.c:131 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opciones>] [--] [<archivo>...]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:148 msgid "stage should be between 1 and 3 or all" msgstr "stage tiene que estar entre 1 y 3 o all" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:164 msgid "check out all files in the index" msgstr "revisar todos los archivos en el índice" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:165 msgid "force overwrite of existing files" msgstr "forzar sobreescritura de los archivos existentes" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:167 msgid "no warning for existing files and files not in index" msgstr "" "no hay advertencias para los archivos existentes y los archivos no están en " "el índice" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:169 msgid "don't checkout new files" msgstr "no revisar archivos nuevos" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:171 msgid "update stat information in the index file" msgstr "actualizar información de estado en el archivo índice" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:175 msgid "read list of paths from the standard input" msgstr "leer lista de rutas desde standard input" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:177 msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853 -#: builtin/worktree.c:668 +#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:672 msgid "string" msgstr "string" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:179 msgid "when creating files, prepend <string>" msgstr "cuando cree archivos, anteponer <string>" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:181 msgid "copy out the files from named stage" msgstr "copiar los archivos del stage nombrado" @@ -8648,105 +11166,158 @@ msgstr "git checkout [<opciones>] <rama>" msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..." -#: builtin/checkout.c:144 builtin/checkout.c:177 +#: builtin/checkout.c:37 +msgid "git switch [<options>] [<branch>]" +msgstr "git switch [<opciones>] [<rama>]" + +#: builtin/checkout.c:42 +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..." + +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "ruta '%s' no tiene nuestra versión" -#: builtin/checkout.c:146 builtin/checkout.c:179 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "ruta '%s' no tiene su versión" -#: builtin/checkout.c:162 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:206 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:224 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:240 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268 -#: builtin/checkout.c:271 +#: builtin/checkout.c:377 +#, c-format +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "Recreado %d conflicto de merge" +msgstr[1] "Recreados %d conflictos de merge" + +#: builtin/checkout.c:382 +#, c-format +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "Actualizada %d ruta para %s" +msgstr[1] "Actualizadas %d rutas para %s" + +#: builtin/checkout.c:389 +#, c-format +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "Actualizada %d ruta desde el index" +msgstr[1] "Actualizadas %d rutas desde el index" + +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:274 builtin/checkout.c:277 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:280 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:349 builtin/checkout.c:356 +#: builtin/checkout.c:436 +#, c-format +msgid "neither '%s' or '%s' is specified" +msgstr "ni '%s' o '%s' están especificados" + +#: builtin/checkout.c:440 +#, c-format +msgid "'%s' must be used when '%s' is not specified" +msgstr "'%s' tiene que ser usado cuando '%s' no es especificado" + +#: builtin/checkout.c:445 builtin/checkout.c:450 +#, c-format +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' o '%s' no puede ser usado con %s" + +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:608 +#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 msgid "you need to resolve your current index first" -msgstr "necesita resolver su índice actual primero" +msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:745 +#: builtin/checkout.c:734 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"no se puede continuar con los cambios en stage en los siguientes archivos:\n" +"%s" + +#: builtin/checkout.c:837 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:786 +#: builtin/checkout.c:879 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:790 builtin/clone.c:692 +#: builtin/checkout.c:883 builtin/clone.c:717 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:794 +#: builtin/checkout.c:887 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:797 +#: builtin/checkout.c:890 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:801 +#: builtin/checkout.c:894 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:803 builtin/checkout.c:1166 +#: builtin/checkout.c:896 builtin/checkout.c:1320 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:805 +#: builtin/checkout.c:898 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:856 +#: builtin/checkout.c:949 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:862 +#: builtin/checkout.c:955 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -8759,17 +11330,17 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Peligro: está saliendo %d commit atrás, no está conectado\n" +"Peligro: estás saliendo %d commit atrás, no está conectado\n" "a ninguna rama:\n" "\n" "%s\n" msgstr[1] "" -"Peligro: está saliendo %d commits atrás, no está conectado\n" +"Peligro: estás saliendo %d commits atrás, no está conectado\n" "a ninguna rama:\n" "\n" "%s\n" -#: builtin/checkout.c:881 +#: builtin/checkout.c:974 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -8784,172 +11355,280 @@ msgid_plural "" " git branch <new-branch-name> %s\n" "\n" msgstr[0] "" -"Si quiere conservarlo creando una nueva rama, este es un buen momento\n" +"Si quieres conservarlo creando una nueva rama, este es un buen momento\n" "para hacerlo:\n" "\n" " git branch <nuevo-nombre-de-rama> %s\n" "\n" msgstr[1] "" -"Si quiere conservarlos creando una nueva rama, este es un buen momento\n" +"Si quieres conservarlos creando una nueva rama, este es un buen momento\n" "para hacerlo:\n" "\n" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:913 +#: builtin/checkout.c:1009 msgid "internal error in revision walk" msgstr "error interno en camino de revisión" -#: builtin/checkout.c:917 +#: builtin/checkout.c:1013 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:945 builtin/checkout.c:1161 +#: builtin/checkout.c:1053 builtin/checkout.c:1315 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1128 +#, c-format +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" +msgstr "" +"'%s' puede ser tanto un archivo local como una rama de rastreo.\n" +"Por favor use -- (y opcionalmente --no-guess) para desambiguar" + +#: builtin/checkout.c:1135 +msgid "" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n" +"puedes hacerlo proporcionando el nombre completo con la opción --track:\n" +"\n" +" git checkout --track origin/<nombre>\n" +"\n" +"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una " +"rama\n" +"de nombre <nombre> remota, como 'origin', considera configurar\n" +"checkout.defaultRemote=origin en tu configuración." + +#: builtin/checkout.c:1145 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto" + +#: builtin/checkout.c:1211 +msgid "only one reference expected" +msgstr "solo una referencia esperada" + +#: builtin/checkout.c:1228 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444 +#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1287 builtin/checkout.c:1649 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1334 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "se esperaba un branch, se obtuvo tag '%s'" + +#: builtin/checkout.c:1336 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "se espera una rama, se obtuvo una rama remota '%s'" + +#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "se esperaba branch, se obuto '%s'" + +#: builtin/checkout.c:1340 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "se espera una rama, se obtuvo commit '%s'" + +#: builtin/checkout.c:1356 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un merge\n" +"Considera \"git merge --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1360 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch en medio de una sesión de am\n" +"Considera \"git am --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1364 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un rebase\n" +"Considera \"git rebase --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1368 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un cherry-pick\n" +"Considera \"git cherry-pick --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1372 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"no se puede cambiar de branch durante un revert\n" +"Considera \"git revert --quit\" o \"git worktree add\"." + +#: builtin/checkout.c:1376 +msgid "you are switching branch while bisecting" +msgstr "estás cambiando ramas durante un bisect" + +#: builtin/checkout.c:1383 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1178 builtin/checkout.c:1182 +#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194 -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 +#: builtin/checkout.c:1409 builtin/checkout.c:1414 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1202 +#: builtin/checkout.c:1411 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "'%s' no puede tomar <punto de partida>" + +#: builtin/checkout.c:1419 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No se puede cambiar rama a un '%s' sin commits" -#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488 -#: builtin/worktree.c:490 -msgid "branch" -msgstr "rama" +#: builtin/checkout.c:1426 +msgid "missing branch or commit argument" +msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1236 -msgid "create and checkout a new branch" -msgstr "crear y hacer checkout a una nueva rama" +#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 +#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 +#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/send-pack.c:174 +msgid "force progress reporting" +msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1238 -msgid "create/reset and checkout a branch" -msgstr "crear/reiniciar y hacer checkout a una rama" +#: builtin/checkout.c:1469 +msgid "perform a 3-way merge with the new branch" +msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1239 -msgid "create reflog for new branch" -msgstr "crear un reflog para una nueva rama" +#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +msgid "style" +msgstr "estilo" + +#: builtin/checkout.c:1471 +msgid "conflict style (merge or diff3)" +msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1240 builtin/worktree.c:492 +#: builtin/checkout.c:1483 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1484 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1486 +msgid "force checkout (throw away local modifications)" +msgstr "forzar el checkout (descartar modificaciones locales)" + +#: builtin/checkout.c:1488 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1488 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1245 +#: builtin/checkout.c:1490 builtin/merge.c:289 +msgid "update ignored files (default)" +msgstr "actualizar archivos ignorados (default)" + +#: builtin/checkout.c:1493 +msgid "do not check if another worktree is holding the given ref" +msgstr "no revise si otro árbol de trabajo contiene la ref entregada" + +#: builtin/checkout.c:1506 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1509 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1250 -msgid "force checkout (throw away local modifications)" -msgstr "forzar el checkout (descartar modificaciones locales)" - -#: builtin/checkout.c:1252 -msgid "perform a 3-way merge with the new branch" -msgstr "realizar una fusión de tres vías con la rama nueva" - -#: builtin/checkout.c:1254 builtin/merge.c:275 -msgid "update ignored files (default)" -msgstr "actualizar archivos ignorados (default)" - -#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274 -msgid "style" -msgstr "estilo" - -#: builtin/checkout.c:1257 -msgid "conflict style (merge or diff3)" -msgstr "conflicto de estilos (merge o diff3)" - -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1513 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1262 -msgid "second guess 'git checkout <no-such-branch>'" -msgstr "segunda opción 'git checkout <no-hay-tal-rama>'" - -#: builtin/checkout.c:1264 -msgid "do not check if another worktree is holding the given ref" -msgstr "no revise si otro árbol de trabajo contiene la ref entregada" - -#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141 -#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "forzar el reporte de progreso" - -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1315 +#: builtin/checkout.c:1568 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p y --overlay son mutuamente exclusivas" + +#: builtin/checkout.c:1605 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1320 +#: builtin/checkout.c:1610 msgid "missing branch name; try -b" msgstr "falta nombre de rama; prueba -b" -#: builtin/checkout.c:1357 +#: builtin/checkout.c:1642 +#, c-format +msgid "could not resolve %s" +msgstr "no se pudo resolver %s" + +#: builtin/checkout.c:1658 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1665 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1669 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1678 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file es incompatible con --detach" + +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file es incompatible con --patch" + +#: builtin/checkout.c:1692 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -8957,68 +11636,109 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1392 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"'%s' acertó más de una rama remota rastreada.\n" -"Encontramos %d remotos con una referencia que concuerda. Así que volvemos\n" -"a intentar resolver el argumento como una ruta, pero eso también falló!\n" -"\n" -"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n" -"puedes hacerlo proporcionando el nombre completo con la opción --track:\n" -"\n" -" git checkout --track origin/<nombre>\n" -"\n" -"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una " -"rama\n" -"de nombre <nombre> remota, como 'origin', considera configurar\n" -"checkout.defaultRemote=origin en tu configuración." +#: builtin/checkout.c:1697 +msgid "you must specify path(s) to restore" +msgstr "debes especificar path(s) para restaurar" + +#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 +#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +msgid "branch" +msgstr "rama" + +#: builtin/checkout.c:1724 +msgid "create and checkout a new branch" +msgstr "crear y hacer checkout a una nueva rama" + +#: builtin/checkout.c:1726 +msgid "create/reset and checkout a branch" +msgstr "crear/reiniciar y hacer checkout a una rama" + +#: builtin/checkout.c:1727 +msgid "create reflog for new branch" +msgstr "crear un reflog para una nueva rama" + +#: builtin/checkout.c:1729 +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" + +#: builtin/checkout.c:1730 +msgid "use overlay mode (default)" +msgstr "usar modo overlay (default)" + +#: builtin/checkout.c:1775 +msgid "create and switch to a new branch" +msgstr "crear y hacer switch a una nueva rama" + +#: builtin/checkout.c:1777 +msgid "create/reset and switch to a branch" +msgstr "crear/reiniciar y hacer switch a una rama" + +#: builtin/checkout.c:1779 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" + +#: builtin/checkout.c:1781 +msgid "throw away local modifications" +msgstr "descartar modificaciones locales" -#: builtin/clean.c:27 +#: builtin/checkout.c:1813 +msgid "which tree-ish to checkout from" +msgstr "de qué árbol hacer el checkout" + +#: builtin/checkout.c:1815 +msgid "restore the index" +msgstr "restaurar el index" + +#: builtin/checkout.c:1817 +msgid "restore the working tree (default)" +msgstr "restaurar el árbol de trabajo (default)" + +#: builtin/checkout.c:1819 +msgid "ignore unmerged entries" +msgstr "ignorar entradas no fusionadas" + +#: builtin/checkout.c:1820 +msgid "use overlay mode" +msgstr "usar modo overlay" + +#: builtin/clean.c:28 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..." -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Removing %s\n" msgstr "Borrando %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Would remove %s\n" msgstr "Sera borrado %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Skipping repository %s\n" msgstr "Saltando repositorio %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Would skip repository %s\n" msgstr "Se saltara repositorio %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "failed to remove %s" msgstr "falló al borrar %s" -#: builtin/clean.c:298 git-add--interactive.perl:579 +#: builtin/clean.c:37 +#, c-format +msgid "could not lstat %s\n" +msgstr "no se pudo lstat %s\n" + +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -9031,7 +11751,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" -#: builtin/clean.c:302 git-add--interactive.perl:588 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -9052,38 +11772,33 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" -#: builtin/clean.c:518 git-add--interactive.perl:554 -#: git-add--interactive.perl:559 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" -msgstr "Ahh (%s)?\n" +msgstr "¿Ahh (%s)?\n" -#: builtin/clean.c:660 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Input ignora los patrones >> " -#: builtin/clean.c:697 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" -#: builtin/clean.c:718 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:759 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " -msgstr "Borrar %s [y/N]? " +msgstr "¿Borrar %s [y/N]? " -#: builtin/clean.c:784 git-add--interactive.perl:1717 -#, c-format -msgid "Bye.\n" -msgstr "Adiós.\n" - -#: builtin/clean.c:792 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -9101,64 +11816,56 @@ msgstr "" "help - esta ventana\n" "? - ayuda para selección de opciones" -#: builtin/clean.c:819 git-add--interactive.perl:1793 -msgid "*** Commands ***" -msgstr "*** Comandos ***" - -#: builtin/clean.c:820 git-add--interactive.perl:1790 -msgid "What now" -msgstr "Ahora que" - -#: builtin/clean.c:828 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Se eliminará el siguiente objeto:" msgstr[1] "Se eliminarán los siguientes objetos:" -#: builtin/clean.c:844 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." -msgstr "No hay mas archivos para limpiar, saliendo." +msgstr "No hay más archivos para limpiar, saliendo." -#: builtin/clean.c:906 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "no imprimir nombres de archivos borrados" -#: builtin/clean.c:908 +#: builtin/clean.c:911 msgid "force" msgstr "forzar" -#: builtin/clean.c:909 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "limpieza interactiva" -#: builtin/clean.c:911 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "borrar directorios completos" -#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547 -#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168 -#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417 -#: builtin/show-ref.c:178 +#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 +#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" -#: builtin/clean.c:913 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "agregar <patrón> para ignorar reglas" -#: builtin/clean.c:914 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "borrar archivos ignorados, también" -#: builtin/clean.c:916 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "borrar solo archivos ignorados" -#: builtin/clean.c:934 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x y -X no pueden ser usadas juntas" -#: builtin/clean.c:938 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -9166,7 +11873,7 @@ msgstr "" "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clean.c:941 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -9174,146 +11881,166 @@ msgstr "" "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clone.c:43 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" -#: builtin/clone.c:88 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "crear un repositorio vacío" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "crear un repositorio espejo (implica vacío)" -#: builtin/clone.c:95 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "clonar de un repositorio local" -#: builtin/clone.c:97 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "no usar hardlinks, siempre copiar" -#: builtin/clone.c:99 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "configurar como repositorio compartido" -#: builtin/clone.c:101 builtin/clone.c:105 +#: builtin/clone.c:107 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:101 builtin/clone.c:105 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "inicializar submódulos en el clonado" -#: builtin/clone.c:108 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "numero de submódulos clonados en paralelo" -#: builtin/clone.c:109 builtin/init-db.c:478 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:110 builtin/init-db.c:479 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375 -#: builtin/submodule--helper.c:1856 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:116 builtin/submodule--helper.c:1377 -#: builtin/submodule--helper.c:1858 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "usa--reference solamente si estás clonado" -#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3301 builtin/repack.c:329 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3441 builtin/repack.c:327 msgid "name" msgstr "nombre" -#: builtin/clone.c:118 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" -#: builtin/clone.c:120 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checkout <rama> en lugar de HEAD remota" -#: builtin/clone.c:122 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825 -#: builtin/pull.c:217 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 +#: builtin/pull.c:207 msgid "depth" msgstr "profundidad" -#: builtin/clone.c:124 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 msgid "time" msgstr "tiempo" -#: builtin/clone.c:126 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" -#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:831 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1480 msgid "revision" msgstr "revision" -#: builtin/clone.c:128 builtin/fetch.c:147 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:130 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" -#: builtin/clone.c:132 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan" -#: builtin/clone.c:134 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "cualquier submódulo clonado será superficial" -#: builtin/clone.c:135 builtin/init-db.c:487 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:136 builtin/init-db.c:488 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separa git dir del árbol de trabajo" -#: builtin/clone.c:137 +#: builtin/clone.c:139 msgid "key=value" msgstr "llave=valor" -#: builtin/clone.c:138 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230 -#: builtin/push.c:583 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 +msgid "server-specific" +msgstr "especifico-de-servidor" + +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "opción para trasmitir" + +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233 -#: builtin/push.c:585 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" -#: builtin/clone.c:279 +#: builtin/clone.c:149 +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "cualquier submódulo clonado usará su branch de rastreo remoto" + +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" +"inicializar archivo sparse-checkout para incluir solo archivos en la raíz" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -9321,146 +12048,145 @@ msgstr "" "No se pudo adivinar ningún nombre de directorio.\n" "Por favor especifique un directorio en la línea de comando" -#: builtin/clone.c:332 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No se pudo agregar un alterno para '%s': %s\n" -#: builtin/clone.c:404 -#, c-format -msgid "failed to open '%s'" -msgstr "falló al abrir '%s'" - -#: builtin/clone.c:412 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:426 +#: builtin/clone.c:430 #, c-format -msgid "failed to stat %s\n" -msgstr "falló al analizar %s\n" +msgid "failed to start iterator over '%s'" +msgstr "falló al iniciar el iterador sobre '%s'" -#: builtin/clone.c:443 -#, c-format -msgid "failed to unlink '%s'" -msgstr "falló al desvincular '%s'" - -#: builtin/clone.c:448 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "falló al crear link '%s'" -#: builtin/clone.c:452 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "falló al copiar archivo a '%s'" -#: builtin/clone.c:478 +#: builtin/clone.c:469 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "falló al iterar sobre '%s'" + +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:492 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" -"and retry the checkout with 'git checkout -f HEAD'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" "Clonado exitoso, pero falló el checkout.\n" -"Puede inspeccionar a qué se hizo checkout con 'git status'\n" -"y volver a intentarlo con 'git checkout -f HEAD'\n" +"Puedes inspeccionar a qué se hizo checkout con 'git status'\n" +"y volver a intentarlo con 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:569 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No se pudo encontrar la rama remota %s para clonar." -#: builtin/clone.c:680 +#: builtin/clone.c:705 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:730 +#: builtin/clone.c:753 +msgid "failed to initialize sparse-checkout" +msgstr "falló al inicializar sparse-checkout" + +#: builtin/clone.c:776 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" -#: builtin/clone.c:761 +#: builtin/clone.c:807 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:806 +#: builtin/clone.c:862 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:869 +#: builtin/clone.c:925 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:871 +#: builtin/clone.c:927 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:911 builtin/receive-pack.c:1941 +#: builtin/clone.c:965 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:915 +#: builtin/clone.c:969 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:928 +#: builtin/clone.c:982 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:931 +#: builtin/clone.c:985 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:944 +#: builtin/clone.c:998 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:950 builtin/fetch.c:1606 +#: builtin/clone.c:1004 builtin/fetch.c:1796 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:960 +#: builtin/clone.c:1014 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." -#: builtin/clone.c:970 +#: builtin/clone.c:1024 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271 -#: builtin/worktree.c:295 builtin/worktree.c:325 +#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:990 +#: builtin/clone.c:1044 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:1010 +#: builtin/clone.c:1064 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:1012 +#: builtin/clone.c:1066 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1036 +#: builtin/clone.c:1090 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -9468,36 +12194,36 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1097 +#: builtin/clone.c:1154 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." -#: builtin/clone.c:1099 +#: builtin/clone.c:1156 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since es ignorado en el clon local; use file:// ." -#: builtin/clone.c:1101 +#: builtin/clone.c:1158 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1103 +#: builtin/clone.c:1160 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." -#: builtin/clone.c:1106 +#: builtin/clone.c:1163 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1111 +#: builtin/clone.c:1168 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1181 builtin/clone.c:1189 +#: builtin/clone.c:1243 builtin/clone.c:1251 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1192 +#: builtin/clone.c:1254 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -9533,25 +12259,93 @@ msgstr "Realizando padding entre columnas" msgid "--command must be the first argument" msgstr "--command debe ser el primer argumento" -#: builtin/commit.c:40 +#: builtin/commit-tree.c:18 +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <padre>)...] [-S[<keyid>]] [(-m <mensaje>)...] [(-F " +"<archivo>)...] <árbol>" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" +msgstr "padre duplicado %s ignorado" + +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#, c-format +msgid "not a valid object name %s" +msgstr "no es un nombre de objeto válido %s" + +#: builtin/commit-tree.c:93 +#, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "git commit-tree: falló al abrir '%s'" + +#: builtin/commit-tree.c:96 +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree: falló al leer '%s'" + +#: builtin/commit-tree.c:98 +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree: falló al cerrar '%s'" + +#: builtin/commit-tree.c:111 +msgid "parent" +msgstr "padre" + +#: builtin/commit-tree.c:112 +msgid "id of a parent commit object" +msgstr "id del objeto commit padre" + +#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/tag.c:412 +msgid "message" +msgstr "mensaje" + +#: builtin/commit-tree.c:115 builtin/commit.c:1501 +msgid "commit message" +msgstr "mensaje del commit" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "leer mensaje de commit desde un archivo" + +#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 +#: builtin/pull.c:175 builtin/revert.c:118 +msgid "GPG sign commit" +msgstr "Firmar commit con GPG" + +#: builtin/commit-tree.c:133 +msgid "must give exactly one tree" +msgstr "tiene que dar exactamente un árbol" + +#: builtin/commit-tree.c:140 +msgid "git commit-tree: failed to read" +msgstr "git commit-tree: falló al leer" + +#: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..." -#: builtin/commit.c:45 +#: builtin/commit.c:46 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<opciones>] [--] <especificación-de-ruta>..." -#: builtin/commit.c:50 +#: builtin/commit.c:51 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n" +"Has solicitado un amend en tu commit más reciente, pero hacerlo lo \n" "vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n" "el commit completamente con \"git reset HEAD^\".\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -9561,86 +12355,100 @@ msgid "" msgstr "" "El cherry-pick anterior ahora está vacío, posiblemente por un conflicto de " "resolución.\n" -"Si desea realizar un commit de todas maneras, use:\n" +"Si deseas realizar un commit de todas maneras, usa:\n" "\n" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:62 -msgid "Otherwise, please use 'git reset'\n" -msgstr "Caso contrario, por favor usa 'git reset'\n" +#: builtin/commit.c:63 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n" -#: builtin/commit.c:65 +#: builtin/commit.c:66 msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" "If you wish to skip this commit, use:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n" msgstr "" -"Si quiere saltar este commit, use:\n" +"y luego usa:\n" "\n" -" git reset\n" +" git cherry-pick --continue\n" +"\n" +"para resumir el cherry-pick con los commits faltantes.\n" +"Si deseas saltar el commit, usa:\n" +"\n" +" git cherry-pick --skip\n" "\n" -"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" -"para los commits restantes.\n" -#: builtin/commit.c:311 +#: builtin/commit.c:315 msgid "failed to unpack HEAD tree object" msgstr "falló al desempaquetar objeto del árbol HEAD" -#: builtin/commit.c:352 +#: builtin/commit.c:351 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file con -a no tiene sentido" + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "No hay rutas con --include/--only no tiene sentido." + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "no es posible crear un índice temporal" -#: builtin/commit.c:358 +#: builtin/commit.c:385 msgid "interactive add failed" msgstr "adición interactiva fallida" -#: builtin/commit.c:371 +#: builtin/commit.c:400 msgid "unable to update temporary index" msgstr "no es posible actualizar el índice temporal" -#: builtin/commit.c:373 +#: builtin/commit.c:402 msgid "Failed to update main cache tree" msgstr "Falló al actualizar el cache principal del árbol" -#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467 +#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:450 +#: builtin/commit.c:479 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusión." -#: builtin/commit.c:452 +#: builtin/commit.c:481 msgid "cannot do a partial commit during a cherry-pick." msgstr "no se puede realizar un commit parcial durante un cherry-pick." -#: builtin/commit.c:460 +#: builtin/commit.c:489 msgid "cannot read the index" msgstr "no se puede leer el índice" -#: builtin/commit.c:479 +#: builtin/commit.c:508 msgid "unable to write temporary index file" msgstr "no es posible escribir el índice temporal" -#: builtin/commit.c:577 +#: builtin/commit.c:606 #, c-format msgid "commit '%s' lacks author header" msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:579 +#: builtin/commit.c:608 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una línea de autor mal formada" -#: builtin/commit.c:598 +#: builtin/commit.c:627 msgid "malformed --author parameter" msgstr "parámetro --author mal formado" -#: builtin/commit.c:650 +#: builtin/commit.c:680 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -9648,38 +12456,38 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049 +#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:699 builtin/shortlog.c:317 +#: builtin/commit.c:730 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" -#: builtin/commit.c:701 +#: builtin/commit.c:732 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:705 +#: builtin/commit.c:736 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:734 builtin/commit.c:742 +#: builtin/commit.c:767 builtin/commit.c:783 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:739 +#: builtin/commit.c:774 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:793 +#: builtin/commit.c:834 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:811 +#: builtin/commit.c:853 #, c-format msgid "" "\n" @@ -9690,11 +12498,11 @@ msgid "" msgstr "" "\n" "Parece que estás haciendo un commit con una fusión dentro.\n" -"Si esto no es correcto, por favor remueve el archivo\n" +"Si esto no es correcto, por favor elimina el archivo\n" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:816 +#: builtin/commit.c:858 #, c-format msgid "" "\n" @@ -9704,178 +12512,170 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que puede estar haciendo un commit a un cherry-pick.\n" -"Si esto no es correcto, por favor elimine el archivo\n" +"Parece que puedes estar haciendo un commit a un cherry-pick.\n" +"Si esto no es correcto, por favor elimina el archivo\n" "\t%s\n" -"y vuelva a intentar.\n" +"y vuelve a intentar.\n" -#: builtin/commit.c:829 +#: builtin/commit.c:871 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " -"comiencen\n" -"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n" +"Por favor ingresa el mensaje del commit para tus cambios. Las\n" +" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" +" vacío aborta el commit.\n" -#: builtin/commit.c:837 +#: builtin/commit.c:879 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que " -"comiencen\n" -"con '%c' serán guardadas; puede eliminarlas usted mismo si desea.\n" +"Por favor ingresa el mensaje del commit para tus cambios. Las\n" +" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n" +" usted mismo si lo desea.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:854 +#: builtin/commit.c:896 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:862 +#: builtin/commit.c:904 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:869 +#: builtin/commit.c:911 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:887 +#: builtin/commit.c:929 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:953 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:967 builtin/tag.c:258 +#: builtin/commit.c:1011 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" -#: builtin/commit.c:1011 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " "autor existente" -#: builtin/commit.c:1025 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inválido '%s'" -#: builtin/commit.c:1039 builtin/commit.c:1276 +#: builtin/commit.c:1087 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1077 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1110 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1119 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1122 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1124 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Está en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1127 +#: builtin/commit.c:1188 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1137 +#: builtin/commit.c:1198 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." -#: builtin/commit.c:1139 +#: builtin/commit.c:1200 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "La opción -m no puede ser combinada con -c/-C/-F." -#: builtin/commit.c:1147 +#: builtin/commit.c:1208 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1164 +#: builtin/commit.c:1225 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." -#: builtin/commit.c:1166 -msgid "No paths with --include/--only does not make sense." -msgstr "No hay rutas con --include/--only no tiene sentido." - -#: builtin/commit.c:1180 builtin/tag.c:546 +#: builtin/commit.c:1231 #, c-format -msgid "Invalid cleanup mode %s" -msgstr "Modo cleanup inválido %s" +msgid "paths '%s ...' with -a does not make sense" +msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1185 -msgid "Paths with -a does not make sense." -msgstr "Rutas con -a no tiene sentido." - -#: builtin/commit.c:1311 builtin/commit.c:1495 +#: builtin/commit.c:1362 builtin/commit.c:1524 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1313 builtin/commit.c:1497 +#: builtin/commit.c:1364 builtin/commit.c:1526 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1315 +#: builtin/commit.c:1366 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1317 builtin/commit.c:1499 +#: builtin/commit.c:1368 builtin/commit.c:1528 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1319 +#: builtin/commit.c:1370 msgid "version" msgstr "version" -#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558 -#: builtin/worktree.c:639 +#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1322 builtin/commit.c:1503 +#: builtin/commit.c:1373 builtin/commit.c:1532 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1325 builtin/commit.c:1506 +#: builtin/commit.c:1376 builtin/commit.c:1535 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910 -#: builtin/tag.c:400 +#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1328 builtin/commit.c:1509 +#: builtin/commit.c:1379 builtin/commit.c:1538 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " "(Predeterminado: all)" -#: builtin/commit.c:1332 +#: builtin/commit.c:1383 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -9883,11 +12683,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1334 parse-options.h:164 +#: builtin/commit.c:1385 parse-options.h:192 msgid "when" msgstr "cuando" -#: builtin/commit.c:1335 +#: builtin/commit.c:1386 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -9895,252 +12695,250 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1337 +#: builtin/commit.c:1388 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1338 +#: builtin/commit.c:1389 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1340 +#: builtin/commit.c:1391 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1360 +#: builtin/commit.c:1411 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinación de argumentos de archivos ignorados y no rastreados no soportada" -#: builtin/commit.c:1465 +#: builtin/commit.c:1494 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1466 +#: builtin/commit.c:1495 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1468 +#: builtin/commit.c:1497 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397 +#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1470 +#: builtin/commit.c:1499 msgid "author" msgstr "autor" -#: builtin/commit.c:1470 +#: builtin/commit.c:1499 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1471 builtin/gc.c:518 +#: builtin/commit.c:1500 builtin/gc.c:538 msgid "date" msgstr "fecha" -#: builtin/commit.c:1471 +#: builtin/commit.c:1500 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409 -#: builtin/notes.c:572 builtin/tag.c:395 -msgid "message" -msgstr "mensaje" - -#: builtin/commit.c:1472 -msgid "commit message" -msgstr "mensaje del commit" - -#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475 -#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280 +#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 +#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1473 +#: builtin/commit.c:1502 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1474 +#: builtin/commit.c:1503 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1475 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1476 +#: builtin/commit.c:1505 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar el mensaje de formato autosquash para realizar squash al commit " "especificado" -#: builtin/commit.c:1477 +#: builtin/commit.c:1506 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" -#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276 -#: builtin/pull.c:155 builtin/revert.c:106 +#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 +#: builtin/pull.c:144 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1479 +#: builtin/commit.c:1508 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1480 +#: builtin/commit.c:1509 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1481 -msgid "default" -msgstr "default" - -#: builtin/commit.c:1481 builtin/tag.c:401 -msgid "how to strip spaces and #comments from message" -msgstr "cómo quitar espacios y #comentarios de mensajes" - -#: builtin/commit.c:1482 +#: builtin/commit.c:1511 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185 -#: builtin/revert.c:114 -msgid "GPG sign commit" -msgstr "Firmar commit con GPG" - -#: builtin/commit.c:1487 +#: builtin/commit.c:1516 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1488 +#: builtin/commit.c:1517 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1489 +#: builtin/commit.c:1518 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1490 +#: builtin/commit.c:1519 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1491 +#: builtin/commit.c:1520 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1492 +#: builtin/commit.c:1521 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1493 +#: builtin/commit.c:1522 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1494 +#: builtin/commit.c:1523 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1507 +#: builtin/commit.c:1536 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1508 +#: builtin/commit.c:1537 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1513 +#: builtin/commit.c:1544 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacío" -#: builtin/commit.c:1515 +#: builtin/commit.c:1546 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1588 +#: builtin/commit.c:1619 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1595 +#: builtin/commit.c:1626 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1614 +#: builtin/commit.c:1645 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1625 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1630 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abortando commit; no se ha editado el mensaje\n" -#: builtin/commit.c:1665 +#: builtin/commit.c:1691 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." +"not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n" "new_index. Verifique que el disco no este lleno y la quota no ha\n" -"sido superada, y luego \"git reset HEAD\" para recuperar." - -#: builtin/commit-graph.c:10 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "git commit-graph [--object-dir <objdir>]" +"sido superada, y luego \"git restore --sateged :/\" para recuperar." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "git commit-graph read [--object-dir <objdir>]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 -msgid "git commit-graph verify [--object-dir <objdir>]" -msgstr "git commit-graph verify [--object-dir <objdir>]" +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append][--reachable|--" -"stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <dir objeto>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de " +"split>" + +#: builtin/commit-graph.c:52 +#, c-format +msgid "could not find object directory matching %s" +msgstr "no se pudo entoncrar el objeto directorio concordante con %s" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 -#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 -#: builtin/log.c:1540 +#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:79 -#: builtin/commit-graph.c:133 builtin/commit-graph.c:191 +#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 +#: builtin/commit-graph.c:211 msgid "The object directory to store the graph" msgstr "El directorio de objetos para guardar el gráfico" -#: builtin/commit-graph.c:135 +#: builtin/commit-graph.c:71 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "si el commit-graph está cortado, solo verifica la punta del archivo" + +#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "No se pudo abrir commit-graph '%s'" + +#: builtin/commit-graph.c:128 msgid "start walk at all refs" msgstr "comenzar caminata en todas las refs" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:130 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de índices por stdin por commits" -#: builtin/commit-graph.c:139 +#: builtin/commit-graph.c:132 msgid "start walk at commits listed by stdin" msgstr "comenzar a caminar a los commits listados por stdin" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:134 msgid "include all commits already in the commit-graph file" msgstr "inclye todos los commits que ya están en el archivo commit-graph" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:137 +msgid "allow writing an incremental commit-graph file" +msgstr "permitir escribir un archivo commit-graph incremental" + +#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "máximo número de commits en un commit-graph sin base cortada" + +#: builtin/commit-graph.c:141 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "radio máximo entre dos niveles de corte de commit-graph" + +#: builtin/commit-graph.c:159 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" @@ -10148,206 +12946,212 @@ msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:103 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argumento --type no reconocido, %s" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "solo un tipo a la vez" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "Ubicación del archivo configuración" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "usar un archivo de config por árbol de trabajo" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "Acción" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "obtener valor: nombre [valor-regex]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "obtener todos los valores: llave [valores-regex]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "obtener valor especifico para el URL: sección[.var] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplazar todas las variables que concuerden: nombre valor [valor_regex]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "borrar una variable. nombre [valor-regex]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "borrar todas las concurrencias: nombre [valor-regex]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "renombrar sección: nombre-viejo nombre-nuevo" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "borrar una sección: nombre" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "listar todo" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "Tipo" -#: builtin/config.c:147 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "al valor se ha dado este tipo" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "valor es una fecha de expiración" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "Otro" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "terminar valores con un byte NULL" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "respetar directivas include en la búsqueda" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" -#: builtin/config.c:158 +#: builtin/config.c:159 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"mostrar el scope de la configuración (worktree, local, global, system, " +"command)" + +#: builtin/config.c:160 builtin/env--helper.c:40 msgid "value" msgstr "valor" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "con --get, usa el valor por defecto cuando falta una entrada" -#: builtin/config.c:171 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "número de argumentos inválidos, deberían ser %d" -#: builtin/config.c:173 +#: builtin/config.c:176 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "número de argumentos inválidos, deberían ser de %d a %d" -#: builtin/config.c:307 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "patrón de llave inválido: %s" -#: builtin/config.c:343 +#: builtin/config.c:360 #, c-format msgid "failed to format default config value: %s" msgstr "falló al formatear el valor por defecto de configuración: %s" -#: builtin/config.c:400 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "no se analizar color '%s'" -#: builtin/config.c:442 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "no es posible analizar el valor por defecto de color" -#: builtin/config.c:495 builtin/config.c:741 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "no en un directorio git" -#: builtin/config.c:498 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "escribir en stdin no está soportado" -#: builtin/config.c:501 +#: builtin/config.c:518 msgid "writing config blobs is not supported" msgstr "escribir blobs de configuración no está soportado" -#: builtin/config.c:586 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -10362,23 +13166,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:610 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "solo un archivo de configuración a la vez" -#: builtin/config.c:615 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:618 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "--blob solo puede ser usado dentro de un repositorio" -#: builtin/config.c:637 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "$HOME no está configurado" -#: builtin/config.c:657 +#: builtin/config.c:679 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -10390,52 +13194,52 @@ msgstr "" "\"\n" "en \"git help worktree\" para más detalles" -#: builtin/config.c:687 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "--get-color y tipo de variable incoherente" -#: builtin/config.c:692 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "solo una acción a la vez" -#: builtin/config.c:705 +#: builtin/config.c:732 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only solo es aplicable para --list o --get-regexp" -#: builtin/config.c:711 +#: builtin/config.c:738 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list" -#: builtin/config.c:717 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "--default solo es aplicable para --get" -#: builtin/config.c:730 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "no se puede leer el archivo de configuración '%s'" -#: builtin/config.c:733 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "error al procesar archivo(s) de configuración" -#: builtin/config.c:743 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "editar stdin no está soportado" -#: builtin/config.c:745 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "editar blobs no está soportado" -#: builtin/config.c:759 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuración %s" -#: builtin/config.c:772 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -10444,7 +13248,7 @@ msgstr "" "no se puede sobrescribir múltiples valores con un único valor\n" "\tUse una regexp, --add o --replace-all para cambiar %s." -#: builtin/config.c:846 builtin/config.c:857 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "no existe la sección: %s" @@ -10477,37 +13281,37 @@ msgstr "ligero" msgid "annotated" msgstr "anotado" -#: builtin/describe.c:272 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "tag anotado %s no disponible" -#: builtin/describe.c:276 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "tag anotado %s no tiene nombre embebido" -#: builtin/describe.c:278 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' es realmente '%s' aquí" -#: builtin/describe.c:322 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "no hay tag que concuerde exactamente con '%s'" -#: builtin/describe.c:324 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n" -#: builtin/describe.c:378 +#: builtin/describe.c:394 #, c-format msgid "finished search at %s\n" msgstr "búsqueda finalizada a las %s\n" -#: builtin/describe.c:404 +#: builtin/describe.c:421 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -10516,7 +13320,7 @@ msgstr "" "No hay tags anotados que puedan describir '%s'.\n" "Sin embargo, hubieron tags no anotados: intente --tags." -#: builtin/describe.c:408 +#: builtin/describe.c:425 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -10525,12 +13329,12 @@ msgstr "" "Ningún tag puede describit '%s'.\n" "Intente --always, o cree algunos tags." -#: builtin/describe.c:438 +#: builtin/describe.c:455 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits cruzados\n" -#: builtin/describe.c:441 +#: builtin/describe.c:458 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -10539,118 +13343,118 @@ msgstr "" "se encontró más de %i tags; se mostró %i más reciente\n" "fin de la búsqueda en %s\n" -#: builtin/describe.c:509 +#: builtin/describe.c:526 #, c-format msgid "describe %s\n" msgstr "describe %s\n" -#: builtin/describe.c:512 builtin/log.c:513 +#: builtin/describe.c:529 #, c-format msgid "Not a valid object name %s" msgstr "Nombre de objeto %s no válido" -#: builtin/describe.c:520 +#: builtin/describe.c:537 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no es un commit ni un blob" -#: builtin/describe.c:534 +#: builtin/describe.c:551 msgid "find the tag that comes after the commit" msgstr "encontrar el tag que viene después del commit" -#: builtin/describe.c:535 +#: builtin/describe.c:552 msgid "debug search strategy on stderr" msgstr "hacer debug a la estrategia de búsqueda en stderr" -#: builtin/describe.c:536 +#: builtin/describe.c:553 msgid "use any ref" msgstr "use cualquier ref" -#: builtin/describe.c:537 +#: builtin/describe.c:554 msgid "use any tag, even unannotated" msgstr "use cualquier tag, incluso los no anotados" -#: builtin/describe.c:538 +#: builtin/describe.c:555 msgid "always use long format" msgstr "siempre usar formato largo" -#: builtin/describe.c:539 +#: builtin/describe.c:556 msgid "only follow first parent" msgstr "solo seguir el primer patrón" -#: builtin/describe.c:542 +#: builtin/describe.c:559 msgid "only output exact matches" msgstr "solo mostrar concordancias exactas" -#: builtin/describe.c:544 +#: builtin/describe.c:561 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar <n> tags más recientes (default:10)" -#: builtin/describe.c:546 +#: builtin/describe.c:563 msgid "only consider tags matching <pattern>" msgstr "solo considerar tags que concuerden con <patrón>" -#: builtin/describe.c:548 +#: builtin/describe.c:565 msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrón>" -#: builtin/describe.c:550 builtin/name-rev.c:424 +#: builtin/describe.c:567 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" -#: builtin/describe.c:551 builtin/describe.c:554 +#: builtin/describe.c:568 builtin/describe.c:571 msgid "mark" msgstr "marca" -#: builtin/describe.c:552 +#: builtin/describe.c:569 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" -#: builtin/describe.c:555 +#: builtin/describe.c:572 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")" -#: builtin/describe.c:573 +#: builtin/describe.c:590 msgid "--long is incompatible with --abbrev=0" msgstr "--long es incompatible con --abbrev=0" -#: builtin/describe.c:602 +#: builtin/describe.c:619 msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#: builtin/describe.c:652 +#: builtin/describe.c:670 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty es incompatible con commit-ismos" -#: builtin/describe.c:654 +#: builtin/describe.c:672 msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" -#: builtin/diff.c:83 +#: builtin/diff.c:84 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': no es un archivo regular o un enlace simbólico" -#: builtin/diff.c:234 +#: builtin/diff.c:235 #, c-format msgid "invalid option: %s" msgstr "opción inválida: %s" -#: builtin/diff.c:363 +#: builtin/diff.c:350 msgid "Not a git repository" msgstr "No es un repositorio git" -#: builtin/diff.c:407 +#: builtin/diff.c:394 #, c-format msgid "invalid object '%s' given." msgstr "objeto '%s' entregado no es válido." -#: builtin/diff.c:416 +#: builtin/diff.c:403 #, c-format msgid "more than two blobs given: '%s'" msgstr "más de dos blobs entregados: '%s'" -#: builtin/diff.c:421 +#: builtin/diff.c:408 #, c-format msgid "unhandled object '%s' given." msgstr "objeto no manejado '%s' entregado." @@ -10687,54 +13491,54 @@ msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:633 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:635 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "archivo del árbol de trabajo ha sido dejado." -#: builtin/difftool.c:646 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:647 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." -msgstr "tal vez desee limpiar o recuperar estos." +msgstr "tal vez desees limpiar o recuperar estos." -#: builtin/difftool.c:696 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:700 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:705 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:707 msgid "tool" msgstr "herramienta" -#: builtin/difftool.c:707 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:709 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" -#: builtin/difftool.c:712 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -10742,161 +13546,245 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:715 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" +#: builtin/difftool.c:717 +msgid "passed to `diff`" +msgstr "pasado a `diff`" + +#: builtin/difftool.c:732 +msgid "difftool requires worktree or --no-index" +msgstr "difftool requiere un árbol de trabajo o --no-index" + #: builtin/difftool.c:739 +msgid "--dir-diff is incompatible with --no-index" +msgstr "--dirty-diff es incompatible con --no-index" + +#: builtin/difftool.c:742 +msgid "--gui, --tool and --extcmd are mutually exclusive" +msgstr "--gui, --tool y --extcmd son mutuamente exclusivas" + +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:746 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" +#: builtin/env--helper.c:6 +msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>" + +#: builtin/env--helper.c:37 builtin/hash-object.c:98 +msgid "type" +msgstr "tipo" + +#: builtin/env--helper.c:41 +msgid "default for git_env_*(...) to fall back on" +msgstr "default para git_env_*(...) es hacer fallback en" + +#: builtin/env--helper.c:43 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "ser silencioso solo usar valor git_env_*() como código de salida" + +#: builtin/env--helper.c:62 +#, c-format +msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "opción `--default' espera un valor boolean con `--type=bool`, no `%s`" + +#: builtin/env--helper.c:77 +#, c-format +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" +msgstr "" +"opción `--default' espera un valor unsigned long con `--type=ulong`, no `%s`" + #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:853 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" +"Error: No se puede exportar los tags anidados a menos que --mark-tags sea " +"especificado." + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "mostrar progreso después de <n> objetos" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "seleccionar el manejo de tags firmados" -#: builtin/fast-export.c:1011 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "seleccionar el manejo de tags que son tags de objetos filtrados" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1160 +msgid "select handling of commit messages in an alternate encoding" +msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente" + +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Volcar marcas a este archivo" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "Importar marcas de este archivo" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "Importar marcas de este archivo si existe" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "Falsificar un tagger cuando les falta uno" -#: builtin/fast-export.c:1020 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Mostrar todo el árbol para cada commit" -#: builtin/fast-export.c:1022 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Use el feature done para terminar el stream" -#: builtin/fast-export.c:1023 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Saltar el output de data blob" -#: builtin/fast-export.c:1024 builtin/log.c:1588 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1025 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "Aplicar refspec para los refs exportados" -#: builtin/fast-export.c:1026 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fetch.c:28 +#: builtin/fast-export.c:1181 +msgid "Reference parents which are not in fast-export stream by object id" +msgstr "" +"Padres de la referencia que no estan en fast-export stream por id de objeto" + +#: builtin/fast-export.c:1183 +msgid "Show original object ids of blobs/commits" +msgstr "Mostrar ids de objetos originales para blobs/commits" + +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "Marcar tags con ids de mark" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opciones>] <grupo>" -#: builtin/fetch.c:30 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:115 builtin/pull.c:194 +#: builtin/fetch.c:116 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel no puede ser negativo" + +#: builtin/fetch.c:139 builtin/pull.c:184 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:117 builtin/pull.c:197 +#: builtin/fetch.c:141 builtin/pull.c:228 +msgid "set upstream for git pull/fetch" +msgstr "configurar upstream para git pulll/fetch" + +#: builtin/fetch.c:143 builtin/pull.c:187 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:119 builtin/pull.c:200 +#: builtin/fetch.c:145 builtin/pull.c:190 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:120 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "forzar sobrescritura de referencia local" -#: builtin/fetch.c:122 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:124 builtin/pull.c:204 +#: builtin/fetch.c:150 builtin/pull.c:194 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:126 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:128 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:130 builtin/pull.c:207 +#: builtin/fetch.c:156 builtin/pull.c:197 msgid "prune remote-tracking branches no longer on remote" msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" -#: builtin/fetch.c:132 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "limpiar tags locales que no se encuentran en el remoto y eliminar tags " "cambiados" -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:134 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:138 builtin/pull.c:215 +#: builtin/fetch.c:164 builtin/pull.c:205 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:140 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:145 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:151 builtin/pull.c:221 +#: builtin/fetch.c:177 builtin/pull.c:211 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:154 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submódulo" -#: builtin/fetch.c:157 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -10904,107 +13792,133 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:161 builtin/pull.c:224 +#: builtin/fetch.c:187 builtin/pull.c:214 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:162 builtin/pull.c:226 +#: builtin/fetch.c:188 builtin/pull.c:216 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:163 builtin/pull.c:227 +#: builtin/fetch.c:189 builtin/pull.c:217 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582 -#: builtin/send-pack.c:172 -msgid "server-specific" -msgstr "especifico-de-servidor" - -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582 -#: builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "opción para trasmitir" - -#: builtin/fetch.c:170 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "reporta que solo tenemos objetos alcanzables de este objeto" -#: builtin/fetch.c:470 +#: builtin/fetch.c:199 +msgid "run 'gc --auto' after fetching" +msgstr "ejecutar 'gc --auto' tras el fetch" + +#: builtin/fetch.c:201 builtin/pull.c:226 +msgid "check for forced-updates on all updated branches" +msgstr "verificar updates forzados en todos los branch actualizados" + +#: builtin/fetch.c:203 +msgid "write the commit-graph after fetching" +msgstr "escribir commit-graph luego del fetch" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:609 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuración fetch.output contiene el valor inválido %s" -#: builtin/fetch.c:702 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:706 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:720 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:730 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787 -#: builtin/fetch.c:802 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:735 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "podría golpear tag existente" -#: builtin/fetch.c:757 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:760 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:763 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:802 +#: builtin/fetch.c:851 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:807 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:853 +#: builtin/fetch.c:877 +msgid "" +"Fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'." +msgstr "" +"Fetch normalmente incida qué branches han tenido un update forzado,\n" +"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--" +"show-forced-updates'\n" +"o ejecute 'git config fetch.showForcedUpdates true'." + +#: builtin/fetch.c:881 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +" to avoid this check.\n" +msgstr "" +"Tomó %.2f segundos validar los updates forzados. Puedes usar\n" +"'--no-show-forced-updates' o ejecutar 'git config fetch.showForcedUpdates " +"false'\n" +"para evitar esta validación.\n" + +#: builtin/fetch.c:920 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:874 +#: builtin/fetch.c:941 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:963 builtin/fetch.c:1085 +#: builtin/fetch.c:1026 builtin/fetch.c:1164 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:974 +#: builtin/fetch.c:1037 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -11013,56 +13927,79 @@ msgstr "" "algunos refs locales no pudieron ser actualizados; intente ejecutar\n" " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva" -#: builtin/fetch.c:1055 +#: builtin/fetch.c:1134 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:1056 +#: builtin/fetch.c:1135 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1088 +#: builtin/fetch.c:1167 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1089 builtin/remote.c:1036 +#: builtin/fetch.c:1168 builtin/remote.c:1112 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1112 +#: builtin/fetch.c:1191 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1210 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1213 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1421 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "múltiples ramas detectadas, incompatible con --set-upstream" + +#: builtin/fetch.c:1436 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "no configurar upstream para una rama de rastreo remoto" + +#: builtin/fetch.c:1438 +msgid "not setting upstream for a remote tag" +msgstr "no configurar upstream para un tag remoto" + +#: builtin/fetch.c:1440 +msgid "unknown branch type" +msgstr "tipo de branch desconocido" + +#: builtin/fetch.c:1442 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"no se encontró rama fuente.\n" +"tienes que especificar exactamente una rama con la opción --set-upstream." + +#: builtin/fetch.c:1568 builtin/fetch.c:1631 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1435 builtin/remote.c:100 +#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1481 builtin/fetch.c:1649 -msgid "" -"--filter can only be used with the remote configured in core.partialClone" -msgstr "" -"--filter solo puede ser usado con el remoto configurado en core.partialClone" +#: builtin/fetch.c:1590 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n" -#: builtin/fetch.c:1504 +#: builtin/fetch.c:1693 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -11070,66 +14007,74 @@ msgstr "" "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" "nombre remoto del cual las nuevas revisiones deben ser extraídas." -#: builtin/fetch.c:1541 +#: builtin/fetch.c:1730 msgid "You need to specify a tag name." -msgstr "Tiene que especificar un nombre de tag." +msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1590 +#: builtin/fetch.c:1780 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1592 +#: builtin/fetch.c:1782 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1597 +#: builtin/fetch.c:1787 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1599 +#: builtin/fetch.c:1789 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1615 +#: builtin/fetch.c:1805 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1617 +#: builtin/fetch.c:1807 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1626 +#: builtin/fetch.c:1816 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1823 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" +#: builtin/fetch.c:1841 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialclone" +msgstr "" +"--filter solo puede ser usado con el remoto configurado en extensions." +"partialClone" + #: builtin/fmt-merge-msg.c:18 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "poblar el log con máximo <n> entradas del shorlog" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "alias para --log (deprecado)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "use <text> como comienzo de mensaje" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "archivo del cual leer" @@ -11169,91 +14114,274 @@ msgstr "cite los marcadores de posición adecuadamente para Tcl" msgid "show only <n> matched refs" msgstr "mostrar solo <n> refs encontradas" -#: builtin/for-each-ref.c:39 builtin/tag.c:424 +#: builtin/for-each-ref.c:39 builtin/tag.c:439 msgid "respect format colors" msgstr "respetar el formato de colores" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "mostrar solo refs que apunten al objeto dado" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "mostrar solo refs que son fusionadas" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "mostrar solo refs que no son fusionadas" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "mostrar solo refs que contienen el commit" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "mostrar solo refs que no contienen el commit" -#: builtin/fsck.c:598 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +msgid "unknown" +msgstr "desconocido" + +#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> +#: builtin/fsck.c:100 builtin/fsck.c:120 +#, c-format +msgid "error in %s %s: %s" +msgstr "error en %s %s: %s" + +#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> +#: builtin/fsck.c:114 +#, c-format +msgid "warning in %s %s: %s" +msgstr "peligro en %s %s: %s" + +#: builtin/fsck.c:143 builtin/fsck.c:146 +#, c-format +msgid "broken link from %7s %s" +msgstr "link roto de %7s %s" + +#: builtin/fsck.c:155 +msgid "wrong object type in link" +msgstr "tipo de objeto equivocado en link" + +#: builtin/fsck.c:171 +#, c-format +msgid "" +"broken link from %7s %s\n" +" to %7s %s" +msgstr "" +"link roto de %7s %s\n" +" a %7s %s" + +#: builtin/fsck.c:282 +#, c-format +msgid "missing %s %s" +msgstr "faltan %s %s" + +#: builtin/fsck.c:309 +#, c-format +msgid "unreachable %s %s" +msgstr "inalcanzable %s %s" + +#: builtin/fsck.c:329 +#, c-format +msgid "dangling %s %s" +msgstr "actualizando %s %s" + +#: builtin/fsck.c:339 +msgid "could not create lost-found" +msgstr "no se pudo crear lost-found" + +#: builtin/fsck.c:350 +#, c-format +msgid "could not finish '%s'" +msgstr "no se pudo finalizar '%s'" + +#: builtin/fsck.c:367 +#, c-format +msgid "Checking %s" +msgstr "Revisando %s" + +#: builtin/fsck.c:405 +#, c-format +msgid "Checking connectivity (%d objects)" +msgstr "Verificando conectividad (%d objetos)" + +#: builtin/fsck.c:424 +#, c-format +msgid "Checking %s %s" +msgstr "Revisando %s %s" + +#: builtin/fsck.c:429 +msgid "broken links" +msgstr "links rotos" + +#: builtin/fsck.c:438 +#, c-format +msgid "root %s" +msgstr "raíz %s" + +#: builtin/fsck.c:446 +#, c-format +msgid "tagged %s %s (%s) in %s" +msgstr "tag %s %s (%s) en %s" + +#: builtin/fsck.c:475 +#, c-format +msgid "%s: object corrupt or missing" +msgstr "%s: objecto corrupto o faltante" + +#: builtin/fsck.c:500 +#, c-format +msgid "%s: invalid reflog entry %s" +msgstr "%s: referencia inválida %s" + +#: builtin/fsck.c:514 +#, c-format +msgid "Checking reflog %s->%s" +msgstr "Revisando reflog %s->%s" + +#: builtin/fsck.c:548 +#, c-format +msgid "%s: invalid sha1 pointer %s" +msgstr "%s: puntero sha1 inválido %s" + +#: builtin/fsck.c:555 +#, c-format +msgid "%s: not a commit" +msgstr "%s: no es un commit" + +#: builtin/fsck.c:609 +msgid "notice: No default references" +msgstr "aviso: No hay referencias por defecto" + +#: builtin/fsck.c:624 +#, c-format +msgid "%s: object corrupt or missing: %s" +msgstr "%s: objeto corrupto o no encontrado: %s" + +#: builtin/fsck.c:637 +#, c-format +msgid "%s: object could not be parsed: %s" +msgstr "%s: no se puede analizar objeto: %s" + +#: builtin/fsck.c:657 +#, c-format +msgid "bad sha1 file: %s" +msgstr "mal sha1 de archivo: %s" + +#: builtin/fsck.c:672 +msgid "Checking object directory" +msgstr "Revisando directorio de objetos" + +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:693 +#: builtin/fsck.c:690 +#, c-format +msgid "Checking %s link" +msgstr "Revisando link %s" + +#: builtin/fsck.c:695 builtin/index-pack.c:843 +#, c-format +msgid "invalid %s" +msgstr "%s inválido" + +#: builtin/fsck.c:702 +#, c-format +msgid "%s points to something strange (%s)" +msgstr "%s apunta a algo extraño (%s)" + +#: builtin/fsck.c:708 +#, c-format +msgid "%s: detached HEAD points at nothing" +msgstr "%s: HEAD desacoplado apunta a nada" + +#: builtin/fsck.c:712 +#, c-format +msgid "notice: %s points to an unborn branch (%s)" +msgstr "aviso: %s apunta a un branch no nacido (%s)" + +#: builtin/fsck.c:724 +msgid "Checking cache tree" +msgstr "Revisando el cache tree" + +#: builtin/fsck.c:729 +#, c-format +msgid "%s: invalid sha1 pointer in cache-tree" +msgstr "%s: puntero inválido sha1 en cache-tree" + +#: builtin/fsck.c:738 +msgid "non-tree in cache-tree" +msgstr "non-tree en cache-tree" + +#: builtin/fsck.c:769 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:699 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "mostrar objetos ilegibles" -#: builtin/fsck.c:700 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "mostrar objetos colgados" -#: builtin/fsck.c:701 +#: builtin/fsck.c:777 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:702 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "reportar nodos raíz" -#: builtin/fsck.c:703 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "hacer objetos índices cabezas de nodos" -#: builtin/fsck.c:704 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:705 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "también considerar paquetes y objetos alternos" -#: builtin/fsck.c:706 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:707 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "habilitar revisión más estricta" -#: builtin/fsck.c:709 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgados en .git/lost-found" -#: builtin/fsck.c:710 builtin/prune.c:110 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:711 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:776 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/gc.c:34 +#: builtin/fsck.c:874 +#, c-format +msgid "%s: object missing" +msgstr "%s: objeto faltante" + +#: builtin/fsck.c:885 +#, c-format +msgid "invalid parameter: expected sha1, got '%s'" +msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'" + +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<opciones>]" @@ -11262,17 +14390,22 @@ msgstr "git gc [<opciones>]" msgid "Failed to fstat %s: %s" msgstr "Falló el fstat %s: %s" -#: builtin/gc.c:461 builtin/init-db.c:55 +#: builtin/gc.c:126 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "falló al analizar '%s' valor '%s'" + +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "no se pudo definir '%s'" -#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" -#: builtin/gc.c:477 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -11282,59 +14415,59 @@ msgid "" "%s" msgstr "" "El último gc reportó lo siguiente. Por favor corrige la causa\n" -"y remueva %s.\n" +"y elimine %s.\n" "Limpieza automática no se realizará hasta que el archivo sea eliminado.\n" "\n" "%s" -#: builtin/gc.c:519 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "limpiar objetos no referenciados" -#: builtin/gc.c:521 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "ser más exhaustivo (aumentar runtime)" -#: builtin/gc.c:522 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "habilitar modo auto-gc" -#: builtin/gc.c:525 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose" -#: builtin/gc.c:528 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande" -#: builtin/gc.c:545 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "falló al analizar valor %s de gc.logexpirity" -#: builtin/gc.c:556 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "falló al analizar valor %s de prune expiry" -#: builtin/gc.c:576 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Auto empaquetado del repositorio en segundo plano para un performance " "óptimo.\n" -#: builtin/gc.c:578 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Auto empaquetado del repositorio para performance óptimo.\n" -#: builtin/gc.c:579 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vea \"git help gc\" para limpieza manual.\n" -#: builtin/gc.c:619 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -11342,23 +14475,23 @@ msgstr "" "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " "es así)" -#: builtin/gc.c:670 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para " "eliminarlos." -#: builtin/grep.c:28 +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" -#: builtin/grep.c:224 +#: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: falló al crear el hilo: %s" -#: builtin/grep.c:278 +#: builtin/grep.c:279 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "número inválido de hilos especificado (%d) para %s" @@ -11367,266 +14500,266 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697 -#: builtin/pack-objects.c:2719 +#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 +#: builtin/pack-objects.c:2854 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620 +#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:635 +#: builtin/grep.c:633 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:701 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:800 +#: builtin/grep.c:803 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:802 +#: builtin/grep.c:805 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:804 +#: builtin/grep.c:807 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:806 +#: builtin/grep.c:809 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:808 +#: builtin/grep.c:811 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:811 +#: builtin/grep.c:814 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:813 +#: builtin/grep.c:816 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:815 +#: builtin/grep.c:818 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:817 +#: builtin/grep.c:820 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:819 +#: builtin/grep.c:822 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:822 +#: builtin/grep.c:825 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:824 +#: builtin/grep.c:827 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:826 +#: builtin/grep.c:829 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:830 +#: builtin/grep.c:833 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:833 +#: builtin/grep.c:836 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:836 +#: builtin/grep.c:839 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:839 +#: builtin/grep.c:842 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:842 +#: builtin/grep.c:845 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:843 +#: builtin/grep.c:846 msgid "show column number of first match" msgstr "mostrar el número de columna de la primer coincidencia" -#: builtin/grep.c:844 +#: builtin/grep.c:847 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:845 +#: builtin/grep.c:848 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:847 +#: builtin/grep.c:850 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:849 +#: builtin/grep.c:852 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:851 +#: builtin/grep.c:854 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:854 +#: builtin/grep.c:857 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:856 +#: builtin/grep.c:859 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:859 +#: builtin/grep.c:862 msgid "show only matching parts of a line" msgstr "mostrar solo partes que concuerdan de una línea" -#: builtin/grep.c:861 +#: builtin/grep.c:864 msgid "show the number of matches instead of matching lines" msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:862 +#: builtin/grep.c:865 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:864 +#: builtin/grep.c:867 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:866 +#: builtin/grep.c:869 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:869 +#: builtin/grep.c:872 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:872 +#: builtin/grep.c:875 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:874 +#: builtin/grep.c:877 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:876 +#: builtin/grep.c:879 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:877 +#: builtin/grep.c:880 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:880 +#: builtin/grep.c:883 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:882 +#: builtin/grep.c:885 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:885 +#: builtin/grep.c:888 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:887 +#: builtin/grep.c:890 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:889 +#: builtin/grep.c:892 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:901 +#: builtin/grep.c:904 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:903 +#: builtin/grep.c:906 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:905 +#: builtin/grep.c:908 msgid "show parse tree for grep expression" msgstr "mostrar árbol analizado para la expresión grep" -#: builtin/grep.c:909 +#: builtin/grep.c:912 msgid "pager" msgstr "paginador" -#: builtin/grep.c:909 +#: builtin/grep.c:912 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:913 +#: builtin/grep.c:916 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:977 +#: builtin/grep.c:983 msgid "no pattern given" msgstr "no se ha entregado patrón" -#: builtin/grep.c:1013 +#: builtin/grep.c:1019 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1020 +#: builtin/grep.c:1027 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1051 +#: builtin/grep.c:1057 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked no es soportada con --recurse-submodules" + +#: builtin/grep.c:1061 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1054 builtin/pack-objects.c:3397 +#: builtin/grep.c:1064 builtin/pack-objects.c:3547 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716 +#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1080 +#: builtin/grep.c:1101 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1103 -msgid "option not supported with --recurse-submodules" -msgstr "opción no soportada con --recurse-submodules" - -#: builtin/grep.c:1109 +#: builtin/grep.c:1127 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1115 +#: builtin/grep.c:1133 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1123 +#: builtin/grep.c:1141 msgid "both --cached and trees are given" msgstr "--cached y árboles han sido entregados" -#: builtin/hash-object.c:84 +#: builtin/hash-object.c:85 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -11634,38 +14767,34 @@ msgstr "" "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] " "[--] <archivo>..." -#: builtin/hash-object.c:85 +#: builtin/hash-object.c:86 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:97 -msgid "type" -msgstr "tipo" - -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "object type" msgstr "tipo de objeto" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "write the object into the object database" msgstr "escribir el objeto en la base de datos de objetos" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "read the object from stdin" msgstr "leer el objeto de stdin" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "store file as is without filters" msgstr "guardar el archivo como es sin filtros" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "solo realizar un hash a cualquier basura random para crear un objeto " "corrupto para hacer debugging de Gti" -#: builtin/hash-object.c:104 +#: builtin/hash-object.c:105 msgid "process file as it were from this path" msgstr "procesar el archivo como si fuera de esta ruta" @@ -11705,30 +14834,30 @@ msgstr "imprimir descripción del comando" msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" -#: builtin/help.c:73 +#: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" msgstr "formato help no reconocido '%s'" -#: builtin/help.c:100 +#: builtin/help.c:104 msgid "Failed to start emacsclient." msgstr "Falló al iniciar emacsclient." -#: builtin/help.c:113 +#: builtin/help.c:117 msgid "Failed to parse emacsclient version." msgstr "Falló al analizar la versión de emacsclient." -#: builtin/help.c:121 +#: builtin/help.c:125 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versión '%d' de emacsclient es muy antigua (<22)." -#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 +#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 #, c-format msgid "failed to exec '%s'" msgstr "falló al ejecutar '%s'" -#: builtin/help.c:217 +#: builtin/help.c:221 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -11737,7 +14866,7 @@ msgstr "" "'%s': ruta para el visualizador del manual no soportada.\n" "Por favor considere usar 'man.<herramienta.cmd'." -#: builtin/help.c:229 +#: builtin/help.c:233 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -11746,327 +14875,317 @@ msgstr "" "'%s': comando no soportado para man viewer.\n" "Por favor considere usar 'man.<herramienta>.path." -#: builtin/help.c:346 +#: builtin/help.c:350 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualizador de man desconocido." -#: builtin/help.c:363 +#: builtin/help.c:367 msgid "no man viewer handled the request" msgstr "ningún visualizador de manual proceso la petición" -#: builtin/help.c:371 +#: builtin/help.c:375 msgid "no info viewer handled the request" msgstr "ningún visor de info manejo la petición" -#: builtin/help.c:430 builtin/help.c:441 git.c:322 +#: builtin/help.c:434 builtin/help.c:445 git.c:336 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' tiene el alias '%s'" -#: builtin/help.c:444 +#: builtin/help.c:448 git.c:365 #, c-format msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" -#: builtin/help.c:473 builtin/help.c:503 +#: builtin/help.c:477 builtin/help.c:507 #, c-format msgid "usage: %s%s" msgstr "uso: %s%s" -#: builtin/help.c:487 +#: builtin/help.c:491 msgid "'git help config' for more information" msgstr "'git help config' para más información" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:185 #, c-format msgid "object type mismatch at %s" msgstr "el tipo del objeto no concuerda en %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:205 #, c-format msgid "did not receive expected object %s" msgstr "no se recibió el objeto esperado %s" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, encontrado %s" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:258 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no se puede llenar %d byte" msgstr[1] "no se pueden llenar %d bytes" -#: builtin/index-pack.c:259 +#: builtin/index-pack.c:268 msgid "early EOF" msgstr "EOF temprano" -#: builtin/index-pack.c:260 +#: builtin/index-pack.c:269 msgid "read error on input" msgstr "leer error en input" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:281 msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:279 builtin/pack-objects.c:598 +#: builtin/index-pack.c:288 builtin/pack-objects.c:606 msgid "pack too large for current definition of off_t" msgstr "paquete muy grande para la definición actual de off_t" -#: builtin/index-pack.c:282 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" -#: builtin/index-pack.c:297 -#, c-format -msgid "unable to create '%s'" -msgstr "no se puede crear '%s'" - -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" msgstr "no se puede abrir el archivo de paquete '%s'" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:326 msgid "pack signature mismatch" msgstr "firma del paquete no concuerda" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:328 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versión de paquete %<PRIu32> no soportada" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:346 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:457 +#: builtin/index-pack.c:466 #, c-format msgid "inflate returned %d" msgstr "inflate devolvió %d" -#: builtin/index-pack.c:506 +#: builtin/index-pack.c:515 msgid "offset value overflow for delta base object" msgstr "valor de offset desbordado para el objeto base delta" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:523 msgid "delta base offset is out of bound" msgstr "offset de base delta está fuera de límites" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:531 #, c-format msgid "unknown object type %d" msgstr "tipo de objeto %d desconocido" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:562 msgid "cannot pread pack file" msgstr "no se puede propagar el paquete" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:564 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" -#: builtin/index-pack.c:581 +#: builtin/index-pack.c:590 msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 -#: builtin/index-pack.c:794 builtin/index-pack.c:803 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" +msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:729 builtin/pack-objects.c:151 -#: builtin/pack-objects.c:211 builtin/pack-objects.c:305 +#: builtin/index-pack.c:738 builtin/pack-objects.c:158 +#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:792 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:817 builtin/index-pack.c:836 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:833 -#, c-format -msgid "invalid %s" -msgstr "%s inválido" - -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:910 builtin/index-pack.c:941 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1143 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusión más allá de la locura en parse_pack_objects()" -#: builtin/index-pack.c:1186 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1237 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1243 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completado con %d objeto local" msgstr[1] "completado con %d objetos locales" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "Tail checksum para %s inesperada (corrupción de disco?)" +msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)" -#: builtin/index-pack.c:1259 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paquete tiene %d delta sin resolver" msgstr[1] "paquete tiene %d deltas sin resolver" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1360 +#: builtin/index-pack.c:1392 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1406 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1431 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1439 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1463 msgid "error while closing pack file" msgstr "error mientras se cierra el archivo paquete" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1477 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1485 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727 +#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1565 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1567 +#: builtin/index-pack.c:1599 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No se puede abrir el índice del archivo paquete para '%s'" -#: builtin/index-pack.c:1615 +#: builtin/index-pack.c:1647 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1654 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1659 +#: builtin/index-pack.c:1693 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 -#: builtin/index-pack.c:1727 builtin/index-pack.c:1731 +#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 +#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1781 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1783 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1789 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" @@ -12110,42 +15229,42 @@ msgstr "template no encontrado en %s" msgid "not copying templates from '%s': %s" msgstr "no se copian templates de '%s': %s" -#: builtin/init-db.c:329 +#: builtin/init-db.c:334 #, c-format msgid "unable to handle file type %d" msgstr "no es posible manejar el tipo de archivo %d" -#: builtin/init-db.c:332 +#: builtin/init-db.c:337 #, c-format msgid "unable to move %s to %s" msgstr "no se puede mover %s a %s" -#: builtin/init-db.c:349 builtin/init-db.c:352 +#: builtin/init-db.c:354 builtin/init-db.c:357 #, c-format msgid "%s already exists" msgstr "%s ya existe" -#: builtin/init-db.c:405 +#: builtin/init-db.c:413 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n" -#: builtin/init-db.c:406 +#: builtin/init-db.c:414 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git existente en %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:418 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Inicializado repositorio Git compartido vacío en %s%s\n" -#: builtin/init-db.c:411 +#: builtin/init-db.c:419 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Inicializado repositorio Git vacío en %s%s\n" -#: builtin/init-db.c:460 +#: builtin/init-db.c:468 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -12153,26 +15272,26 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--" "shared[=<permisos>]] [<directorio>]" -#: builtin/init-db.c:483 +#: builtin/init-db.c:491 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:484 +#: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especifica que el repositorio de git será compartido entre varios usuarios" -#: builtin/init-db.c:518 builtin/init-db.c:523 +#: builtin/init-db.c:529 builtin/init-db.c:534 #, c-format msgid "cannot mkdir %s" msgstr "no se pude crear directorio %s" -#: builtin/init-db.c:527 +#: builtin/init-db.c:538 #, c-format msgid "cannot chdir to %s" msgstr "no se puede aplicar chdir a %s" -#: builtin/init-db.c:548 +#: builtin/init-db.c:559 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -12181,12 +15300,12 @@ msgstr "" "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" "dir=<directorio>)" -#: builtin/init-db.c:576 +#: builtin/init-db.c:587 #, c-format msgid "Cannot access work tree '%s'" msgstr "No se puede acceder al árbol de trabajo '%s'" -#: builtin/interpret-trailers.c:15 +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" @@ -12194,461 +15313,468 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<valor>])...] [<archivo>...]" -#: builtin/interpret-trailers.c:94 +#: builtin/interpret-trailers.c:95 msgid "edit files in place" msgstr "editar archivos en el lugar" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:96 msgid "trim empty trailers" msgstr "cortar trailers vacíos" -#: builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" msgstr "donde colocar el nuevo trailer" -#: builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" msgstr "acción if trailer ya existe" -#: builtin/interpret-trailers.c:102 +#: builtin/interpret-trailers.c:103 msgid "action if trailer is missing" msgstr "acción si falta el trailer" -#: builtin/interpret-trailers.c:104 +#: builtin/interpret-trailers.c:105 msgid "output only the trailers" msgstr "mostrar solo los trailers" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:106 msgid "do not apply config rules" msgstr "no aplicar reglas de configuración" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c:107 msgid "join whitespace-continued values" msgstr "juntar valores con espacios en blanco contiguos" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:108 msgid "set parsing options" msgstr "configurar opciones de análisis" -#: builtin/interpret-trailers.c:109 +#: builtin/interpret-trailers.c:110 msgid "do not treat --- specially" msgstr "no tratar --- especialmente" -#: builtin/interpret-trailers.c:110 +#: builtin/interpret-trailers.c:111 msgid "trailer" msgstr "trailer" -#: builtin/interpret-trailers.c:111 +#: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "trailer(s) para agregar" -#: builtin/interpret-trailers.c:120 +#: builtin/interpret-trailers.c:123 msgid "--trailer with --only-input does not make sense" msgstr "--trailer con --only-input no tiene sentido" -#: builtin/interpret-trailers.c:130 +#: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "no se entregó archivo de entrada para edición en lugar" -#: builtin/log.c:54 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" -#: builtin/log.c:55 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:99 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:162 -msgid "suppress diff output" -msgstr "suprimir salida de diff" - -#: builtin/log.c:163 +#: builtin/log.c:174 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:164 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "Usar archivo de mapa de mail" -#: builtin/log.c:166 +#: builtin/log.c:177 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrón>" -#: builtin/log.c:168 +#: builtin/log.c:179 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patrón>" -#: builtin/log.c:169 +#: builtin/log.c:180 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:172 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" -#: builtin/log.c:270 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:522 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:537 builtin/log.c:631 +#: builtin/log.c:550 builtin/log.c:645 +#, c-format +msgid "could not read object %s" +msgstr "no se pudo leer objeto %s" + +#: builtin/log.c:670 #, c-format -msgid "Could not read object %s" -msgstr "No se pudo leer objeto %s" +msgid "unknown type: %d" +msgstr "tipo desconocido: %d" -#: builtin/log.c:655 +#: builtin/log.c:814 #, c-format -msgid "Unknown type: %d" -msgstr "Tipo desconocido: %d" +msgid "%s: invalid cover from description mode" +msgstr "%s: modo cover from description inválido" -#: builtin/log.c:776 +#: builtin/log.c:821 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:877 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:893 +#: builtin/log.c:952 #, c-format -msgid "Cannot open patch file %s" -msgstr "No se puede abrir archivo patch %s" +msgid "cannot open patch file %s" +msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:910 -msgid "Need exactly one range." -msgstr "Exactamente un rango necesario." +#: builtin/log.c:969 +msgid "need exactly one range" +msgstr "necesita exactamente un rango" -#: builtin/log.c:920 -msgid "Not a range." -msgstr "No es un rango." +#: builtin/log.c:979 +msgid "not a range" +msgstr "no es un rango" -#: builtin/log.c:1043 -msgid "Cover letter needs email format" -msgstr "Letras de portada necesita formato email" +#: builtin/log.c:1143 +msgid "cover letter needs email format" +msgstr "letras de portada necesita formato email" -#: builtin/log.c:1119 +#: builtin/log.c:1149 +msgid "failed to create cover-letter file" +msgstr "falló al crear los archivos cover-letter" + +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1146 +#: builtin/log.c:1255 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1204 -msgid "Two output directories?" -msgstr "Dos directorios de salida?" +#: builtin/log.c:1313 +msgid "two output directories?" +msgstr "¿dos directorios de salida?" -#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format -msgid "Unknown commit %s" -msgstr "Commit desconocido %s" +msgid "unknown commit %s" +msgstr "commit desconocido %s" -#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Falló al resolver '%s' como una ref válida." +msgid "failed to resolve '%s' as a valid ref" +msgstr "falló al resolver '%s' como ref válida" -#: builtin/log.c:1326 -msgid "Could not find exact merge base." -msgstr "No se pudo encontrar una base de fusión." +#: builtin/log.c:1439 +msgid "could not find exact merge base" +msgstr "no se pudo encontrar una base de fusión exacta" -#: builtin/log.c:1330 +#: builtin/log.c:1443 msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" -"Or you could specify base commit by --base=<base-commit-id> manually." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -"Falló al conseguir upstream, si quiere grabar un commit base de manera " +"falló al conseguir upstream, si quieres grabar un commit base de manera " "automática,\n" -"por favor use git branch --set-upstream-to para rastrear una rama remota.\n" -"O puede especificar un commit base mediante --base=<id-commit-base> " -"manualmente." +"por favor usa git branch --set-upstream-to para rastrear una rama remota.\n" +"O puedes especificar un commit base mediante --base=<id-commit-base> " +"manualmente" -#: builtin/log.c:1350 -msgid "Failed to find exact merge base" -msgstr "Falló al encontrar una base de fusión exacta" +#: builtin/log.c:1463 +msgid "failed to find exact merge base" +msgstr "falló al encontrar una base de fusión exacta" -#: builtin/log.c:1361 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisión" -#: builtin/log.c:1365 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisión" -#: builtin/log.c:1418 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1470 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "falló al inferir rangos range-diff" -#: builtin/log.c:1515 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1518 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1522 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1524 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1526 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "" "usar una secuencia simple de números para salida de nombres de archivos" -#: builtin/log.c:1527 +#: builtin/log.c:1641 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1528 +#: builtin/log.c:1642 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1530 +#: builtin/log.c:1644 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1532 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1534 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1537 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "modo-cover-from-description" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" +"genera partes de una carta de presentación basado en la descripción de la " +"rama" + +#: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1540 +#: builtin/log.c:1657 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1543 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1546 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1548 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1550 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1552 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1554 +#: builtin/log.c:1671 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1555 +#: builtin/log.c:1672 msgid "header" msgstr "cabezal" -#: builtin/log.c:1556 +#: builtin/log.c:1673 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1557 builtin/log.c:1559 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "email" -#: builtin/log.c:1557 +#: builtin/log.c:1674 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1559 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1561 +#: builtin/log.c:1678 msgid "ident" msgstr "ident" -#: builtin/log.c:1562 +#: builtin/log.c:1679 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "configurar dirección From a <ident> ( o identidad de committer si está " "ausente)" -#: builtin/log.c:1564 +#: builtin/log.c:1681 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1565 +#: builtin/log.c:1682 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1566 builtin/log.c:1569 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "límite" -#: builtin/log.c:1567 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1570 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1574 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1576 +#: builtin/log.c:1693 msgid "signature" msgstr "firma" -#: builtin/log.c:1577 +#: builtin/log.c:1694 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1578 +#: builtin/log.c:1695 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1579 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1581 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1582 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1584 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1585 -msgid "rev" -msgstr "rev" - -#: builtin/log.c:1586 +#: builtin/log.c:1703 msgid "show changes against <rev> in cover letter or single patch" msgstr "muestra cambios contra <rev> en cover letter o en un solo parche" -#: builtin/log.c:1589 +#: builtin/log.c:1706 msgid "show changes against <refspec> in cover letter or single patch" msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche" -#: builtin/log.c:1591 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creación es pesada" -#: builtin/log.c:1666 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1681 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1683 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1691 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1693 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1695 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1727 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" -msgstr "salida standard, o directorio, cual?" - -#: builtin/log.c:1729 -#, c-format -msgid "Could not create directory '%s'" -msgstr "No se pudo crear el directorio '%s'" +msgstr "¿salida standard, o directorio, cual?" -#: builtin/log.c:1816 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche único" -#: builtin/log.c:1820 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1821 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:1827 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:1831 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche único" -#: builtin/log.c:1839 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1840 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:1851 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:1887 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:1931 -msgid "Failed to create output files" -msgstr "Falló al crear los archivos de salida" +#: builtin/log.c:2073 +msgid "failed to create output files" +msgstr "falló al crear los archivos de salida" -#: builtin/log.c:1989 +#: builtin/log.c:2132 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:2043 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -12656,111 +15782,111 @@ msgstr "" "No se pudo encontrar una rama remota rastreada, por favor especifique " "<upstream> manualmente.\n" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:470 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:526 msgid "identify the file status with tags" msgstr "identifique el estado del archivo con tags" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:528 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:530 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:532 msgid "show cached files in the output (default)" msgstr "mostrar archivos en caché en la salida (default)" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:534 msgid "show deleted files in the output" msgstr "mostrar archivos borrados en la salida" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:536 msgid "show modified files in the output" msgstr "mostrar archivos modificados en la salida" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:538 msgid "show other files in the output" msgstr "mostrar otros archivos en la salida" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:540 msgid "show ignored files in the output" msgstr "mostrar archivos ignorados en la salida" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:543 msgid "show staged contents' object name in the output" msgstr "" "mostrar contenido de nombres de objetos en el área de stage en la salida" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:545 msgid "show files on the filesystem that need to be removed" msgstr "mostrar archivos en el filesystem que necesitan ser borrados" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:547 msgid "show 'other' directories' names only" msgstr "mostrar solo nombres de 'directorios otros'" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:549 msgid "show line endings of files" msgstr "mostrar finales de línea de archivos" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:551 msgid "don't show empty directories" msgstr "no mostrar directorios vacíos" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:554 msgid "show unmerged files in the output" msgstr "mostrar archivos no fusionados en la salida" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:556 msgid "show resolve-undo information" msgstr "mostrar información resolver-deshacer" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:558 msgid "skip files matching pattern" msgstr "saltar archivos que concuerden con el patrón" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:561 msgid "exclude patterns are read from <file>" msgstr "excluir patrones leídos de <archivo>" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "leer patrones de exclusión de manera adicional por directorio en <archivo>" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:566 msgid "add the standard git exclusions" msgstr "agregar las exclusiones standard de git" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:570 msgid "make the output relative to the project top directory" msgstr "hacer la salida relativa al directorio principal del proyecto" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:573 msgid "recurse through submodules" msgstr "recurrir a través de submódulos" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:575 msgid "if any <file> is not in the index, treat this as an error" msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "tree-ish" msgstr "árbol-ismo" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> " "presentes" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:579 msgid "show debugging data" msgstr "mostrar data de debug" @@ -12778,7 +15904,7 @@ msgstr "" msgid "do not print remote URL" msgstr "no mostrar el URL remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 msgid "exec" msgstr "ejecutar" @@ -12802,11 +15928,11 @@ msgstr "no mostrar tags pelados" msgid "take url.<base>.insteadOf into account" msgstr "tomar url.<base>.insteadOf en cuenta" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "salir con código de salida 2 si no se encuentran refs que concuerden" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostrar ref subyacente en adición al objeto apuntado por él" @@ -12852,366 +15978,391 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vacío: '%s'" -#: builtin/merge.c:52 +#: builtin/merge.c:55 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:53 +#: builtin/merge.c:56 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:54 +#: builtin/merge.c:57 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:111 +#: builtin/merge.c:119 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:177 +#: builtin/merge.c:142 +#, c-format +msgid "option `%s' requires a value" +msgstr "opción `%s' requiere un valor" + +#: builtin/merge.c:188 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:178 +#: builtin/merge.c:189 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:183 +#: builtin/merge.c:194 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:234 builtin/pull.c:143 +#: builtin/merge.c:245 builtin/pull.c:132 msgid "do not show a diffstat at the end of the merge" msgstr "no mostrar un diffstat al final de la fusión" -#: builtin/merge.c:237 builtin/pull.c:146 +#: builtin/merge.c:248 builtin/pull.c:135 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:238 builtin/pull.c:149 +#: builtin/merge.c:249 builtin/pull.c:138 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:240 builtin/pull.c:152 +#: builtin/merge.c:251 builtin/pull.c:141 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " "fusión" -#: builtin/merge.c:243 builtin/pull.c:158 +#: builtin/merge.c:254 builtin/pull.c:147 msgid "create a single commit instead of doing a merge" msgstr "crear un commit único en lugar de hacer una fusión" -#: builtin/merge.c:245 builtin/pull.c:161 +#: builtin/merge.c:256 builtin/pull.c:150 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:247 builtin/pull.c:164 +#: builtin/merge.c:258 builtin/pull.c:153 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:248 +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:250 builtin/pull.c:170 +#: builtin/merge.c:262 builtin/pull.c:160 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:254 builtin/pull.c:173 +#: builtin/merge.c:266 builtin/pull.c:163 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tiene una firma GPG válida" -#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177 -#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110 +#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 +#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:256 builtin/pull.c:178 +#: builtin/merge.c:268 builtin/pull.c:168 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:257 builtin/pull.c:181 +#: builtin/merge.c:269 builtin/pull.c:171 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:258 builtin/pull.c:182 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:260 +#: builtin/merge.c:272 msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#: builtin/merge.c:267 +#: builtin/merge.c:279 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:269 +#: builtin/merge.c:281 +msgid "--abort but leave index and working tree alone" +msgstr "--abort pero deja el índice y el árbol de trabajo solos" + +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:271 builtin/pull.c:189 +#: builtin/merge.c:285 builtin/pull.c:179 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:277 -msgid "verify commit-msg hook" -msgstr "verificar el hook commit-msg" +#: builtin/merge.c:291 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" -#: builtin/merge.c:302 +#: builtin/merge.c:308 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:307 +#: builtin/merge.c:313 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:312 +#: builtin/merge.c:318 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:334 builtin/merge.c:351 +#: builtin/merge.c:340 builtin/merge.c:357 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:381 +#: builtin/merge.c:387 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:392 +#: builtin/merge.c:398 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:442 +#: builtin/merge.c:448 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:493 +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:580 +#: builtin/merge.c:586 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:701 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:715 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:730 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:782 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:791 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No se realiza commit de la fusión; use 'git commit' para completar la " "fusión.\n" -#: builtin/merge.c:797 -#, c-format +#: builtin/merge.c:804 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" msgstr "" "Por favor ingrese un mensaje de commit que explique por qué es necesaria " "esta fusión,\n" "especialmente si esto fusiona un upstream actualizado en una rama de " "tópico.\n" "\n" + +#: builtin/merge.c:809 +msgid "An empty message aborts the commit.\n" +msgstr "Un mensaje vacío aborta el commit.\n" + +#: builtin/merge.c:812 +#, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" -"el commit.\n" +" el commit.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:865 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:852 +#: builtin/merge.c:880 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:905 +#: builtin/merge.c:941 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:944 +#: builtin/merge.c:980 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:946 +#: builtin/merge.c:982 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:948 +#: builtin/merge.c:984 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:953 +#: builtin/merge.c:989 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remoto para %s de %s" -#: builtin/merge.c:1010 +#: builtin/merge.c:1046 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1113 +#: builtin/merge.c:1149 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1147 +#: builtin/merge.c:1183 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1250 +#: builtin/merge.c:1286 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1254 +#: builtin/merge.c:1290 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1266 +#: builtin/merge.c:1299 +msgid "--quit expects no arguments" +msgstr "--quit no espera argumentos" + +#: builtin/merge.c:1312 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1270 +#: builtin/merge.c:1316 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1286 +#: builtin/merge.c:1332 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"No ha concluido la fusión (existe MERGE_HEAD).\n" -"Por favor, realice un commit con los cambios antes de fusionar." +"No has concluido la fusión (existe MERGE_HEAD).\n" +"Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1293 +#: builtin/merge.c:1339 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" -"Por favor, realice un commit con los cambios antes de fusionar." +"No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" +"Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1296 +#: builtin/merge.c:1342 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)." +msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1305 +#: builtin/merge.c:1356 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1313 +#: builtin/merge.c:1358 +msgid "You cannot combine --squash with --commit." +msgstr "No se puede combinar --squash con --commit." + +#: builtin/merge.c:1374 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1330 +#: builtin/merge.c:1391 msgid "Squash commit into empty head not supported yet" msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" -#: builtin/merge.c:1332 +#: builtin/merge.c:1393 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1337 +#: builtin/merge.c:1398 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1339 +#: builtin/merge.c:1400 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1421 +#: builtin/merge.c:1481 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1430 +#: builtin/merge.c:1490 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1440 +#: builtin/merge.c:1500 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1482 +#: builtin/merge.c:1542 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1549 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1514 +#: builtin/merge.c:1574 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1520 +#: builtin/merge.c:1580 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1543 builtin/merge.c:1622 +#: builtin/merge.c:1603 builtin/merge.c:1668 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1547 +#: builtin/merge.c:1607 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1613 +#: builtin/merge.c:1659 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1615 +#: builtin/merge.c:1661 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1624 +#: builtin/merge.c:1670 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usando el %s para preparar resolución a mano.\n" -#: builtin/merge.c:1636 +#: builtin/merge.c:1682 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -13251,7 +16402,7 @@ msgstr "listar revs no alcanzables desde otros" #: builtin/merge-base.c:159 msgid "is the first one ancestor of the other?" -msgstr "es el primer ancestro del otro?" +msgstr "¿es el primer ancestro del otro?" #: builtin/merge-base.c:161 msgid "find where <commit> forked from reflog of <ref>" @@ -13297,33 +16448,33 @@ msgstr "no advertir sobre conflictos" msgid "set labels for file1/orig-file/file2" msgstr "configurar labels para archivo1/orig-archivo/archivo2" -#: builtin/merge-recursive.c:45 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "opción %s desconocida" -#: builtin/merge-recursive.c:51 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "no se pudo analizar el objeto '%s'" -#: builtin/merge-recursive.c:55 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "no se puede manejar más de %d base. Ignorando %s." msgstr[1] "no se puede manejar más de %d bases. Ignorando %s." -#: builtin/merge-recursive.c:63 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "no manejando nada distinto a fusiones de dos heads." -#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "no se pudo resolver ref '%s'" -#: builtin/merge-recursive.c:77 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "Fusionando %s con %s\n" @@ -13336,7 +16487,7 @@ msgstr "git mktree [-z] [--missing] [--batch]" msgid "input is NUL terminated" msgstr "input es terminada con NUL" -#: builtin/mktree.c:155 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:26 msgid "allow missing objects" msgstr "permitir objetos faltantes" @@ -13344,158 +16495,174 @@ msgstr "permitir objetos faltantes" msgid "allow creation of more than one tree" msgstr "permitir la creación de más de un árbol" -#: builtin/multi-pack-index.c:8 -msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" -msgstr "git multi-pack-index [--object-dir=<dir>] (write|verify)" +#: builtin/multi-pack-index.c:9 +msgid "" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" +msgstr "" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<tamaño>)" -#: builtin/multi-pack-index.c:21 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index" -#: builtin/multi-pack-index.c:39 +#: builtin/multi-pack-index.c:29 +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "" +"durante el repack, recolectar los pack-files de tamaño menor en un batch que " +"es más grande que este tamaño" + +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "muchos argumentos" -#: builtin/multi-pack-index.c:48 +#: builtin/multi-pack-index.c:60 +msgid "--batch-size option is only for 'repack' subcommand" +msgstr "opción --batch-size es solo para el subcomando 'repack'" + +#: builtin/multi-pack-index.c:69 #, c-format -msgid "unrecognized verb: %s" -msgstr "verbo no reconocido: %s" +msgid "unrecognized subcommand: %s" +msgstr "subcomando desconocido: %s" -#: builtin/mv.c:17 +#: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<opciones>] <fuente>... <destino>" -#: builtin/mv.c:82 +#: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" -msgstr "Directorio %s está en el índice y no hay submódulo?" +msgstr "¿Directorio %s está en el índice y no hay submódulo?" -#: builtin/mv.c:84 +#: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " "para proceder" -#: builtin/mv.c:102 +#: builtin/mv.c:103 #, c-format msgid "%.*s is in index" msgstr "%.*s está en el índice" -#: builtin/mv.c:124 +#: builtin/mv.c:125 msgid "force move/rename even if target exists" msgstr "forzar mover/renombrar incluso si el objetivo existe" -#: builtin/mv.c:126 +#: builtin/mv.c:127 msgid "skip move/rename errors" msgstr "saltar errores de mover/renombrar" -#: builtin/mv.c:168 +#: builtin/mv.c:169 #, c-format msgid "destination '%s' is not a directory" msgstr "destino '%s' no es un directorio" -#: builtin/mv.c:179 +#: builtin/mv.c:180 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Revisando cambio de nombre de '%s' a '%s'\n" -#: builtin/mv.c:183 +#: builtin/mv.c:184 msgid "bad source" msgstr "mala fuente" -#: builtin/mv.c:186 +#: builtin/mv.c:187 msgid "can not move directory into itself" msgstr "no se pude mover un directorio en sí mismo" -#: builtin/mv.c:189 +#: builtin/mv.c:190 msgid "cannot move directory over file" msgstr "no se puede mover un directorio dentro de un archivo" -#: builtin/mv.c:198 +#: builtin/mv.c:199 msgid "source directory is empty" msgstr "directorio de fuente está vacío" -#: builtin/mv.c:223 +#: builtin/mv.c:224 msgid "not under version control" msgstr "no se encuentra bajo control de versión" -#: builtin/mv.c:226 +#: builtin/mv.c:227 msgid "destination exists" msgstr "destino existe" -#: builtin/mv.c:234 +#: builtin/mv.c:235 #, c-format msgid "overwriting '%s'" msgstr "sobrescribiendo '%s'" -#: builtin/mv.c:237 +#: builtin/mv.c:238 msgid "Cannot overwrite" msgstr "No se puede sobrescribir" -#: builtin/mv.c:240 +#: builtin/mv.c:241 msgid "multiple sources for the same target" msgstr "múltiples fuentes para el mismo objetivo" -#: builtin/mv.c:242 +#: builtin/mv.c:243 msgid "destination directory does not exist" msgstr "el directorio de destino no existe" -#: builtin/mv.c:249 +#: builtin/mv.c:250 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, fuente=%s, destino=%s" -#: builtin/mv.c:270 +#: builtin/mv.c:271 #, c-format msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' falló" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opciones>] <commit>..." -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opciones>] --all" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" -#: builtin/name-rev.c:413 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "imprimir sólo nombres (sin SHA-1)" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "sólo usar tags para nombrar commits" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "solo usar refs que concuerden con <patrón>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignorar refs que concuerden con <patrón>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "listar todos los commits alcanzables desde todas las referencias" -#: builtin/name-rev.c:421 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "leer desde stdin" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nombres `undefined` (predeterminado)" -#: builtin/name-rev.c:428 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags en la entrada (uso interno)" @@ -13644,14 +16811,14 @@ msgstr "incapaz de escribir el objeto de nota" msgid "the note contents have been left in %s" msgstr "los contenidos de nota han sido dejados en %s" -#: builtin/notes.c:242 builtin/tag.c:513 +#: builtin/notes.c:242 builtin/tag.c:532 #, c-format msgid "could not open or read '%s'" msgstr "no se pudo abrir o leer '%s'" #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524 -#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669 +#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 +#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "falló al resolver '%s' como ref válida." @@ -13684,38 +16851,38 @@ msgstr "falló al copiar notas de '%s' a '%s'" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "rechazando %s notas en %s (fuera de refs/notes/)" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507 -#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662 -#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 msgid "too many parameters" msgstr "demasiados parámetros" -#: builtin/notes.c:389 builtin/notes.c:675 +#: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." msgstr "no se encontraron notas para objeto %s." -#: builtin/notes.c:410 builtin/notes.c:573 +#: builtin/notes.c:410 builtin/notes.c:576 msgid "note contents as a string" msgstr "contenidos de la nota como cadena" -#: builtin/notes.c:413 builtin/notes.c:576 +#: builtin/notes.c:413 builtin/notes.c:579 msgid "note contents in a file" msgstr "contenidos de la nota en un archivo" -#: builtin/notes.c:416 builtin/notes.c:579 +#: builtin/notes.c:416 builtin/notes.c:582 msgid "reuse and edit specified note object" msgstr "reutilizar y editar el objeto de nota especificada" -#: builtin/notes.c:419 builtin/notes.c:582 +#: builtin/notes.c:419 builtin/notes.c:585 msgid "reuse specified note object" msgstr "reutilizar el objeto de nota especificado" -#: builtin/notes.c:422 builtin/notes.c:585 +#: builtin/notes.c:422 builtin/notes.c:588 msgid "allow storing empty note" msgstr "permitir almacenar nota vacía" -#: builtin/notes.c:423 builtin/notes.c:494 +#: builtin/notes.c:423 builtin/notes.c:496 msgid "replace existing notes" msgstr "reemplazar notas existentes" @@ -13728,29 +16895,29 @@ msgstr "" "No se puede agregar notas. Se encontró notas existentes para objeto %s. Use " "'-f' para sobrescribir las notas existentes" -#: builtin/notes.c:463 builtin/notes.c:542 +#: builtin/notes.c:463 builtin/notes.c:544 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Sobrescribiendo notas existentes para objeto %s\n" -#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899 +#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 #, c-format msgid "Removing note for object %s\n" msgstr "Removiendo nota para objeto %s\n" -#: builtin/notes.c:495 +#: builtin/notes.c:497 msgid "read objects from stdin" msgstr "leer objetos desde stdin" -#: builtin/notes.c:497 +#: builtin/notes.c:499 msgid "load rewriting config for <command> (implies --stdin)" msgstr "cargar configuración de reescritura para <comando> (implica --stdin)" -#: builtin/notes.c:515 +#: builtin/notes.c:517 msgid "too few parameters" msgstr "muy pocos parámetros" -#: builtin/notes.c:536 +#: builtin/notes.c:538 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -13759,12 +16926,12 @@ msgstr "" "No se puede copiar notas. Se encontró notas existentes para el objeto %s. " "Use '-f' para sobrescribir las notes existentes" -#: builtin/notes.c:548 +#: builtin/notes.c:550 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "faltan notas en la fuente del objeto %s. No se puede copiar." -#: builtin/notes.c:600 +#: builtin/notes.c:603 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -13773,52 +16940,52 @@ msgstr "" "Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n" "Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n" -#: builtin/notes.c:695 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "falló al borrar ref NOTES_MERGE_PARTIAL" -#: builtin/notes.c:697 +#: builtin/notes.c:700 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "falló al borrar ref NOTES_MERGE_REF" -#: builtin/notes.c:699 +#: builtin/notes.c:702 msgid "failed to remove 'git notes merge' worktree" msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'" -#: builtin/notes.c:719 +#: builtin/notes.c:722 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "falló al leer ref NOTES_MERGE_PARTIAL" -#: builtin/notes.c:721 +#: builtin/notes.c:724 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:723 +#: builtin/notes.c:726 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:736 +#: builtin/notes.c:739 msgid "failed to resolve NOTES_MERGE_REF" msgstr "falló al resolver NOTES_MERGE_REF" -#: builtin/notes.c:739 +#: builtin/notes.c:742 msgid "failed to finalize notes merge" msgstr "falló al finalizar las notas de fusión" -#: builtin/notes.c:765 +#: builtin/notes.c:768 #, c-format msgid "unknown notes merge strategy %s" msgstr "estrategia de fusión de notas %s desconocida" -#: builtin/notes.c:781 +#: builtin/notes.c:784 msgid "General options" msgstr "Opciones generales" -#: builtin/notes.c:783 +#: builtin/notes.c:786 msgid "Merge options" msgstr "Opciones de fusión" -#: builtin/notes.c:785 +#: builtin/notes.c:788 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -13826,47 +16993,47 @@ msgstr "" "resolver conflictos de notas usando la estrategia entregadas (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:787 +#: builtin/notes.c:790 msgid "Committing unmerged notes" msgstr "Realizando commit a las notas no fusionadas" -#: builtin/notes.c:789 +#: builtin/notes.c:792 msgid "finalize notes merge by committing unmerged notes" msgstr "" "finalizar fusión de notas realizando un commit de las notas no fusionadas" -#: builtin/notes.c:791 +#: builtin/notes.c:794 msgid "Aborting notes merge resolution" msgstr "Abortando notas de resolución de fusión" -#: builtin/notes.c:793 +#: builtin/notes.c:796 msgid "abort notes merge" msgstr "abortar notas de fusión" -#: builtin/notes.c:804 +#: builtin/notes.c:807 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy" -#: builtin/notes.c:809 +#: builtin/notes.c:812 msgid "must specify a notes ref to merge" msgstr "debe especificar una ref de notas a fusionar" -#: builtin/notes.c:833 +#: builtin/notes.c:836 #, c-format msgid "unknown -s/--strategy: %s" msgstr "--strategy/-s desconocida: %s" -#: builtin/notes.c:870 +#: builtin/notes.c:873 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "una fusión de notas en %s ya está en progreso en %s" -#: builtin/notes.c:873 +#: builtin/notes.c:876 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "falló al guardar un link para el ref de notas actual (%s)" -#: builtin/notes.c:875 +#: builtin/notes.c:878 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -13877,177 +17044,159 @@ msgstr "" "commit con el resultado 'git notes merge --commit', o aborte la fusión con " "'git notes merge --abort'.\n" -#: builtin/notes.c:897 +#: builtin/notes.c:897 builtin/tag.c:545 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Falló al resolver '%s' como una ref válida." + +#: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" msgstr "El objeto %s no tiene notas\n" -#: builtin/notes.c:909 +#: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" msgstr "intentar eliminar una nota no existente no es un error" -#: builtin/notes.c:912 +#: builtin/notes.c:915 msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "no eliminar, solo mostrar" -#: builtin/notes.c:951 +#: builtin/notes.c:955 msgid "report pruned notes" msgstr "reportar notas recortadas" -#: builtin/notes.c:993 +#: builtin/notes.c:998 msgid "notes-ref" msgstr "referencia-de-notas" -#: builtin/notes.c:994 +#: builtin/notes.c:999 msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1029 +#: builtin/notes.c:1034 builtin/stash.c:1643 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" -#: builtin/pack-objects.c:51 +#: builtin/pack-objects.c:52 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" "objetos>]" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:422 +#: builtin/pack-objects.c:430 #, c-format msgid "bad packed object CRC for %s" msgstr "mal paquete de objeto CRC para %s" -#: builtin/pack-objects.c:433 +#: builtin/pack-objects.c:441 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:564 +#: builtin/pack-objects.c:572 #, c-format msgid "recursive delta detected for object %s" msgstr "delta recursivo encontrado para objeto %s" -#: builtin/pack-objects.c:775 +#: builtin/pack-objects.c:783 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: builtin/pack-objects.c:788 -#, c-format -msgid "packfile is invalid: %s" -msgstr "packfile es inválido: %s" - -#: builtin/pack-objects.c:792 -#, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "no es posible abrir packfile para reusar: %s" - -#: builtin/pack-objects.c:796 -msgid "unable to seek in reused packfile" -msgstr "no es posible buscar en los packfile reusados" - -#: builtin/pack-objects.c:807 -msgid "unable to read from reused packfile" -msgstr "no es posible leer de packfile reusado" - -#: builtin/pack-objects.c:835 +#: builtin/pack-objects.c:972 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:848 +#: builtin/pack-objects.c:985 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:910 builtin/update-index.c:88 +#: builtin/pack-objects.c:1046 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:963 +#: builtin/pack-objects.c:1099 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1157 +#: builtin/pack-objects.c:1297 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:1585 +#: builtin/pack-objects.c:1724 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow de offset en la base de delta en paquete para %s" -#: builtin/pack-objects.c:1594 +#: builtin/pack-objects.c:1733 #, c-format msgid "delta base offset out of bound for %s" msgstr "outbound de offset en la base de delta para %s" -#: builtin/pack-objects.c:1863 +#: builtin/pack-objects.c:2004 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:1998 -#, c-format -msgid "unable to get size of %s" -msgstr "no se pudo obtener el tamaño de %s" - -#: builtin/pack-objects.c:2013 +#: builtin/pack-objects.c:2149 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099 -#: builtin/pack-objects.c:2109 +#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 +#: builtin/pack-objects.c:2245 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113 +#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2123 +#: builtin/pack-objects.c:2259 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2451 +#: builtin/pack-objects.c:2574 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2713 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no es posible empaquetar objetos alcanzables desde tag %s" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2801 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2676 +#: builtin/pack-objects.c:2807 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:2753 +#: builtin/pack-objects.c:2888 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -14056,7 +17205,7 @@ msgstr "" "se espseraba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2894 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -14065,251 +17214,247 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2992 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024 +#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:2947 +#: builtin/pack-objects.c:3082 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto perdido en %s no pudo ser examinado" -#: builtin/pack-objects.c:3032 +#: builtin/pack-objects.c:3167 msgid "unable to force loose object" msgstr "incapaz de forzar un objeto perdido" -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3260 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3263 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3288 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3203 +#: builtin/pack-objects.c:3341 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3207 +#: builtin/pack-objects.c:3345 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3237 -msgid "do not show progress meter" -msgstr "no mostrar medidor de progreso" - -#: builtin/pack-objects.c:3239 -msgid "show progress meter" -msgstr "mostrar medidor de progreso" - -#: builtin/pack-objects.c:3241 -msgid "show progress meter during object writing phase" -msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" - -#: builtin/pack-objects.c:3244 -msgid "similar to --all-progress when progress meter is shown" -msgstr "similar a --all-progress cuando medidor de progreso es mostrado" - -#: builtin/pack-objects.c:3245 +#: builtin/pack-objects.c:3383 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3384 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3387 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3389 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3253 +#: builtin/pack-objects.c:3391 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3393 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3395 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:3259 +#: builtin/pack-objects.c:3397 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:3261 +#: builtin/pack-objects.c:3399 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3401 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3265 +#: builtin/pack-objects.c:3403 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3405 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3269 +#: builtin/pack-objects.c:3407 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3271 +#: builtin/pack-objects.c:3409 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3411 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3414 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3417 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3420 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3423 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3425 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3427 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3429 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3431 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3434 +msgid "use the sparse reachability algorithm" +msgstr "usar el algoritmo sparse reachability" + +#: builtin/pack-objects.c:3436 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3438 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3440 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3442 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3444 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3306 +#: builtin/pack-objects.c:3446 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3308 +#: builtin/pack-objects.c:3448 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:3310 +#: builtin/pack-objects.c:3450 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3454 +msgid "write a bitmap index if possible" +msgstr "escribir un índice de bitmap si es posible" + +#: builtin/pack-objects.c:3458 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3316 +#: builtin/pack-objects.c:3461 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3463 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3342 +#: builtin/pack-objects.c:3492 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d" -#: builtin/pack-objects.c:3347 +#: builtin/pack-objects.c:3497 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es muy grande, forzando %d" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3551 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size no puede ser usado para construir un paquete para " "transferencia" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3553 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3558 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin no puede ser usado para construir un paquete indexable" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3561 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3567 msgid "cannot use --filter without --stdout" msgstr "no se puede usar--filter sin --stdout" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3627 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:3495 +#: builtin/pack-objects.c:3657 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "" +"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-" +"reusado %<PRIu32>" -#: builtin/pack-refs.c:7 +#: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<opciones>]" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "pack everything" msgstr "empaquetar todo" -#: builtin/pack-refs.c:16 +#: builtin/pack-refs.c:17 msgid "prune loose refs (default)" msgstr "recortar refs perdidos (default)" @@ -14325,82 +17470,82 @@ msgstr "Removiendo objetos duplicados" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]" -#: builtin/prune.c:109 +#: builtin/prune.c:131 msgid "report pruned objects" msgstr "reportar objetos recortados" -#: builtin/prune.c:112 +#: builtin/prune.c:134 msgid "expire objects older than <time>" msgstr "expirar objetos más viejos a <tiempo>" -#: builtin/prune.c:114 +#: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" -#: builtin/prune.c:129 +#: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" msgstr "no se puede recortar en un repositorio de objetos-preciosos" -#: builtin/pull.c:60 builtin/pull.c:62 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor inválido para %s: %s" -#: builtin/pull.c:82 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" -#: builtin/pull.c:133 +#: builtin/pull.c:122 msgid "control for recursive fetching of submodules" msgstr "control de fetch recursivo en submódulos" -#: builtin/pull.c:137 +#: builtin/pull.c:126 msgid "Options related to merging" msgstr "Opciones relacionadas a fusión" -#: builtin/pull.c:140 +#: builtin/pull.c:129 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122 +#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: builtin/pull.c:176 +#: builtin/pull.c:166 msgid "automatically stash/stash pop before and after rebase" msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" -#: builtin/pull.c:192 +#: builtin/pull.c:182 msgid "Options related to fetching" msgstr "Opciones relacionadas a fetch" -#: builtin/pull.c:202 +#: builtin/pull.c:192 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/pull.c:210 +#: builtin/pull.c:200 msgid "number of submodules pulled in parallel" msgstr "número de submódulos que realizan pull en paralelo" -#: builtin/pull.c:305 +#: builtin/pull.c:300 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido para pull.ff: %s" -#: builtin/pull.c:421 +#: builtin/pull.c:426 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." -#: builtin/pull.c:423 +#: builtin/pull.c:428 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hay candidatos para fusionar entre las refs que has bajado con fetch." -#: builtin/pull.c:424 +#: builtin/pull.c:429 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -14409,7 +17554,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:427 +#: builtin/pull.c:432 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -14420,44 +17565,44 @@ msgstr "" "una rama. Porque este no es el remoto configurado por default\n" "para tu rama actual, tienes que especificar una rama en la línea de comando." -#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73 +#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79 +#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82 +#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:437 builtin/pull.c:452 +#: builtin/pull.c:442 builtin/pull.c:457 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454 -#: builtin/rebase.c:767 git-parse-remote.sh:64 +#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 +#: builtin/rebase.c:1415 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459 -#: git-legacy-rebase.sh:556 git-parse-remote.sh:65 +#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75 +#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:456 git-parse-remote.sh:95 +#: builtin/pull.c:461 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si deseas configurar el rastreo de información para esta rama, puedes " "hacerlo con:" -#: builtin/pull.c:461 +#: builtin/pull.c:466 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -14466,32 +17611,32 @@ msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" "de tu remoto, pero no se pudo hacer fetch a esa ref." -#: builtin/pull.c:565 +#: builtin/pull.c:576 #, c-format msgid "unable to access commit %s" msgstr "no es posible acceder al commit %s" -#: builtin/pull.c:843 +#: builtin/pull.c:857 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:891 +#: builtin/pull.c:912 msgid "--[no-]autostash option is only valid with --rebase." msgstr "La opción --[no-]autostash sólo es válida con --rebase." -#: builtin/pull.c:899 +#: builtin/pull.c:920 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nata con cambios agregados al índice." -#: builtin/pull.c:902 +#: builtin/pull.c:924 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:903 +#: builtin/pull.c:925 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:928 +#: builtin/pull.c:950 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -14502,7 +17647,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:934 +#: builtin/pull.c:956 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -14519,15 +17664,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:949 +#: builtin/pull.c:971 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:953 +#: builtin/pull.c:975 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:960 +#: builtin/pull.c:982 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -14537,15 +17682,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "taquigrafía de tag sin <tag>" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:165 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -14554,7 +17699,7 @@ msgstr "" "Para elegir si la opción es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:168 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -14579,7 +17724,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:183 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -14594,7 +17739,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:197 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -14608,29 +17753,29 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:205 +#: builtin/push.c:208 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." -#: builtin/push.c:208 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"Está haciendo un push al remoto '%s', el cual no es el upstream de\n" -"su rama actual '%s', sin decirme qué poner en el push\n" +"Estás haciendo un push al remoto '%s', el cual no es el upstream de\n" +"la rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." -#: builtin/push.c:267 +#: builtin/push.c:270 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." -#: builtin/push.c:274 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -14640,9 +17785,9 @@ msgstr "" "Actualizaciones fueron rechazadas porque la punta de tu rama actual está\n" "detrás de su contraparte remota. Integra los cambios remotos (es decir\n" "'git pull ...') antes de hacer push de nuevo.\n" -"Mira 'Note about fast-forwards' en 'git push --help' para mas detalles." +"Mira 'Note about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:280 +#: builtin/push.c:283 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -14655,7 +17800,7 @@ msgstr "" "(ejem. 'git pull ...') antes de volver a hacer push.\n" "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:286 +#: builtin/push.c:289 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -14669,156 +17814,156 @@ msgstr "" "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." -#: builtin/push.c:293 +#: builtin/push.c:296 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." -#: builtin/push.c:296 +#: builtin/push.c:299 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -"No puede actualizar un ref remoto que apunta a un objeto no-commit,\n" +"No se puede actualizar un ref remoto que apunta a un objeto no-commit,\n" "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" "sin usar la opción '--force'.\n" -#: builtin/push.c:357 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:361 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "falló el push de algunas referencias a '%s'" -#: builtin/push.c:395 -#, c-format -msgid "bad repository '%s'" -msgstr "mal repositorio '%s'" - -#: builtin/push.c:396 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"No se ha configurado un destino para el push.\n" -"Puedes o especificar una URL desde la línea de comandos o configurar un " -"repositorio remoto usando\n" -"\n" -" git remote add <nombre> <url>\n" -"\n" -"y luego haciendo push al nombre del remoto\n" -"\n" -" git push <nombre>\n" - -#: builtin/push.c:551 +#: builtin/push.c:542 msgid "repository" msgstr "repositorio" -#: builtin/push.c:552 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:553 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:555 +#: builtin/push.c:546 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:556 +#: builtin/push.c:547 msgid "push tags (can't be used with --all or --mirror)" msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" -#: builtin/push.c:559 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:561 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:562 builtin/send-pack.c:182 +#: builtin/push.c:553 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:565 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:567 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:570 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "prune locally removed refs" -msgstr "recortando refs removidas localmente" +msgstr "recortando refs eliminadas localmente" -#: builtin/push.c:575 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:579 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:581 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" -#: builtin/push.c:599 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:604 +#: builtin/push.c:612 +#, c-format +msgid "bad repository '%s'" +msgstr "mal repositorio '%s'" + +#: builtin/push.c:613 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"No se ha configurado un destino para el push.\n" +"Puedes o especificar una URL desde la línea de comandos o configurar un " +"repositorio remoto usando\n" +"\n" +" git remote add <nombre> <url>\n" +"\n" +"y luego haciendo push al nombre del remoto\n" +"\n" +" git push <nombre>\n" + +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:606 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:610 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:612 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:634 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de línea nueva" @@ -14836,28 +17981,36 @@ msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Porcentaje por el cual la creación es pesada" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "usar colores simples de diff" -#: builtin/range-diff.c:61 builtin/range-diff.c:65 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "notas" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "pasado a 'git log'" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "no .. en rango: '%s'" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "argumento único de formato debe ser un rango simétrico" -#: builtin/range-diff.c:90 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "se necesitan dos rangos de commits" -#: builtin/read-tree.c:40 +#: builtin/read-tree.c:41 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -14868,119 +18021,297 @@ msgstr "" "sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-" "ismo2> [<árbol-ismo3>]])" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "write resulting index to <file>" msgstr "escribir índice resultante en <archivo>" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:127 msgid "only empty the index" msgstr "solo vaciar el índice" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:129 msgid "Merging" msgstr "Fusionando" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "perform a merge in addition to a read" msgstr "realizar un merge en adición a una lectura" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:133 msgid "3-way merge if no file level merging required" msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "3-way merge in presence of adds and removes" msgstr "fusión en 3-vías en presencia de adiciones y remociones" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "same as -m, but discard unmerged entries" msgstr "igual que -m, pero descarta entradas sin fusionar" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:138 msgid "<subdirectory>/" msgstr "<subdirectorio>/" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "read the tree into the index under <subdirectory>/" msgstr "lea el árbol en el índice bajo <subdirectorio>/" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:142 msgid "update working tree with merge result" msgstr "actualiza el árbol de trabajo con el resultado de la fusión" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c:144 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:145 msgid "allow explicitly ignored files to be overwritten" msgstr "permitir sobrescritura de archivos explícitamente ignorados" -#: builtin/read-tree.c:147 +#: builtin/read-tree.c:148 msgid "don't check the working tree after merging" msgstr "no revisar el árbol de trabajo tras fusionar" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:149 msgid "don't update the index or the work tree" msgstr "no actualizar el índice o el árbol de trabajo" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" msgstr "saltar aplicado de filtro de sparse checkout" -#: builtin/read-tree.c:152 +#: builtin/read-tree.c:153 msgid "debug unpack-trees" msgstr "debug de árboles-desempacados" -#: builtin/rebase.c:29 +#: builtin/read-tree.c:157 +msgid "suppress feedback messages" +msgstr "suprimir mensajes de feedback" + +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "Necesitas resolver tu índice actual primero" + +#: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" -#: builtin/rebase.c:31 +#: builtin/rebase.c:34 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]" -#: builtin/rebase.c:33 +#: builtin/rebase.c:36 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:119 +#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "lista de pendientes inutilizable: '%s'" + +#: builtin/rebase.c:292 +#, c-format +msgid "could not create temporary %s" +msgstr "no se pudo crear archivo temporal %s" + +#: builtin/rebase.c:298 +msgid "could not mark as interactive" +msgstr "no se pudo marcar como interactivo" + +#: builtin/rebase.c:352 +msgid "could not generate todo list" +msgstr "no se pudo generar lista de pendientes" + +#: builtin/rebase.c:391 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "un commit base tiene que ser provisto con --upstream o --onto" + +#: builtin/rebase.c:461 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<opciones>]" + +#: builtin/rebase.c:474 builtin/rebase.c:1550 +msgid "(DEPRECATED) keep empty commits" +msgstr "(DEPRECADO) mantener commits vacíos" + +#: builtin/rebase.c:478 builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "permitir commits con mensajes vacíos" + +#: builtin/rebase.c:480 +msgid "rebase merge commits" +msgstr "rebasando commits de fusión" + +#: builtin/rebase.c:482 +msgid "keep original branch points of cousins" +msgstr "mantener puntos originales de la rama de sus primos" + +#: builtin/rebase.c:484 +msgid "move commits that begin with squash!/fixup!" +msgstr "mover commits que comienzan con squash!/fixup!" + +#: builtin/rebase.c:485 +msgid "sign commits" +msgstr "firmar commits" + +#: builtin/rebase.c:487 builtin/rebase.c:1490 +msgid "display a diffstat of what changed upstream" +msgstr "mostrar un diffstat de lo que cambió en upstream" + +#: builtin/rebase.c:489 +msgid "continue rebase" +msgstr "continuar rebase" + +#: builtin/rebase.c:491 +msgid "skip commit" +msgstr "saltar commit" + +#: builtin/rebase.c:492 +msgid "edit the todo list" +msgstr "editar la lista de pendientes" + +#: builtin/rebase.c:494 +msgid "show the current patch" +msgstr "mostrar el parche actual" + +#: builtin/rebase.c:497 +msgid "shorten commit ids in the todo list" +msgstr "ids de commits cortos en la lista de pendientes" + +#: builtin/rebase.c:499 +msgid "expand commit ids in the todo list" +msgstr "expandir ids de commits en la lista de pendientes" + +#: builtin/rebase.c:501 +msgid "check the todo list" +msgstr "revisar la lista de pendientes" + +#: builtin/rebase.c:503 +msgid "rearrange fixup/squash lines" +msgstr "reorganizar líneas fixup/squash" + +#: builtin/rebase.c:505 +msgid "insert exec commands in todo list" +msgstr "insertar comando exec en la lista de pendientes" + +#: builtin/rebase.c:506 +msgid "onto" +msgstr "hacia" + +#: builtin/rebase.c:509 +msgid "restrict-revision" +msgstr "restrict-revision" + +#: builtin/rebase.c:509 +msgid "restrict revision" +msgstr "restringir revision" + +#: builtin/rebase.c:511 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:512 +msgid "squash onto" +msgstr "squash hacia" + +#: builtin/rebase.c:514 +msgid "the upstream commit" +msgstr "el commit de upstream" + +#: builtin/rebase.c:516 +msgid "head-name" +msgstr "head-name" + +#: builtin/rebase.c:516 +msgid "head name" +msgstr "nombre de head" + +#: builtin/rebase.c:521 +msgid "rebase strategy" +msgstr "estrategia de rebase" + +#: builtin/rebase.c:522 +msgid "strategy-opts" +msgstr "strategy-opts" + +#: builtin/rebase.c:523 +msgid "strategy options" +msgstr "opciones de estrategia" + +#: builtin/rebase.c:524 +msgid "switch-to" +msgstr "cambiar a" + +#: builtin/rebase.c:525 +msgid "the branch or commit to checkout" +msgstr "la rama o commit para hacer checkout" + +#: builtin/rebase.c:526 +msgid "onto-name" +msgstr "hacia-nombre" + +#: builtin/rebase.c:526 +msgid "onto name" +msgstr "hacia nombre" + +#: builtin/rebase.c:527 +msgid "cmd" +msgstr "cmd" + +#: builtin/rebase.c:527 +msgid "the command to run" +msgstr "el comando para ejecutar" + +#: builtin/rebase.c:530 builtin/rebase.c:1584 +msgid "automatically re-schedule any `exec` that fails" +msgstr "reprogramar automaticamente cualquier `exec` que falle" + +#: builtin/rebase.c:546 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" + +#: builtin/rebase.c:562 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiere un rebase interactivo" -#: builtin/rebase.c:171 +#: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:186 +#: builtin/rebase.c:627 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head inválido: '%s'" -#: builtin/rebase.c:214 +#: builtin/rebase.c:652 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando inválido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:259 +#: builtin/rebase.c:728 #, c-format msgid "Could not read '%s'" msgstr "No se pudo leer '%s'" -#: builtin/rebase.c:277 +#: builtin/rebase.c:746 #, c-format msgid "Cannot store %s" msgstr "No se puede guardar %s" -#: builtin/rebase.c:337 +#: builtin/rebase.c:853 +msgid "could not determine HEAD revision" +msgstr "no se pudo determinar revisión HEAD" + +#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -14991,15 +18322,39 @@ msgstr "" "Resuelva todos los conflictos manualmente ya sea con \n" "\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue" "\".\n" -"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n" -"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git " +"Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n" +"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:561 -msgid "could not determine HEAD revision" -msgstr "no se pudo determinar revisión HEAD" +#: builtin/rebase.c:1058 +#, c-format +msgid "" +"\n" +"git encountered an error while preparing the patches to replay\n" +"these revisions:\n" +"\n" +" %s\n" +"\n" +"As a result, git cannot rebase them." +msgstr "" +"\n" +"git encontró un error mientras preparaba los parches para replicar\n" +"esas revisiones:\n" +"\n" +" %s\n" +"\n" +"Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:753 +#: builtin/rebase.c:1383 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" +"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y " +"\"ask\"." + +#: builtin/rebase.c:1401 #, c-format msgid "" "%s\n" @@ -15016,7 +18371,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:769 +#: builtin/rebase.c:1417 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -15029,149 +18384,174 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:832 +#: builtin/rebase.c:1447 +msgid "exec commands cannot contain newlines" +msgstr "comandos exec no pueden contener newlines" + +#: builtin/rebase.c:1451 +msgid "empty exec command" +msgstr "comando exec vacío" + +#: builtin/rebase.c:1481 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:834 +#: builtin/rebase.c:1483 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "usar la base de fusión de upstream y la rama como base actual" + +#: builtin/rebase.c:1485 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:836 +#: builtin/rebase.c:1487 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:839 -msgid "display a diffstat of what changed upstream" -msgstr "mostrar un diffstat de lo que cambió en upstream" - -#: builtin/rebase.c:842 +#: builtin/rebase.c:1493 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:845 +#: builtin/rebase.c:1496 msgid "add a Signed-off-by: line to each commit" msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit" -#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853 +#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 msgid "passed to 'git am'" msgstr "pasado a 'git am'" -#: builtin/rebase.c:855 builtin/rebase.c:857 +#: builtin/rebase.c:1506 builtin/rebase.c:1508 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:859 builtin/rebase.c:862 +#: builtin/rebase.c:1510 builtin/rebase.c:1513 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:864 +#: builtin/rebase.c:1515 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:867 +#: builtin/rebase.c:1518 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:869 +#: builtin/rebase.c:1520 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:872 +#: builtin/rebase.c:1523 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde está" -#: builtin/rebase.c:873 +#: builtin/rebase.c:1524 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:876 +#: builtin/rebase.c:1527 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:879 +#: builtin/rebase.c:1530 +msgid "use apply strategies to rebase" +msgstr "usar estrategias de apply para el rebase" + +#: builtin/rebase.c:1534 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusión para el rebase" -#: builtin/rebase.c:883 +#: builtin/rebase.c:1538 msgid "let the user edit the list of commits to rebase" msgstr "permitir al usuario editar la lista de commits para rebasar" -#: builtin/rebase.c:887 -msgid "try to recreate merges instead of ignoring them" -msgstr "intentar recrear merges en lugar de ignorarlos" +#: builtin/rebase.c:1542 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:891 -msgid "allow rerere to update index with resolved conflict" -msgstr "permitir rerere actualizar index con conflictos resueltos" +#: builtin/rebase.c:1547 +msgid "how to handle commits that become empty" +msgstr "como manejar commits que se vuelven vacíos" -#: builtin/rebase.c:894 -msgid "preserve empty commits during rebase" -msgstr "preservar commits vacíos durante el rebase" - -#: builtin/rebase.c:896 +#: builtin/rebase.c:1554 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: builtin/rebase.c:902 +#: builtin/rebase.c:1560 msgid "automatically stash/stash pop before and after" msgstr "ejecutar automáticamente stash/stash pop antes y después" -#: builtin/rebase.c:904 +#: builtin/rebase.c:1562 msgid "add exec lines after each commit of the editable list" msgstr "agregar líneas exec tras cada acommit de la lista editable" -#: builtin/rebase.c:908 +#: builtin/rebase.c:1566 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vacíos" -#: builtin/rebase.c:911 +#: builtin/rebase.c:1570 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:914 +#: builtin/rebase.c:1573 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:916 +#: builtin/rebase.c:1575 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:918 builtin/revert.c:111 +#: builtin/rebase.c:1577 builtin/revert.c:115 msgid "option" msgstr "opción" -#: builtin/rebase.c:919 +#: builtin/rebase.c:1578 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusión" -#: builtin/rebase.c:922 +#: builtin/rebase.c:1581 msgid "rebase all reachable commits up to the root(s)" msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)" -#: builtin/rebase.c:938 -#, c-format -msgid "could not exec %s" -msgstr "no se pudo ejecutar %s" +#: builtin/rebase.c:1598 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"el soporte para rebase.useBuiltin ha sido eliminado!\n" +"Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:956 git-legacy-rebase.sh:213 +#: builtin/rebase.c:1604 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Parece que 'git am' está en progreso. No se puede rebasar." -#: builtin/rebase.c:997 git-legacy-rebase.sh:395 +#: builtin/rebase.c:1645 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "" +"git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar." + +#: builtin/rebase.c:1650 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "no se puede combinar '--keep-base' con '--onto'" + +#: builtin/rebase.c:1652 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "no se puede combinar '--keep-base' con '--root'" + +#: builtin/rebase.c:1656 msgid "No rebase in progress?" -msgstr "No hay rebase en progreso?" +msgstr "¿No hay rebase en progreso?" -#: builtin/rebase.c:1001 git-legacy-rebase.sh:406 +#: builtin/rebase.c:1660 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "La acción --edit-todo sólo puede ser usada al rebasar interactivamente." -#: builtin/rebase.c:1015 git-legacy-rebase.sh:413 +#: builtin/rebase.c:1683 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1028 git-legacy-rebase.sh:416 +#: builtin/rebase.c:1695 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15179,21 +18559,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1047 +#: builtin/rebase.c:1714 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del árbol de trabajo" -#: builtin/rebase.c:1066 +#: builtin/rebase.c:1733 #, c-format msgid "could not move back to %s" -msgstr "No se puede regresar a %s" +msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1077 builtin/rm.c:368 -#, c-format -msgid "could not remove '%s'" -msgstr "no se pudo eliminar'%s'" - -#: builtin/rebase.c:1103 +#: builtin/rebase.c:1778 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -15206,352 +18581,175 @@ msgid "" "valuable there.\n" msgstr "" "Parece que ya hay un directorio %s, y\n" -"me pregunto si está en medio de otro rebase. Si ese es el \n" -"caso, por favor intente\n" +"me pregunto si estás en medio de otro rebase. Si ese es el \n" +"caso, por favor intenta\n" "\t%s\n" "Si no es el caso, por favor\n" "\t%s\n" -"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" +"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahí.\n" -#: builtin/rebase.c:1124 +#: builtin/rebase.c:1806 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numérico" -#: builtin/rebase.c:1161 +#: builtin/rebase.c:1847 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1183 +#: builtin/rebase.c:1869 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1226 -#, c-format -msgid "" -"error: cannot combine interactive options (--interactive, --exec, --rebase-" -"merges, --preserve-merges, --keep-empty, --root + --onto) with am options " -"(%s)" -msgstr "" -"error: no se puede combinar opciones interactivas (--interactive, --exec, --" -"rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con " -"opciones (%s)" +#: builtin/rebase.c:1899 +msgid "cannot combine apply options with merge options" +msgstr "no se pueden combinar opciones de apply con opciones de merge" -#: builtin/rebase.c:1231 +#: builtin/rebase.c:1912 #, c-format -msgid "" -"error: cannot combine merge options (--merge, --strategy, --strategy-option) " -"with am options (%s)" -msgstr "" -"error: no se puede combinar opciones de merge (--merge, --strategy, --" -"strategy-option) con opciones de am (%s)" +msgid "Unknown rebase backend: %s" +msgstr "Backend de rebase desconocido: %s" -#: builtin/rebase.c:1251 git-legacy-rebase.sh:536 -msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "error: no se puede combinar '--preserve-merges' con '--rebase-merges'" +#: builtin/rebase.c:1937 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: builtin/rebase.c:1256 git-legacy-rebase.sh:542 -msgid "error: cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "error: no se puede combinar '--rebase-merges' con '--strategy-option'" +#: builtin/rebase.c:1957 +msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1259 git-legacy-rebase.sh:544 -msgid "error: cannot combine '--rebase-merges' with '--strategy'" -msgstr "error: no se puede combinar '--rebase-merges' con '--strategy'" +#: builtin/rebase.c:1961 +msgid "" +"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +msgstr "" +"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-" +"exec'" -#: builtin/rebase.c:1283 +#: builtin/rebase.c:1985 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inválido '%s'" -#: builtin/rebase.c:1289 +#: builtin/rebase.c:1991 msgid "Could not create new root commit" msgstr "No se pudo crear commit raíz nuevo" -#: builtin/rebase.c:1307 +#: builtin/rebase.c:2017 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s': necesita exactamente una base de fusión con rama" + +#: builtin/rebase.c:2020 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusión" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:2028 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit válido '%s'" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:2054 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1347 builtin/submodule--helper.c:37 -#: builtin/submodule--helper.c:1930 +#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:2073 msgid "Could not resolve HEAD to a revision" -msgstr "no se pudo resolver HEAD a una revisión" +msgstr "No se pudo resolver HEAD a una revisión" -#: builtin/rebase.c:1399 git-legacy-rebase.sh:665 +#: builtin/rebase.c:2111 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: builtin/rebase.c:1402 +#: builtin/rebase.c:2114 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: builtin/rebase.c:1408 +#: builtin/rebase.c:2120 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: builtin/rebase.c:1411 +#: builtin/rebase.c:2123 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: builtin/rebase.c:1414 +#: builtin/rebase.c:2126 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: builtin/rebase.c:1415 builtin/reset.c:113 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD está ahora en %s" - -#: builtin/rebase.c:1431 git-legacy-rebase.sh:674 +#: builtin/rebase.c:2135 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: builtin/rebase.c:1458 -#, c-format -msgid "could not parse '%s'" -msgstr "no se puede analizar '%s'" - -#: builtin/rebase.c:1470 +#: builtin/rebase.c:2169 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:1481 git-legacy-rebase.sh:697 -#, sh-format +#: builtin/rebase.c:2180 msgid "HEAD is up to date." msgstr "HEAD está actualizado." -#: builtin/rebase.c:1483 +#: builtin/rebase.c:2182 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s está actualizada.\n" -#: builtin/rebase.c:1491 git-legacy-rebase.sh:707 -#, sh-format +#: builtin/rebase.c:2190 msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: builtin/rebase.c:1493 +#: builtin/rebase.c:2192 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Rama actual %s está actualizada, rebase forzado.\n" -#: builtin/rebase.c:1501 git-legacy-rebase.sh:208 +#: builtin/rebase.c:2200 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: builtin/rebase.c:1508 +#: builtin/rebase.c:2207 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:2210 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:1536 +#: builtin/rebase.c:2235 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " "de ésta...\n" -#: builtin/rebase.c:1543 +#: builtin/rebase.c:2244 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:1552 +#: builtin/rebase.c:2253 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rápido de %s a %s.\n" -#: builtin/rebase--interactive.c:24 -msgid "no HEAD?" -msgstr "¿Sin HEAD?" - -#: builtin/rebase--interactive.c:51 -#, c-format -msgid "could not create temporary %s" -msgstr "no se pudo crear archivo temporal %s" - -#: builtin/rebase--interactive.c:57 -msgid "could not mark as interactive" -msgstr "no se pudo marcar como interactivo" - -#: builtin/rebase--interactive.c:101 -#, c-format -msgid "could not open %s" -msgstr "no se pudo abrir %s" - -#: builtin/rebase--interactive.c:114 -msgid "could not generate todo list" -msgstr "no se pudo generar lista de pendientes" - -#: builtin/rebase--interactive.c:129 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<opciones>]" - -#: builtin/rebase--interactive.c:148 -msgid "keep empty commits" -msgstr "mantener commits vacíos" - -#: builtin/rebase--interactive.c:150 builtin/revert.c:124 -msgid "allow commits with empty messages" -msgstr "permitir commits con mensajes vacíos" - -#: builtin/rebase--interactive.c:151 -msgid "rebase merge commits" -msgstr "rebasando commits de fusión" - -#: builtin/rebase--interactive.c:153 -msgid "keep original branch points of cousins" -msgstr "mantener puntos originales de la rama de sus primos" - -#: builtin/rebase--interactive.c:155 -msgid "move commits that begin with squash!/fixup!" -msgstr "mover commits que comienzan con squash!/fixup!" - -#: builtin/rebase--interactive.c:156 -msgid "sign commits" -msgstr "firmar commits" - -#: builtin/rebase--interactive.c:158 -msgid "continue rebase" -msgstr "continuar rebase" - -#: builtin/rebase--interactive.c:160 -msgid "skip commit" -msgstr "saltar commit" - -#: builtin/rebase--interactive.c:161 -msgid "edit the todo list" -msgstr "editar la lista de pendientes" - -#: builtin/rebase--interactive.c:163 -msgid "show the current patch" -msgstr "mostrar el parche actual" - -#: builtin/rebase--interactive.c:166 -msgid "shorten commit ids in the todo list" -msgstr "ids de commits cortos en la lista de pendientes" - -#: builtin/rebase--interactive.c:168 -msgid "expand commit ids in the todo list" -msgstr "expandir ids de commits en la lista de pendientes" - -#: builtin/rebase--interactive.c:170 -msgid "check the todo list" -msgstr "revisar la lista de pendientes" - -#: builtin/rebase--interactive.c:172 -msgid "rearrange fixup/squash lines" -msgstr "reorganizar líneas fixup/squash" - -#: builtin/rebase--interactive.c:174 -msgid "insert exec commands in todo list" -msgstr "insertar comando exec en la lista de pendientes" - -#: builtin/rebase--interactive.c:175 -msgid "onto" -msgstr "hacia" - -#: builtin/rebase--interactive.c:177 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase--interactive.c:177 -msgid "restrict revision" -msgstr "restringir revision" - -#: builtin/rebase--interactive.c:178 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase--interactive.c:179 -msgid "squash onto" -msgstr "squash hacia" - -#: builtin/rebase--interactive.c:181 -msgid "the upstream commit" -msgstr "el commit de upstream" - -#: builtin/rebase--interactive.c:182 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase--interactive.c:182 -msgid "head name" -msgstr "nombre de head" - -#: builtin/rebase--interactive.c:187 -msgid "rebase strategy" -msgstr "estrategia de rebase" - -#: builtin/rebase--interactive.c:188 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase--interactive.c:189 -msgid "strategy options" -msgstr "opciones de estrategia" - -#: builtin/rebase--interactive.c:190 -msgid "switch-to" -msgstr "cambiar a" - -#: builtin/rebase--interactive.c:191 -msgid "the branch or commit to checkout" -msgstr "la rama o commit para hacer checkout" - -#: builtin/rebase--interactive.c:192 -msgid "onto-name" -msgstr "hacia-nombre" - -#: builtin/rebase--interactive.c:192 -msgid "onto name" -msgstr "hacia nombre" - -#: builtin/rebase--interactive.c:193 -msgid "cmd" -msgstr "cmd" - -#: builtin/rebase--interactive.c:193 -msgid "the command to run" -msgstr "el comando para ejecutar" - -#: builtin/rebase--interactive.c:220 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" - -#: builtin/rebase--interactive.c:226 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "un commit base tiene que ser provisto con --upstream o --onto" - #: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:821 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -15574,17 +18772,17 @@ msgstr "" "arreglar\n" "el árbol de trabajo con HEAD.\n" "\n" -"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n" +"Puedes configurar la variable de configuración 'receive.denyCurrentBranch'\n" "\"ignore\" o \"warn\" en el repositorio remoto para permitir\n" -"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n" -"se haya organizado para actualizar su árbol de trabajo para que coincida con " -"lo que\n" -"enviará con el push de otra manera.\n" +"su rama actual; Sin embargo, esto no se recomienda a menos que tú\n" +"te hayas organizado para actualizar su árbol de trabajo para que coincida " +"con lo que\n" +"enviarás con el push de otra manera.\n" "\n" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" -"configure 'receive.denyCurrentBranch' a 'refuse'." +"configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:841 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -15603,26 +18801,81 @@ msgstr "" "en el repositorio remoto para permitir borrar la rama actual.\n" "con o sin mensaje de advertencia.\n" "\n" -"Para suprimir este mensaje, puede configurarlo en 'refuse'." +"Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:1929 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1943 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." -#: builtin/reflog.c:563 builtin/reflog.c:568 +#: builtin/reflog.c:17 +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<refs>..." +msgstr "" +"git reflog expire [--expire=<tiempo>] [--expire-unreachable=<tiempo>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<refs>..." + +#: builtin/reflog.c:22 +msgid "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<refs>..." +msgstr "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<refs>..." + +#: builtin/reflog.c:25 +msgid "git reflog exists <ref>" +msgstr "git reflog existe <ref>" + +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" -#: builtin/remote.c:16 +#: builtin/reflog.c:606 +#, c-format +msgid "Marking reachable objects..." +msgstr "Marcando objectos alcanzables..." + +#: builtin/reflog.c:644 +#, c-format +msgid "%s points nowhere!" +msgstr "¡%s apunta a ningún lado!" + +#: builtin/reflog.c:696 +msgid "no reflog specified to delete" +msgstr "no reflog especificado para borrar" + +#: builtin/reflog.c:705 +#, c-format +msgid "not a reflog: %s" +msgstr "no es una reflog: %s" + +#: builtin/reflog.c:710 +#, c-format +msgid "no reflog for '%s'" +msgstr "no reflog para '%s'" + +#: builtin/reflog.c:756 +#, c-format +msgid "invalid ref format: %s" +msgstr "formato inválido: %s" + +#: builtin/reflog.c:765 +msgid "git reflog [ show | expire | delete | exists ]" +msgstr "git reflog [ show | expire | delete | exists ]" + +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -15630,82 +18883,82 @@ msgstr "" "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nombre> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <viejo> <nuevo>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nombre>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nombre>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nombre>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nombre> <rama>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nombre>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nombre> <nuevo-url>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nombre> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opciones>] <nombre> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nombre> <rama>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nombre> <rama>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opciones>] <nombre>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opciones>] <nombre>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Actualizando %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -15713,84 +18966,100 @@ msgstr "" "Usar --mirror es peligroso y está desaprobado;\n" "\t usa más bien --mirror=fetch o --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "argumento mirror desconocido: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "realizar fetch a las ramas remotas" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "importar todos los tags y objetos asociados cuando realiza el fetch" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o no realziar fetch a ningún tag (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "rama(s) para rastrear" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "rama master" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "configurar remote como mirror para realizar push o desde el cual realizar " "fetch" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una rama master no tiene sentido con --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:696 #, c-format msgid "remote %s already exists." msgstr "remoto %s ya existe." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:700 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no es un nombre remoto válido" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "No se pudo configurar master '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "No se pudo realizar el fetch al mapa para refspec %s" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(concordando)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:653 +#, c-format +msgid "could not set '%s'" +msgstr "no se pudo configurar '%s'" + +#: builtin/remote.c:658 +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" +"La configuración %s remote.pushDefault en:\n" +"\t%s:%d\n" +"ahora nombra al remoto inexistente '%s'" + +#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:706 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'" -#: builtin/remote.c:666 +#: builtin/remote.c:726 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -15801,17 +19070,17 @@ msgstr "" "\t%s\n" "\tPor favor actualice la configuración manualmente si es necesario." -#: builtin/remote.c:702 +#: builtin/remote.c:766 #, c-format msgid "deleting '%s' failed" msgstr "borrando '%s' falló" -#: builtin/remote.c:736 +#: builtin/remote.c:800 #, c-format msgid "creating '%s' failed" msgstr "creando '%s' falló" -#: builtin/remote.c:802 +#: builtin/remote.c:876 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -15819,125 +19088,125 @@ msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "" -"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue removida;\n" +"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue eliminada;\n" "para borrarla, use:" msgstr[1] "" "Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron " -"removidas;\n" +"eliminadas;\n" "para borrarlas, use:" -#: builtin/remote.c:816 +#: builtin/remote.c:890 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la sección de configuración '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:993 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:996 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:922 +#: builtin/remote.c:998 msgid " stale (use 'git remote prune' to remove)" msgstr " viejo ( use 'git remote prune' para eliminar)" -#: builtin/remote.c:924 +#: builtin/remote.c:1000 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1041 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama" -#: builtin/remote.c:974 +#: builtin/remote.c:1050 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1052 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:979 +#: builtin/remote.c:1055 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1059 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1062 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1065 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1108 msgid "create" msgstr "crear" -#: builtin/remote.c:1035 +#: builtin/remote.c:1111 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1039 +#: builtin/remote.c:1115 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1042 +#: builtin/remote.c:1118 msgid "fast-forwardable" msgstr "puede realizar fast-forward" -#: builtin/remote.c:1045 +#: builtin/remote.c:1121 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1052 +#: builtin/remote.c:1128 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1131 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1135 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1138 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1206 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1157 +#: builtin/remote.c:1233 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1234 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 msgid "(no URL)" msgstr "(sin URL)" @@ -15945,194 +19214,185 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1249 builtin/remote.c:1251 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1253 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1255 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1259 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1271 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1274 builtin/remote.c:1300 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1283 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Rama local configurada para 'git pull':" msgstr[1] " Ramas locales configuradas para 'git pull':" -#: builtin/remote.c:1215 +#: builtin/remote.c:1291 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales serán reflejadas por 'git push'" -#: builtin/remote.c:1221 +#: builtin/remote.c:1297 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referencia local configurada para 'git push'%s:" msgstr[1] " Referencias locales configuradas para 'git push'%s:" -#: builtin/remote.c:1242 +#: builtin/remote.c:1318 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1244 +#: builtin/remote.c:1320 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1335 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1261 +#: builtin/remote.c:1337 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1347 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1355 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref válido: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1357 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1375 #, c-format msgid " %s will become dangling!" -msgstr " %s será colgado!" +msgstr " ¡%s será colgado!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1376 #, c-format msgid " %s has become dangling!" -msgstr " %s ha sido colgado!" +msgstr " ¡%s ha sido colgado!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1386 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1387 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1403 #, c-format msgid " * [would prune] %s" msgstr " * [ejecutará prune] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1406 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1451 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1530 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1461 +#: builtin/remote.c:1537 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1478 +#: builtin/remote.c:1554 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1480 +#: builtin/remote.c:1556 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1508 +#: builtin/remote.c:1584 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1534 +#: builtin/remote.c:1610 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1536 +#: builtin/remote.c:1612 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1614 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1545 +#: builtin/remote.c:1621 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1584 +#: builtin/remote.c:1660 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrón de URL viejo inválido: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1668 #, c-format msgid "No such URL found: %s" msgstr "No se encontró URL: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1670 msgid "Will not delete all non-push URLs" msgstr "No borrará todos los URLs de no-push" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "ser verboso; tiene que ser agregado antes de un subcomando" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Sub-comando desconocido: %s" - -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<opciones>]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -16140,97 +19400,134 @@ msgstr "" "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n" "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." -#: builtin/repack.c:294 +#: builtin/repack.c:191 +msgid "could not start pack-objects to repack promisor objects" +msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" + +#: builtin/repack.c:230 builtin/repack.c:416 +msgid "repack: Expecting full hex object ID lines only from pack-objects." +msgstr "" +"repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects." + +#: builtin/repack.c:254 +msgid "could not finish pack-objects to repack promisor objects" +msgstr "" +"no se puede finalizar pack-objects para reempaquetar objetos promisores" + +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "empaquetar todo en un único paquete" -#: builtin/repack.c:296 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y pierde objetos inaccesibles" -#: builtin/repack.c:299 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:305 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "escribir un índice de bitmap" -#: builtin/repack.c:312 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:311 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:314 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos más antiguos que este" -#: builtin/repack.c:316 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:318 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "tamaño de la ventana usado para la compresión delta" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:320 +#: builtin/repack.c:318 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar " "entradas" -#: builtin/repack.c:322 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "limita la profundidad máxima del delta" -#: builtin/repack.c:324 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "limita el número máximo de hilos" -#: builtin/repack.c:326 +#: builtin/repack.c:324 msgid "maximum size of each packfile" msgstr "tamaño máximo de cada paquete" -#: builtin/repack.c:328 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:330 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:340 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" -#: builtin/repack.c:344 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:527 +#: builtin/repack.c:425 +msgid "Nothing new to pack." +msgstr "Nada nuevo para empaquetar." + +#: builtin/repack.c:486 +#, c-format +msgid "" +"WARNING: Some packs in use have been renamed by\n" +"WARNING: prefixing old- to their name, in order to\n" +"WARNING: replace them with the new version of the\n" +"WARNING: file. But the operation failed, and the\n" +"WARNING: attempt to rename them back to their\n" +"WARNING: original names also failed.\n" +"WARNING: Please rename them in %s manually:\n" +msgstr "" +"WARNING: Algunos packs en uso han sido renombrados\n" +"WARNING: agregando el prefijo old- a sus nombres,para\n" +"WARNING: reemplazarlos con la nueva versión del\n" +"WARNING: archivo. Pero la operación falló, y el intento\n" +"WARNING: de renombrarlos a sus nombres originales\n" +"WARNING: también falló.\n" +"WARNING: Por favor renombralos en %s manualmente:\n" + +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "falló al eliminar'%s'" @@ -16259,12 +19556,7 @@ msgstr "git replace -d <objeto>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<formato>] [-l [<patrón>]]" -#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206 -#, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "falló al resolver '%s' como ref válida" - -#: builtin/replace.c:86 +#: builtin/replace.c:90 #, c-format msgid "" "invalid replace format '%s'\n" @@ -16273,27 +19565,27 @@ msgstr "" "formato de reemplazo inválido '%s'\n" "formatos válidos son 'short', 'medium' y 'long'" -#: builtin/replace.c:121 +#: builtin/replace.c:125 #, c-format msgid "replace ref '%s' not found" msgstr "rama de reemplazo '%s' no encontrada" -#: builtin/replace.c:137 +#: builtin/replace.c:141 #, c-format msgid "Deleted replace ref '%s'" msgstr "Borradas replace refs '%s'" -#: builtin/replace.c:149 +#: builtin/replace.c:153 #, c-format msgid "'%s' is not a valid ref name" msgstr "'%s' no es un nombre de ref válido" -#: builtin/replace.c:154 +#: builtin/replace.c:158 #, c-format msgid "replace ref '%s' already exists" msgstr "ref de reemplazo '%s' ya existe" -#: builtin/replace.c:174 +#: builtin/replace.c:178 #, c-format msgid "" "Objects must be of the same type.\n" @@ -16304,76 +19596,81 @@ msgstr "" "'%s' puntos para un objeto reemplazado de tipo '%s'\n" "mientras '%s' puntos para un reemplazo de tipo de objeto '%s'." -#: builtin/replace.c:225 +#: builtin/replace.c:229 #, c-format msgid "unable to open %s for writing" msgstr "no se pudo abrir %s para escritura" -#: builtin/replace.c:238 +#: builtin/replace.c:242 msgid "cat-file reported failure" msgstr "cat-file reportó un fallo" -#: builtin/replace.c:254 +#: builtin/replace.c:258 #, c-format msgid "unable to open %s for reading" msgstr "no se pudo abrir %s para lectura" -#: builtin/replace.c:268 +#: builtin/replace.c:272 msgid "unable to spawn mktree" msgstr "no es posible generar mktree" -#: builtin/replace.c:272 +#: builtin/replace.c:276 msgid "unable to read from mktree" msgstr "no es posible leer de mktree" -#: builtin/replace.c:281 +#: builtin/replace.c:285 msgid "mktree reported failure" msgstr "mktree reportó un error" -#: builtin/replace.c:285 +#: builtin/replace.c:289 msgid "mktree did not return an object name" msgstr "mktree no devolvió un nombre de objeto" -#: builtin/replace.c:294 +#: builtin/replace.c:298 #, c-format msgid "unable to fstat %s" msgstr "incapaz de correr fstat %s" -#: builtin/replace.c:299 +#: builtin/replace.c:303 msgid "unable to write object to database" msgstr "incapaz de escribir el objeto en la base de datos" -#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 -#: builtin/replace.c:445 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, c-format msgid "not a valid object name: '%s'" msgstr "nombre de objeto no válido: '%s'" -#: builtin/replace.c:322 +#: builtin/replace.c:326 #, c-format msgid "unable to get object type for %s" msgstr "no es obtener tipo de objeto para %s" -#: builtin/replace.c:338 +#: builtin/replace.c:342 msgid "editing object file failed" msgstr "edición de archivo de objeto falló" -#: builtin/replace.c:347 +#: builtin/replace.c:351 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "nuevo objeto es igual al antiguo: '%s'" -#: builtin/replace.c:407 +#: builtin/replace.c:384 +#, c-format +msgid "could not parse %s as a commit" +msgstr "no se pudo analizar %s como un commit" + +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mal mergetag en commit '%s'" -#: builtin/replace.c:409 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "mergetag mal formado en commit '%s'" -#: builtin/replace.c:421 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -16382,31 +19679,31 @@ msgstr "" "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit " "en lugar de --graft" -#: builtin/replace.c:460 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "el commit original '%s' tiene una firma gpg" -#: builtin/replace.c:461 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" -msgstr "la firma será removida en el commit de reemplazo!" +msgstr "la firma será eliminada en el commit de reemplazo!" -#: builtin/replace.c:471 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no se pudo escribir el commit de reemplazo: '%s'" -#: builtin/replace.c:479 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft para '%s' innecesario" -#: builtin/replace.c:482 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "nuevo commit es le mismo que el antiguo: '%s'" -#: builtin/replace.c:515 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -16415,71 +19712,71 @@ msgstr "" "no se pudo convertir el siguiente graft(s):\n" "%s" -#: builtin/replace.c:536 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "listar replace refs" -#: builtin/replace.c:537 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "borrar replace refs" -#: builtin/replace.c:538 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "editar objeto existente" -#: builtin/replace.c:539 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "cambiar un padre de commit" -#: builtin/replace.c:540 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "convertir archivo graft existente" -#: builtin/replace.c:541 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "reemplazar el ref si este existe" -#: builtin/replace.c:543 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "no se puede imprimir contenidos para --edit" -#: builtin/replace.c:544 +#: builtin/replace.c:556 msgid "use this format" msgstr "usar este formato" -#: builtin/replace.c:557 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format no puede ser usado cuando no se hace listing" -#: builtin/replace.c:565 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f solo tiene sentido cuando se escribe un reemplazo" -#: builtin/replace.c:569 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw solo tiene sentido con --edit" -#: builtin/replace.c:575 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d necesita al menos un argumento" -#: builtin/replace.c:581 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "mal número de argumentos" -#: builtin/replace.c:587 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e necesita exactamente un argumento" -#: builtin/replace.c:593 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g necesita al menos un argumento" -#: builtin/replace.c:599 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file no toma argumentos" -#: builtin/replace.c:605 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "solo se puede dar un patrón con -l" @@ -16495,126 +19792,138 @@ msgstr "registrar resoluciones limpias en el índice" msgid "'git rerere forget' without paths is deprecated" msgstr "'git rerere forget' sin rutas está deprecado" -#: builtin/rerere.c:111 +#: builtin/rerere.c:113 #, c-format msgid "unable to generate diff for '%s'" msgstr "no es posible generar diff para '%s'" -#: builtin/reset.c:31 +#: builtin/reset.c:32 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c:32 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..." - #: builtin/reset.c:33 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]" +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<árbol-ismo>] [--] <pathspec>..." -#: builtin/reset.c:39 +#: builtin/reset.c:34 +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<árbol-ismo>]" + +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "git reset --patch [<árbol-ismo>] [--] [<pathspec>...]" + +#: builtin/reset.c:41 msgid "mixed" msgstr "mezclado" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "soft" msgstr "suave" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "hard" msgstr "duro" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "merge" msgstr "fusionar" -#: builtin/reset.c:39 +#: builtin/reset.c:41 msgid "keep" msgstr "mantener" -#: builtin/reset.c:80 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "No hay un HEAD válido." -#: builtin/reset.c:82 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "Falló al encontrar el HEAD del árbol." -#: builtin/reset.c:88 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "Falló al encontrar árbol de %s." -#: builtin/reset.c:192 +#: builtin/reset.c:115 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD está ahora en %s" + +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "No se puede realziar un reset %s en medio de una fusión." -#: builtin/reset.c:292 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" -#: builtin/reset.c:294 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "reiniciar HEAD e index" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "reiniciar solo HEAD" -#: builtin/reset.c:297 builtin/reset.c:299 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "reiniciar HEAD, índice y árbol de trabajo" -#: builtin/reset.c:301 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "reiniciar HEAD pero mantener cambios locales" -#: builtin/reset.c:307 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "" -"grabar solo el hecho de que las rutas removidas serán agregadas después" +"grabar solo el hecho de que las rutas eliminadas serán agregadas después" -#: builtin/reset.c:325 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Falló al resolver '%s' como una revisión válida." -#: builtin/reset.c:333 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Falló al resolver '%s' como un árbol válido." -#: builtin/reset.c:342 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch es incompatible con --{hard,mixed,soft}" -#: builtin/reset.c:351 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio." -#: builtin/reset.c:353 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "No se puede hacer un reset %s con rutas." -#: builtin/reset.c:363 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset no está permitido en un repositorio vacío" -#: builtin/reset.c:367 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" msgstr "-N sólo puede ser usada con --mixed" -#: builtin/reset.c:387 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "Cambios fuera del área de stage tras el reset:" -#: builtin/reset.c:390 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -16628,53 +19937,48 @@ msgstr "" "usar '--quiet' para evitar esto. Configura la opción reset.quiet a true\n" "para volverlo en el default.\n" -#: builtin/reset.c:400 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "No se puede reiniciar el índice a la revisión '%s'." -#: builtin/reset.c:404 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:403 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:461 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:464 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valor disperso inválido: '%s'" - -#: builtin/rev-list.c:505 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:508 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "conteo de marcas es incompatible con --objects" -#: builtin/rev-parse.c:407 +#: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]" -#: builtin/rev-parse.c:412 +#: builtin/rev-parse.c:413 msgid "keep the `--` passed as an arg" msgstr "mantener el `--` pasado como un arg" -#: builtin/rev-parse.c:414 +#: builtin/rev-parse.c:415 msgid "stop parsing after the first non-option argument" msgstr "detener análisis tras el primer argumento que no es opción" -#: builtin/rev-parse.c:417 +#: builtin/rev-parse.c:418 msgid "output in stuck long form" msgstr "salida en formulario largo de atasco" -#: builtin/rev-parse.c:550 +#: builtin/rev-parse.c:551 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -16705,72 +20009,81 @@ msgstr "git cherry-pick [<opciones>] <commit-ish>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <subcomando>" -#: builtin/revert.c:91 +#: builtin/revert.c:72 +#, c-format +msgid "option `%s' expects a number greater than zero" +msgstr "opción `%s' espera un valor numérico mayor a cero" + +#: builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s no puede ser usado con %s" -#: builtin/revert.c:100 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" msgstr "finalizar secuencia revert o cherry-pick" -#: builtin/revert.c:101 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" msgstr "resumir secuencia revert o cherry-pick" -#: builtin/revert.c:102 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" msgstr "cancelar secuencia revert o cherry-pick" -#: builtin/revert.c:103 +#: builtin/revert.c:105 +msgid "skip current commit and continue" +msgstr "saltar el commit actual y continuar" + +#: builtin/revert.c:107 msgid "don't automatically commit" msgstr "no realizar commit de forma automática" -#: builtin/revert.c:104 +#: builtin/revert.c:108 msgid "edit the commit message" msgstr "editar el mensaje de commit" -#: builtin/revert.c:107 +#: builtin/revert.c:111 msgid "parent-number" msgstr "número-de-padre" -#: builtin/revert.c:108 +#: builtin/revert.c:112 msgid "select mainline parent" msgstr "seleccionar el padre principal" -#: builtin/revert.c:110 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "estrategia de fusión" -#: builtin/revert.c:112 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "opción para estrategia de fusión" -#: builtin/revert.c:121 +#: builtin/revert.c:125 msgid "append commit name" msgstr "adjuntar el nombre del commit" -#: builtin/revert.c:123 +#: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "preservar commits iniciales vacíos" -#: builtin/revert.c:125 +#: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "mantener commits redundantes, vacíos" -#: builtin/revert.c:219 +#: builtin/revert.c:232 msgid "revert failed" msgstr "falló al revertir" -#: builtin/revert.c:232 +#: builtin/revert.c:245 msgid "cherry-pick failed" msgstr "cherry-pick falló" -#: builtin/rm.c:18 +#: builtin/rm.c:19 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<opciones>] [--] <archivo>..." -#: builtin/rm.c:206 +#: builtin/rm.c:207 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -16784,7 +20097,7 @@ msgstr[1] "" "los siguientes archivos tienen contenido diferente a los mismos\n" "y a HEAD:" -#: builtin/rm.c:211 +#: builtin/rm.c:212 msgid "" "\n" "(use -f to force removal)" @@ -16792,13 +20105,13 @@ msgstr "" "\n" "(usa -f para forzar su eliminación)" -#: builtin/rm.c:215 +#: builtin/rm.c:216 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "el siguiente archivo tiene cambios en stage en el índice:" msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:" -#: builtin/rm.c:219 builtin/rm.c:228 +#: builtin/rm.c:220 builtin/rm.c:229 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -16806,44 +20119,48 @@ msgstr "" "\n" "(usa --cached para conservar el archivo, o -f para forzar su eliminación)" -#: builtin/rm.c:225 +#: builtin/rm.c:226 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "el siguiente archivo tiene modificaciones locales:" msgstr[1] "los siguientes archivos tienen modificaciones locales:" -#: builtin/rm.c:241 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "no listar archivos eliminado" -#: builtin/rm.c:242 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "solo eliminar del índice" -#: builtin/rm.c:243 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "sobrescribir el check de actualizado" -#: builtin/rm.c:244 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "permitir eliminar de forma recursiva" -#: builtin/rm.c:246 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "salir con estado cero incluso si nada coincide" -#: builtin/rm.c:288 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "Se entregó un nuevo pathspec. ¿Qué archivos debería eliminar?" + +#: builtin/rm.c:305 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " "para proceder" -#: builtin/rm.c:306 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "no removiendo '%s' de manera recursiva sin -r" +msgstr "no eliminando '%s' de manera recursiva sin -r" -#: builtin/rm.c:345 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no es posible eliminar %s" @@ -16876,18 +20193,6 @@ msgstr "leer refs de stdin" msgid "print status from remote helper" msgstr "mostrar status del remote helper" -#: builtin/serve.c:7 -msgid "git serve [<options>]" -msgstr "git serve [<opciones>]" - -#: builtin/serve.c:17 builtin/upload-pack.c:23 -msgid "quit after a single request/response exchange" -msgstr "sale después de un intercambio petición/respuesta único" - -#: builtin/serve.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "salir inmediatamente tras anunciar capacidades" - #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" @@ -16920,7 +20225,7 @@ msgstr "<w>[,<i1>[,<i2>]]" msgid "Linewrap output" msgstr "Salida de línea" -#: builtin/shortlog.c:299 +#: builtin/shortlog.c:301 msgid "too many arguments given outside repository" msgstr "demasiados argumentos dados fuera del repositorio" @@ -16947,119 +20252,119 @@ msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorando %s; no se puede manejar más de %d ref" msgstr[1] "ignorando %s; no se puede manejar más de %d refs" -#: builtin/show-branch.c:549 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "no hay refs que concuerden con %s" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "mostrar ramas locales y de rastreo remoto" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "mostrar ramas de rastreo remoto" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "color '*!+-' correspondiendo a la rama" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "mostrar <n> commits más tras encontrar el ancestro común" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "sinónimo de más=-1" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "suprimir strings de nombre" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "incluir la rama actual" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "nombrar commits con sus nombres de objeto" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "mostrar bases de fusión posibles" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "mostrar refs inalcanzables por ningún otro ref" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "mostrar commits en orden topológico" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "mostrar solo commits que no están en la primera rama" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "mostrar fusiones alcanzables solo por una punta" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "orden topológico, manteniendo el orden de fechas donde sea posible" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base" -#: builtin/show-branch.c:712 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog no es compatible con --all, --remotes, --independent o --merge-base" -#: builtin/show-branch.c:736 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "no se dieron ramas, y el HEAD no es válido" -#: builtin/show-branch.c:739 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "opción --reflog necesita un nombre de rama" -#: builtin/show-branch.c:742 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "solo %d entrada puede ser mostrada a la vez." msgstr[1] "solo %d entradas pueden ser mostradas a la vez." -#: builtin/show-branch.c:746 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "no existe el ref %s" -#: builtin/show-branch.c:830 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "no se puede manejar más de %d rev." msgstr[1] "no se puede manejar más de %d revs." -#: builtin/show-branch.c:834 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' no es una ref válida." -#: builtin/show-branch.c:837 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "no se puede encontrar el commit %s (%s)" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -17067,42 +20372,349 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]" -#: builtin/show-ref.c:12 +#: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<patrón>]" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" msgstr "solo mostrar tags (puede ser combinado con heads)" -#: builtin/show-ref.c:162 +#: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" msgstr "solo mostrar heads (puede ser combinado con tags)" -#: builtin/show-ref.c:163 +#: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta" -#: builtin/show-ref.c:166 builtin/show-ref.c:168 +#: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" msgstr "mostrar la referencia de HEAD, incluso si se filtrara" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "dereference tags into object IDs" msgstr "tags de deferencia en IDs de objeto" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" msgstr "solo mostrar hash SHA1 usando <n> dígitos" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" msgstr "no mostrar resultados en stdout (útil con --verify)" -#: builtin/show-ref.c:178 +#: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" msgstr "mostrar refs de stdin que no están en el repositorio local" +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|disable) <opciones>" + +#: builtin/sparse-checkout.c:64 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" +"este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no " +"existe)" + +#: builtin/sparse-checkout.c:225 +msgid "failed to create directory for sparse-checkout file" +msgstr "falló al crear directorio para el archivo sparse-checkout" + +#: builtin/sparse-checkout.c:266 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "falló al configurar opción extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:283 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:302 +msgid "initialize the sparse-checkout in cone mode" +msgstr "inicializa el sparse-checkout en modo cono" + +#: builtin/sparse-checkout.c:308 +msgid "initialize sparse-checkout" +msgstr "inicializar sparse-checkout" + +#: builtin/sparse-checkout.c:341 +#, c-format +msgid "failed to open '%s'" +msgstr "falló al abrir '%s'" + +#: builtin/sparse-checkout.c:398 +#, c-format +msgid "could not normalize path %s" +msgstr "no se pudo normalizar la ruta %s" + +#: builtin/sparse-checkout.c:410 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" + +#: builtin/sparse-checkout.c:435 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "no es posible dequote para la cadena de estilo C '%s'" + +#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +msgid "unable to load existing sparse-checkout patterns" +msgstr "no se pudo cargar patrones de sparse-checkout existentes" + +#: builtin/sparse-checkout.c:558 +msgid "read patterns from standard in" +msgstr "leer patrones de standard in" + +#: builtin/sparse-checkout.c:564 +msgid "set sparse-checkout patterns" +msgstr "configurar patrones de sparse-checkout" + +#: builtin/sparse-checkout.c:581 +msgid "disable sparse-checkout" +msgstr "deshabilitar sparse-checkout" + +#: builtin/sparse-checkout.c:593 +msgid "error while refreshing working directory" +msgstr "error al refrescar directorio de trabajo" + +#: builtin/stash.c:22 builtin/stash.c:38 +msgid "git stash list [<options>]" +msgstr "git stash list [<opciones>]" + +#: builtin/stash.c:23 builtin/stash.c:43 +msgid "git stash show [<options>] [<stash>]" +msgstr "git stash show [<opciones>] [<stash>]" + +#: builtin/stash.c:24 builtin/stash.c:48 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "git stash drop [-q|--quiet] [<stash>]" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:26 builtin/stash.c:63 +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <nombre-rama> [<stash>]" + +#: builtin/stash.c:27 builtin/stash.c:68 +msgid "git stash clear" +msgstr "git stash clear" + +#: builtin/stash.c:28 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" +" [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]]" + +#: builtin/stash.c:32 builtin/stash.c:85 +msgid "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<message>]" +msgstr "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<mensaje>]" + +#: builtin/stash.c:53 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:58 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:73 +msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>" + +#: builtin/stash.c:78 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" +" [--] [<pathspec>...]]" + +#: builtin/stash.c:128 +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "'%s' no es un commit estilo stash" + +#: builtin/stash.c:148 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "Se especificaron demasiadas revisiones: %s" + +#: builtin/stash.c:162 git-legacy-stash.sh:549 +msgid "No stash entries found." +msgstr "No se encontraron entradas de stash." + +#: builtin/stash.c:176 +#, c-format +msgid "%s is not a valid reference" +msgstr "%s no es una referencia válida" + +#: builtin/stash.c:225 git-legacy-stash.sh:75 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear con parámetros no está implementado" + +#: builtin/stash.c:404 +msgid "cannot apply a stash in the middle of a merge" +msgstr "no se puede aplicar un stash en medio de un merge" + +#: builtin/stash.c:415 +#, c-format +msgid "could not generate diff %s^!." +msgstr "no se pudo generar diff %s^!." + +#: builtin/stash.c:422 +msgid "conflicts in index.Try without --index." +msgstr "conflictos en índice. Intente sin --index." + +#: builtin/stash.c:428 +msgid "could not save index tree" +msgstr "no se puede guardar el índice del árbol" + +#: builtin/stash.c:437 +msgid "could not restore untracked files from stash" +msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" + +#: builtin/stash.c:451 +#, c-format +msgid "Merging %s with %s" +msgstr "Fusionando %s con %s" + +#: builtin/stash.c:461 git-legacy-stash.sh:681 +msgid "Index was not unstashed." +msgstr "El índice no fue sacado de stash." + +#: builtin/stash.c:522 builtin/stash.c:621 +msgid "attempt to recreate the index" +msgstr "intento de recrear el index" + +#: builtin/stash.c:555 +#, c-format +msgid "Dropped %s (%s)" +msgstr "Botado %s (%s)" + +#: builtin/stash.c:558 +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "%s: No se pudo borrar entrada stash" + +#: builtin/stash.c:583 +#, c-format +msgid "'%s' is not a stash reference" +msgstr "'%s' no es una referencia stash" + +#: builtin/stash.c:633 git-legacy-stash.sh:695 +msgid "The stash entry is kept in case you need it again." +msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." + +#: builtin/stash.c:656 git-legacy-stash.sh:713 +msgid "No branch name specified" +msgstr "No se especificó el nombre de la rama" + +#: builtin/stash.c:796 builtin/stash.c:833 +#, c-format +msgid "Cannot update %s with %s" +msgstr "No se puede actualizar %s con %s" + +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +msgid "stash message" +msgstr "mensaje de stash" + +#: builtin/stash.c:824 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" requiere un argumento <commit>" + +#: builtin/stash.c:1049 git-legacy-stash.sh:218 +msgid "No changes selected" +msgstr "Sin cambios seleccionados" + +#: builtin/stash.c:1149 git-legacy-stash.sh:150 +msgid "You do not have the initial commit yet" +msgstr "Aún no tienes un commit inicial" + +#: builtin/stash.c:1176 git-legacy-stash.sh:165 +msgid "Cannot save the current index state" +msgstr "No se puede guardar el estado actual del índice" + +#: builtin/stash.c:1185 git-legacy-stash.sh:180 +msgid "Cannot save the untracked files" +msgstr "No se pueden guardar los archivos no rastreados" + +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 +#: git-legacy-stash.sh:214 +msgid "Cannot save the current worktree state" +msgstr "No se puede guardar el estado actual del árbol de trabajo" + +#: builtin/stash.c:1233 git-legacy-stash.sh:234 +msgid "Cannot record working tree state" +msgstr "No se puede grabar el estado del árbol de trabajo" + +#: builtin/stash.c:1282 git-legacy-stash.sh:338 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" + +#: builtin/stash.c:1298 +msgid "Did you forget to 'git add'?" +msgstr "¿Olvidaste 'git add'?" + +#: builtin/stash.c:1313 git-legacy-stash.sh:346 +msgid "No local changes to save" +msgstr "No hay cambios locales para guardar" + +#: builtin/stash.c:1320 git-legacy-stash.sh:351 +msgid "Cannot initialize stash" +msgstr "No se puede inicializar stash" + +#: builtin/stash.c:1335 git-legacy-stash.sh:355 +msgid "Cannot save the current status" +msgstr "No se puede guardar el estado actual" + +#: builtin/stash.c:1340 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "Directorio de trabajo guardado y estado de índice %s" + +#: builtin/stash.c:1430 git-legacy-stash.sh:385 +msgid "Cannot remove worktree changes" +msgstr "No se pueden eliminar cambios del árbol de trabajo" + +#: builtin/stash.c:1469 builtin/stash.c:1534 +msgid "keep index" +msgstr "mantener index" + +#: builtin/stash.c:1471 builtin/stash.c:1536 +msgid "stash in patch mode" +msgstr "stash en modo patch" + +#: builtin/stash.c:1472 builtin/stash.c:1537 +msgid "quiet mode" +msgstr "modo tranquilo" + +#: builtin/stash.c:1474 builtin/stash.c:1539 +msgid "include untracked files in stash" +msgstr "incluir archivos sin seguimiento en stash" + +#: builtin/stash.c:1476 builtin/stash.c:1541 +msgid "include ignore files" +msgstr "incluir archivos ignorados" + +#: builtin/stash.c:1600 +#, c-format +msgid "could not exec %s" +msgstr "no se pudo ejecutar %s" + #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" @@ -17111,49 +20723,49 @@ msgstr "git stripspace [-s | --strip-comments]" msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:36 +#: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" msgstr "" "saltar y borrar todas las líneas que comienzan con un carácter de comentario" -#: builtin/stripspace.c:39 +#: builtin/stripspace.c:40 msgid "prepend comment character and space to each line" msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1939 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" -#: builtin/submodule--helper.c:61 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "subomdule--helper print-default-remote no toma argumentos" -#: builtin/submodule--helper.c:99 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:412 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626 -#: builtin/submodule--helper.c:649 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" -#: builtin/submodule--helper.c:521 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Entrando '%s'\n" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -17162,7 +20774,7 @@ msgstr "" "run_command devolvió estado no-cero para %s\n" "." -#: builtin/submodule--helper.c:545 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -17173,19 +20785,19 @@ msgstr "" "anidados de %s\n" "." -#: builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Suprime la salida al inicializar cada comando de submódulo" -#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 msgid "Recurse into nested submodules" msgstr "Recursar en submódulos anidados" -#: builtin/submodule--helper.c:568 -msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] <ruta>" +#: builtin/submodule--helper.c:572 +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:595 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -17194,57 +20806,57 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:663 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Error al registrar el modo de actualización para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:706 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "Suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:711 -msgid "git submodule--helper init [<path>]" -msgstr "git submodule--helper init [<ruta>]" +#: builtin/submodule--helper.c:715 +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:822 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:849 builtin/submodule--helper.c:1018 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 msgid "Suppress submodule status output" msgstr "Suprimir output del estado del submódulo" -#: builtin/submodule--helper.c:874 +#: builtin/submodule--helper.c:889 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -17252,56 +20864,56 @@ msgstr "" "Usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:875 +#: builtin/submodule--helper.c:890 msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -#: builtin/submodule--helper.c:880 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:904 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:983 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:974 +#: builtin/submodule--helper.c:989 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:988 +#: builtin/submodule--helper.c:1003 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" -#: builtin/submodule--helper.c:999 +#: builtin/submodule--helper.c:1014 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "error al actualizar el remoto para el submódulo '%s'" -#: builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:1061 msgid "Suppress output of synchronizing submodule url" msgstr "Suprime la salida del url del submódulo que se sincroniza" -#: builtin/submodule--helper.c:1053 +#: builtin/submodule--helper.c:1068 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1122 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" -"rf' si realmente quiere eliminarlo incluyendo todo en su historia)" +"rf' si realmente quieres eliminarlo incluyendo todo en su historia)" -#: builtin/submodule--helper.c:1119 +#: builtin/submodule--helper.c:1134 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -17310,225 +20922,262 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1127 +#: builtin/submodule--helper.c:1142 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1144 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" -#: builtin/submodule--helper.c:1138 +#: builtin/submodule--helper.c:1155 #, c-format msgid "could not create empty submodule directory %s" msgstr "no se pudo crear directorio vacío de submódulo %s" -#: builtin/submodule--helper.c:1154 +#: builtin/submodule--helper.c:1171 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:1183 +#: builtin/submodule--helper.c:1200 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -"Remover arboles de trabajo de submódulos incluso si contienen cambios locales" +"Remover árboles de trabajo de submódulos incluso si contienen cambios locales" -#: builtin/submodule--helper.c:1184 +#: builtin/submodule--helper.c:1201 msgid "Unregister all submodules" msgstr "Quitar todos los submódulos" -#: builtin/submodule--helper.c:1189 +#: builtin/submodule--helper.c:1206 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1203 +#: builtin/submodule--helper.c:1220 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" -#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1289 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" +"Una alternativa calculada a partir de la alternativa de un superproyecto no " +"es válida.\n" +"Para permitir que Git clone sin una alternativa en ese caso, establezca\n" +"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clonar " +"con\n" +"'--reference-if-able' en lugar de '--reference'." + +#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1367 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1343 +#: builtin/submodule--helper.c:1374 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1366 +#: builtin/submodule--helper.c:1398 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1369 +#: builtin/submodule--helper.c:1401 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1372 +#: builtin/submodule--helper.c:1404 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1412 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868 +#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +msgid "disallow cloning into non-empty directory" +msgstr "no permitir clonar en directorios no vacíos" + +#: builtin/submodule--helper.c:1424 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference " -"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " -"<ruta>" +"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" +"url <url> --path <ruta>" + +#: builtin/submodule--helper.c:1449 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo" -#: builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1460 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clon de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:1433 +#: builtin/submodule--helper.c:1464 +#, c-format +msgid "directory not empty: '%s'" +msgstr "directorio no está vacío: '%s'" + +#: builtin/submodule--helper.c:1476 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no se pudo obtener el directorio de submódulo para '%s'" -#: builtin/submodule--helper.c:1469 +#: builtin/submodule--helper.c:1512 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Modo de actualización inválido '%s' para ruta de submodulo '%s'" +msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1473 +#: builtin/submodule--helper.c:1516 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -"Modo de actualización inválido '%s' configurado para ruta de submodulo '%s'" +"Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1617 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:1570 +#: builtin/submodule--helper.c:1621 msgid "Maybe you want to use 'update --init'?" -msgstr "Tal vez quiere usar 'update --init'?" +msgstr "¿Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:1600 +#: builtin/submodule--helper.c:1651 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:1629 +#: builtin/submodule--helper.c:1680 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:1773 +#: builtin/submodule--helper.c:1830 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1784 +#: builtin/submodule--helper.c:1841 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089 +#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:1850 +#: builtin/submodule--helper.c:1906 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1910 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1860 +#: builtin/submodule--helper.c:1916 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncado al número especificado de revisión" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1919 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1865 +#: builtin/submodule--helper.c:1921 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación superficial" -#: builtin/submodule--helper.c:1866 +#: builtin/submodule--helper.c:1922 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1873 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" +#: builtin/submodule--helper.c:1933 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1946 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1934 +#: builtin/submodule--helper.c:1994 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -"Rama de submódulo (%s) configurada para heredar rama del superproyecto, " -"pero el superproyecto no está en ninguna rama" +"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " +"el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2057 +#: builtin/submodule--helper.c:2117 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no se pudo conseguir un handle para el submódulo '%s'" -#: builtin/submodule--helper.c:2090 +#: builtin/submodule--helper.c:2150 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2096 -msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "git submodule--helper embed-git-dir [<ruta>...]" +#: builtin/submodule--helper.c:2156 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2152 +#: builtin/submodule--helper.c:2212 msgid "check if it is safe to write to the .gitmodules file" msgstr "revisar is es seguro escribir el archivo .gitmodules" -#: builtin/submodule--helper.c:2157 -msgid "git submodule--helper config name [value]" -msgstr "git submodule--helper config name <valor>" +#: builtin/submodule--helper.c:2215 +msgid "unset the config in the .gitmodules file" +msgstr "desconfigura la opción en elarchivo .gitmodules" + +#: builtin/submodule--helper.c:2220 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <nombre> [<valor>]" + +#: builtin/submodule--helper.c:2221 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2158 +#: builtin/submodule--helper.c:2222 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2175 git-submodule.sh:169 +#: builtin/submodule--helper.c:2241 git-submodule.sh:174 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo" -#: builtin/submodule--helper.c:2225 +#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2231 +#: builtin/submodule--helper.c:2297 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' no es un comando submodule--helper valido" +msgstr "'%s' no es un comando submodule--helper válido" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -17560,17 +21209,17 @@ msgstr "razón de la actualización" #: builtin/tag.c:25 msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] " -"<nombre-de-tag> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <archivo>]\n" +"\t\t<nombre-tag> [<head>]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <nombre-de-tag>..." -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -17580,21 +21229,21 @@ msgstr "" "points-at <objeto>]\n" "\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]" -#: builtin/tag.c:29 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..." -#: builtin/tag.c:87 +#: builtin/tag.c:89 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' no encontrado." -#: builtin/tag.c:103 +#: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Etiqueta '%s' eliminada (era %s)\n" -#: builtin/tag.c:133 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -17607,7 +21256,7 @@ msgstr "" " %s\n" "Las líneas que comienzan con '%c' serán ignoradas.\n" -#: builtin/tag.c:137 +#: builtin/tag.c:139 #, c-format msgid "" "\n" @@ -17622,351 +21271,368 @@ msgstr "" "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por " "ti mismo si quieres hacerlo.\n" -#: builtin/tag.c:191 +#: builtin/tag.c:198 msgid "unable to sign the tag" msgstr "incapaz de firmar tag" -#: builtin/tag.c:193 +#: builtin/tag.c:200 msgid "unable to write tag file" msgstr "incapaz de escribir el archivo de tag" -#: builtin/tag.c:218 +#: builtin/tag.c:216 +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new tag is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" +"Has creado un tag anidado. El objeto referido por el nuevo tag ya\n" +"es un tag. Si quisiste hacer el tag al objeto que apunta, usa:\n" +"\n" +"\tgit tag -f %s %s^{}" + +#: builtin/tag.c:232 msgid "bad object type." msgstr "tipo de objeto erróneo." -#: builtin/tag.c:267 +#: builtin/tag.c:284 msgid "no tag message?" msgstr "¿Sin mensaje de tag?" -#: builtin/tag.c:274 +#: builtin/tag.c:291 #, c-format msgid "The tag message has been left in %s\n" msgstr "El mensaje del tag ha sido dejado en %s\n" -#: builtin/tag.c:385 +#: builtin/tag.c:402 msgid "list tag names" msgstr "listar nombres de tags" -#: builtin/tag.c:387 +#: builtin/tag.c:404 msgid "print <n> lines of each tag message" msgstr "imprimir <n> líneas de cada mensaje de tag" -#: builtin/tag.c:389 +#: builtin/tag.c:406 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:390 +#: builtin/tag.c:407 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:392 +#: builtin/tag.c:409 msgid "Tag creation options" msgstr "Opciones de creación de tags" -#: builtin/tag.c:394 +#: builtin/tag.c:411 msgid "annotated tag, needs a message" msgstr "tags anotadas necesitan un mensaje" -#: builtin/tag.c:396 +#: builtin/tag.c:413 msgid "tag message" msgstr "mensaje de tag" -#: builtin/tag.c:398 +#: builtin/tag.c:415 msgid "force edit of tag message" msgstr "forzar la edición del mensaje de tag" -#: builtin/tag.c:399 +#: builtin/tag.c:416 msgid "annotated and GPG-signed tag" msgstr "tag anotado y firmado con GPG" -#: builtin/tag.c:403 +#: builtin/tag.c:419 msgid "use another key to sign the tag" msgstr "usar otra clave para firmar el tag" -#: builtin/tag.c:404 +#: builtin/tag.c:420 msgid "replace the tag if exists" msgstr "remplazar tag si existe" -#: builtin/tag.c:405 builtin/update-ref.c:369 +#: builtin/tag.c:421 builtin/update-ref.c:369 msgid "create a reflog" msgstr "crear un reflog" -#: builtin/tag.c:407 +#: builtin/tag.c:423 msgid "Tag listing options" msgstr "Opciones de listado de tag" -#: builtin/tag.c:408 +#: builtin/tag.c:424 msgid "show tag list in columns" msgstr "mostrar lista de tags en columnas" -#: builtin/tag.c:409 builtin/tag.c:411 +#: builtin/tag.c:425 builtin/tag.c:427 msgid "print only tags that contain the commit" msgstr "mostrar solo tags que contienen el commit" -#: builtin/tag.c:410 builtin/tag.c:412 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that don't contain the commit" msgstr "mostrar solo tags que no contienen el commit" -#: builtin/tag.c:413 +#: builtin/tag.c:429 msgid "print only tags that are merged" msgstr "sólo imprimir las tags que están fusionadas" -#: builtin/tag.c:414 +#: builtin/tag.c:430 msgid "print only tags that are not merged" msgstr "sólo imprimir las tags que no están fusionadas" -#: builtin/tag.c:419 +#: builtin/tag.c:434 msgid "print only tags of the object" msgstr "sólo imprimir tags de el objeto" -#: builtin/tag.c:463 +#: builtin/tag.c:482 msgid "--column and -n are incompatible" msgstr "--column y -n son incompatibles" -#: builtin/tag.c:485 +#: builtin/tag.c:504 msgid "-n option is only allowed in list mode" msgstr "opción -n solo es permitida en modo lista" -#: builtin/tag.c:487 +#: builtin/tag.c:506 msgid "--contains option is only allowed in list mode" msgstr "opción --contains solo es permitido en modo lista" -#: builtin/tag.c:489 +#: builtin/tag.c:508 msgid "--no-contains option is only allowed in list mode" msgstr "opción --no-contains solo es permitida en modo lista" -#: builtin/tag.c:491 +#: builtin/tag.c:510 msgid "--points-at option is only allowed in list mode" msgstr "opción --points-at solo es permitida en modo lista" -#: builtin/tag.c:493 +#: builtin/tag.c:512 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" -#: builtin/tag.c:504 +#: builtin/tag.c:523 msgid "only one -F or -m option is allowed." msgstr "sólo se permite una de las opciones, -m ó -F." -#: builtin/tag.c:523 +#: builtin/tag.c:542 msgid "too many params" msgstr "demasiados parámetros" -#: builtin/tag.c:529 +#: builtin/tag.c:548 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no es un nombre de tag válido." -#: builtin/tag.c:534 +#: builtin/tag.c:553 #, c-format msgid "tag '%s' already exists" msgstr "el tag '%s' ya existe" -#: builtin/tag.c:565 +#: builtin/tag.c:584 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Desempaquetando objetos" -#: builtin/update-index.c:82 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "falló al crear directorio %s" -#: builtin/update-index.c:98 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "falló al crear el archivo %s" -#: builtin/update-index.c:106 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "falló al eliminar el archivo %s" -#: builtin/update-index.c:113 builtin/update-index.c:219 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "falló al eliminar directorio %s" -#: builtin/update-index.c:138 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Probando mtime en '%s' " -#: builtin/update-index.c:152 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo" -#: builtin/update-index.c:165 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" "info de estado del directorio no cambia tras agregar un nuevo directorio" -#: builtin/update-index.c:178 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "info de estado del directorio cambia tras actualizar un archivo" -#: builtin/update-index.c:189 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "info de estado del directorio cambia tras agregar un archivo dentro del " "subdirectorio" -#: builtin/update-index.c:200 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "info de estado del directorio no cambia tras borrar un archivo" -#: builtin/update-index.c:213 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "info de estado del directorio no cambia tras borrar un directorio" -#: builtin/update-index.c:220 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:588 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opciones>] [--] [<archivo>...]" -#: builtin/update-index.c:961 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "continuar refresh (Actualización) incluso cuando el índice necesita " "actualización" -#: builtin/update-index.c:964 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: ignora submódulos" -#: builtin/update-index.c:967 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "no ignorar archivos nuevos" -#: builtin/update-index.c:969 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "permitir que archivos remplacen directorios y vice-versa" -#: builtin/update-index.c:971 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "avisar de archivos faltando en el árbol de trabajo" -#: builtin/update-index.c:973 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios" -#: builtin/update-index.c:976 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "refresh información de estado" -#: builtin/update-index.c:980 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, pero ignora configuración assume-unchanged" -#: builtin/update-index.c:984 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<ruta>" -#: builtin/update-index.c:985 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "agregar la entrada especificada al índice" -#: builtin/update-index.c:994 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "marcar archivos como \"not changing\"" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "limpiar bit assumed-unchanged" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "marcar archivos como \"index-only\"" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "limpiar bit skip-worktree" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "no tocar entradas index-only" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "" "agregar solo al índice; no agregar contenido a la base de datos de objetos" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "" "eliminar rutas nombradas incluso si están presentes en el árbol de trabajo" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" -msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos" +msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "leer la lista de rutas para ser actualizada desde standard input" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "agregar entradas de standard input al índice" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repoblar stages #2 y #3 para las rutas listadas" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "solo actualizar entradas que difieren de HEAD" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorar archivos faltantes en el árbol de trabajo" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "reportar acciones por standard output" -#: builtin/update-index.c:1033 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" -#: builtin/update-index.c:1037 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "escribir índice en este formato" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "activar o desactivar índice dividido" -#: builtin/update-index.c:1041 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "habilitar o deshabilitar caché no rastreado" -#: builtin/update-index.c:1043 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "probar si el filesystem soporta caché no rastreado" -#: builtin/update-index.c:1045 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "habilitar caché no rastreado sin probar el filesystem" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "escribir el índice incluso si no está marcado como cambiado" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "activar o desactivar monitor de sistema de archivos" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "marcar archivos como válidos para fsmonitor" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "limpia el bit de validación fsmonitor" -#: builtin/update-index.c:1153 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -17974,7 +21640,7 @@ msgstr "" "core.splitIndex está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el índice partido" -#: builtin/update-index.c:1162 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -17982,7 +21648,7 @@ msgstr "" "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente " "quieres deshabilitar el índice partido" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -17990,11 +21656,11 @@ msgstr "" "core.untrackedCache está configurado en true; remuévelo o cámbialo, si " "realmente quieres deshabilitar el chaché no rastreado" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Caché no rastreado deshabilitado" -#: builtin/update-index.c:1185 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -18002,29 +21668,29 @@ msgstr "" "core.untrackedCache está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el caché no rastreado" -#: builtin/update-index.c:1189 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Caché no rastreado habilitado para '%s'" -#: builtin/update-index.c:1197 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor no está configurado; actívalo si realmente quieres habilitar " "fsmonitor" -#: builtin/update-index.c:1201 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor activado" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar " "el fsmonitor" -#: builtin/update-index.c:1208 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor desactivado" @@ -18070,6 +21736,10 @@ msgstr "actualiza los archivos info desde cero" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opciones>] <directorio>" +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "sale después de un intercambio petición/respuesta único" + #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "salir inmediatamente tras el anuncio inicial de ref" @@ -18082,15 +21752,15 @@ msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrumpir transferencia tras <n> segundos de inactividad" -#: builtin/verify-commit.c:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." -#: builtin/verify-commit.c:76 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "imprimir contenido del commit" -#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "muestra la salida de status gpg en formato raw" @@ -18106,11 +21776,11 @@ msgstr "verboso" msgid "show statistics only" msgstr "solo mostrar estadísticas" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "imprimir contenido del tag" @@ -18142,7 +21812,7 @@ msgstr "git worktree remove [<opciones>] <worktree>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:60 builtin/worktree.c:871 +#: builtin/worktree.c:60 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "falló al borrar '%s'" @@ -18195,12 +21865,12 @@ msgstr "expirar árboles de trabajo más viejos a <tiempo>" msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:251 +#: builtin/worktree.c:244 #, c-format msgid "unable to re-add worktree '%s'" msgstr "no es posible volver a agregar el árbol '%s'" -#: builtin/worktree.c:256 +#: builtin/worktree.c:249 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -18210,7 +21880,7 @@ msgstr "" "usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:258 +#: builtin/worktree.c:251 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -18219,124 +21889,124 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:309 +#: builtin/worktree.c:301 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:428 builtin/worktree.c:434 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:430 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)" -#: builtin/worktree.c:439 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:445 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:486 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " "trabajo" -#: builtin/worktree.c:489 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:491 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:493 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:494 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:497 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:500 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#: builtin/worktree.c:508 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:569 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" -#: builtin/worktree.c:669 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772 -#: builtin/worktree.c:899 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:683 builtin/worktree.c:716 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:688 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:690 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:718 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:743 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado" -#: builtin/worktree.c:751 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:774 builtin/worktree.c:901 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:779 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no se pudo descubrir el nombre de destino de '%s'" -#: builtin/worktree.c:785 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "el objetivo '%s' ya existe" -#: builtin/worktree.c:793 +#: builtin/worktree.c:813 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -18345,7 +22015,7 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:795 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -18353,36 +22023,37 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:798 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "falló validación, no se puede mover el árbol de trabajo: %s" -#: builtin/worktree.c:803 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:851 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:855 +#: builtin/worktree.c:875 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' está sucio, use --force para borrarlo" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "" +"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo" -#: builtin/worktree.c:860 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no se pudo ejecutar 'git status' en '%s', código %d" -#: builtin/worktree.c:883 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:906 +#: builtin/worktree.c:926 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -18391,7 +22062,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:908 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -18399,28 +22070,43 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:911 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" -#: builtin/write-tree.c:14 +#: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "<prefix>/" msgstr "<prefijo>/" -#: builtin/write-tree.c:28 +#: builtin/write-tree.c:29 msgid "write tree object for a subdirectory <prefix>" msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" -#: builtin/write-tree.c:30 +#: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "sólo útil para depurar" -#: credential-cache--daemon.c:222 +#: fast-import.c:3125 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Se esperaba comando 'mark', se obtuvo %s" + +#: fast-import.c:3130 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Se esperaba comando 'to', se obtuvo %s" + +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "característica '%s' prohibida en input sin --allow-unsafe-features" + +#: credential-cache--daemon.c:223 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -18428,13 +22114,13 @@ msgid "" "\n" "\tchmod 0700 %s" msgstr "" -"Los permisos en su directorio de socket son demasiado flojos; otros\n" -"usuarios pueden leer sus credenciales almacenadas en caché. Considere " +"Los permisos en tu directorio de socket son demasiado flojos; otros\n" +"usuarios pueden leer sus credenciales almacenadas en caché. Considera " "ejecutar:\n" "\n" "\tchmod 0700 %s" -#: credential-cache--daemon.c:271 +#: credential-cache--daemon.c:272 msgid "print debugging messages to stderr" msgstr "mostrar mensajes de debug en stderr" @@ -18447,6 +22133,14 @@ msgstr "commit %s no está marcado como alcanzable" msgid "too many commits marked reachable" msgstr "demasiados commits marcados como alcanzables" +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<opciones>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "salir inmediatamente tras anunciar capacidades" + #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -18467,101 +22161,155 @@ msgstr "" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept." +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." msgstr "" "'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n" "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n" -"para leer sobre un subcomando o concepto específico." +"para leer sobre un subcomando o concepto específico.\n" +"Mira 'git help git' para una vista general del sistema." -#: git.c:173 +#: git.c:186 #, c-format msgid "no directory given for --git-dir\n" msgstr "no se entregó directorio para --git-dir\n" -#: git.c:187 +#: git.c:200 #, c-format msgid "no namespace given for --namespace\n" msgstr "no se entregó namespace para --namespace\n" -#: git.c:201 +#: git.c:214 #, c-format msgid "no directory given for --work-tree\n" msgstr "no se entregó directorio para --work-tree\n" -#: git.c:215 +#: git.c:228 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "no se entregó prefijo para --super-prefix\n" -#: git.c:237 +#: git.c:250 #, c-format msgid "-c expects a configuration string\n" msgstr "-c espera un string de configuración\n" -#: git.c:275 +#: git.c:288 #, c-format msgid "no directory given for -C\n" msgstr "no se entregó directorio para -C\n" -#: git.c:300 +#: git.c:314 #, c-format msgid "unknown option: %s\n" msgstr "opción %s desconocida\n" -#: git.c:719 +#: git.c:360 +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "al expandir el alias '%s':'%s'" + +#: git.c:369 +#, c-format +msgid "" +"alias '%s' changes environment variables.\n" +"You can use '!git' in the alias to do this" +msgstr "" +"alias '%s' cambia las variables de entorno.\n" +"Puedes usar '!git' en el alias para hacer esto" + +#: git.c:376 +#, c-format +msgid "empty alias for %s" +msgstr "alias vacío para %s" + +#: git.c:379 +#, c-format +msgid "recursive alias: %s" +msgstr "alias recursivo: %s" + +#: git.c:459 +msgid "write failure on standard output" +msgstr "error de escritura en standard output" + +#: git.c:461 +msgid "unknown write failure on standard output" +msgstr "error desconocido de escritura en standard output" + +#: git.c:463 +msgid "close failed on standard output" +msgstr "cierre falló en standard output" + +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "bucle de alias detectado: expansión de '%s' no termina: %s" -#: git.c:802 +#: git.c:843 +#, c-format +msgid "cannot handle %s as a builtin" +msgstr "no se puede manejar %s como un builtin" + +#: git.c:856 +#, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "" +"uso: %s\n" +"\n" +"\n" +"\n" + +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n" -#: git.c:814 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "falló al ejecutar comando '%s': %s\n" -#: http.c:374 +#: http.c:378 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negativo para http.postbuffer; poniendo el default a %d" -#: http.c:395 +#: http.c:399 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegación de control no es soportada con cURL < 7.22.0" -#: http.c:404 +#: http.c:408 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0" -#: http.c:837 +#: http.c:876 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0" -#: http.c:910 +#: http.c:949 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Restricción de protocolo no soportada con cURL < 7.19.4" -#: http.c:1046 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:" -#: http.c:1053 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "No se pudo configurar backend SSL a '%s': cURL fue construido sin backends " "SSL" -#: http.c:1057 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "No se pudo configurar backend SSL para '%s': ya configurado" -#: http.c:1921 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -18572,39 +22320,183 @@ msgstr "" " preguntaba por: %s\n" " redireccionamiento: %s" -#: remote-curl.c:401 +#: remote-curl.c:166 +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "quoting inválido en valor de push-option: '%s'" + +#: remote-curl.c:263 +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?" + +#: remote-curl.c:364 +msgid "invalid server response; expected service, got flush packet" +msgstr "" +"respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush " +"packet" + +#: remote-curl.c:395 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "respuesta de servidor inválida; se obtuvo '%s'" + +#: remote-curl.c:455 +#, c-format +msgid "repository '%s' not found" +msgstr "repositorio '%s' no encontrado" + +#: remote-curl.c:459 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "Autenticación falló para '%s'" + +#: remote-curl.c:463 +#, c-format +msgid "unable to access '%s': %s" +msgstr "no es posible acceder '%s':%s" + +#: remote-curl.c:469 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: list-objects-filter-options.h:60 +#: remote-curl.c:593 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "no debería tener EOF cuando no es gentil en EOF" + +#: remote-curl.c:673 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "" +"no es posible rebobinar rpc post data - intenta incrementando http.postBuffer" + +#: remote-curl.c:733 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC falló; %s" + +#: remote-curl.c:773 +msgid "cannot handle pushes this big" +msgstr "no se puede manejar pushes tan grandes" + +#: remote-curl.c:888 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "no se puede desinflar el request; zlib deflate error %d" + +#: remote-curl.c:892 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "no se puede desinflar el request; zlib end error %d" + +#: remote-curl.c:1023 +msgid "dumb http transport does not support shallow capabilities" +msgstr "dump http transport no soporta capacidades superficiales" + +#: remote-curl.c:1038 +msgid "fetch failed." +msgstr "fetch falló." + +#: remote-curl.c:1086 +msgid "cannot fetch by sha1 over smart http" +msgstr "no se puede hacer fetch por sha1 sobre smart http" + +#: remote-curl.c:1130 remote-curl.c:1136 +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" + +#: remote-curl.c:1148 remote-curl.c:1263 +#, c-format +msgid "http transport does not support %s" +msgstr "http transport no soporta %s" + +#: remote-curl.c:1184 +msgid "git-http-push failed" +msgstr "git-http-push falló" + +#: remote-curl.c:1369 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" + +#: remote-curl.c:1401 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl: error leyendo command stream de git" + +#: remote-curl.c:1408 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl: fetch intentado sin un repositorio local" + +#: remote-curl.c:1448 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl: comando '%s' desconocido de git" + +#: list-objects-filter-options.h:85 msgid "args" msgstr "args" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "filtrado de objeto" -#: parse-options.h:154 +#: parse-options.h:183 msgid "expiry-date" msgstr "fecha de expiración" -#: parse-options.h:169 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "no-op (compatibilidad con versiones anteriores)" -#: parse-options.h:261 +#: parse-options.h:309 msgid "be more verbose" -msgstr "ser mas verboso" +msgstr "ser más verboso" -#: parse-options.h:263 +#: parse-options.h:311 msgid "be more quiet" -msgstr "ser mas discreto" +msgstr "ser más discreto" -#: parse-options.h:269 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> dígitos para mostrar SHA-1s" +#: parse-options.h:336 +msgid "how to strip spaces and #comments from message" +msgstr "cómo quitar espacios y #comentarios de mensajes" + +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "leer pathspec de archivo" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" +"con --pathspec-from-file, elementos de pathspec son separados con caracter " +"NUL" + +#: ref-filter.h:101 +msgid "key" +msgstr "clave" + +#: ref-filter.h:101 +msgid "field name to sort on" +msgstr "nombre del campo por el cuál ordenar" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"actualizar el índice con la resolución de conflictos reutilizada si es " +"posible" + +#: wt-status.h:67 +msgid "HEAD detached at " +msgstr "HEAD desacoplada en " + +#: wt-status.h:68 +msgid "HEAD detached from " +msgstr "HEAD desacoplada de " + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Agrega contenido de carpetas al índice" @@ -18865,8 +22757,8 @@ msgid "Instantly browse your working repository in gitweb" msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb" #: command-list.h:113 -msgid "add or parse structured information in commit messages" -msgstr "agregar o analizar información estructurada en mensajes de commit" +msgid "Add or parse structured information in commit messages" +msgstr "Agregar o analizar información estructurada en mensajes de commit" #: command-list.h:114 msgid "The Git repository browser" @@ -18898,7 +22790,7 @@ msgstr "Programa divisor de mbox simple de UNIX" #: command-list.h:121 msgid "Join two or more development histories together" -msgstr "Junta dos o mas historiales de desarrollo juntos" +msgstr "Junta dos o más historiales de desarrollo juntos" #: command-list.h:122 msgid "Find as good common ancestors as possible for a merge" @@ -19041,228 +22933,238 @@ msgid "Reset current HEAD to the specified state" msgstr "Reinicia el HEAD actual a un estado especifico" #: command-list.h:156 +msgid "Restore working tree files" +msgstr "Restaurar archivos de árboles de trabajo" + +#: command-list.h:157 msgid "Revert some existing commits" msgstr "Revierte algunos commits existentes" -#: command-list.h:157 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "Lista objetos commit en orden cronológico inverso" -#: command-list.h:158 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "Seleccionar y masajear los parámetros" -#: command-list.h:159 +#: command-list.h:160 msgid "Remove files from the working tree and from the index" msgstr "Borra archivos del árbol de trabajo y del índice" -#: command-list.h:160 +#: command-list.h:161 msgid "Send a collection of patches as emails" msgstr "Envía una colección de parches como e-mails" -#: command-list.h:161 +#: command-list.h:162 msgid "Push objects over Git protocol to another repository" msgstr "Empujar objetos por protocolo Git a otro repositorio" -#: command-list.h:162 +#: command-list.h:163 msgid "Restricted login shell for Git-only SSH access" msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git" -#: command-list.h:163 +#: command-list.h:164 msgid "Summarize 'git log' output" msgstr "Resumir la salida 'git log'" -#: command-list.h:164 +#: command-list.h:165 msgid "Show various types of objects" msgstr "Muestra varios tipos de objetos" -#: command-list.h:165 +#: command-list.h:166 msgid "Show branches and their commits" msgstr "Mostrar ramas y sus commits" -#: command-list.h:166 +#: command-list.h:167 msgid "Show packed archive index" msgstr "Mostrar el índice de archivo empaquetado" -#: command-list.h:167 +#: command-list.h:168 msgid "List references in a local repository" msgstr "Listar referencias en el repositorio local" -#: command-list.h:168 +#: command-list.h:169 msgid "Git's i18n setup code for shell scripts" msgstr "El código de configuración i18n de Git para scripts de shell" -#: command-list.h:169 +#: command-list.h:170 msgid "Common Git shell script setup code" msgstr "Código de configuración de script de shell común de Git" -#: command-list.h:170 +#: command-list.h:171 +msgid "Initialize and modify the sparse-checkout" +msgstr "Inicializa y modifica el sparse-checkout" + +#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "" "Poner en un stash los cambios en un directorio de trabajo sucio de todas " "maneras" -#: command-list.h:171 +#: command-list.h:173 msgid "Add file contents to the staging area" msgstr "Agrega contenidos de un archivo al área de staging" -#: command-list.h:172 +#: command-list.h:174 msgid "Show the working tree status" msgstr "Muestra el estado del árbol de trabajo" -#: command-list.h:173 +#: command-list.h:175 msgid "Remove unnecessary whitespace" msgstr "Eliminar el espacio en blanco innecesario" -#: command-list.h:174 +#: command-list.h:176 msgid "Initialize, update or inspect submodules" msgstr "Inicializa, actualiza o inspecciona submódulos" -#: command-list.h:175 +#: command-list.h:177 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operación bidireccional entre un repositorio Subversion y Git" -#: command-list.h:176 +#: command-list.h:178 +msgid "Switch branches" +msgstr "Cambiar branches" + +#: command-list.h:179 msgid "Read, modify and delete symbolic refs" msgstr "Lee, modifica y borra referencias simbólicas" -#: command-list.h:177 +#: command-list.h:180 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" -#: command-list.h:178 +#: command-list.h:181 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un archivo temporal con contenidos de un blob" -#: command-list.h:179 +#: command-list.h:182 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objetos de un archivo empaquetado" -#: command-list.h:180 +#: command-list.h:183 msgid "Register file contents in the working tree to the index" msgstr "Registra contenidos de archivos en el árbol de trabajo al índice" -#: command-list.h:181 +#: command-list.h:184 msgid "Update the object name stored in a ref safely" msgstr "" "Actualiza el nombre del objeto almacenado en una referencia de forma segura" -#: command-list.h:182 +#: command-list.h:185 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Actualiza el archivo de información auxiliar para ayudar a los servidores " "dumb" -#: command-list.h:183 +#: command-list.h:186 msgid "Send archive back to git-archive" msgstr "Enviar archivo a git-archive" -#: command-list.h:184 +#: command-list.h:187 msgid "Send objects packed back to git-fetch-pack" msgstr "Enviar objetos empaquetados a git-fetch-pack" -#: command-list.h:185 +#: command-list.h:188 msgid "Show a Git logical variable" msgstr "Mostrar una variable lógica de Git" -#: command-list.h:186 +#: command-list.h:189 msgid "Check the GPG signature of commits" msgstr "Verificar firma GPG de commits" -#: command-list.h:187 +#: command-list.h:190 msgid "Validate packed Git archive files" msgstr "Valida archivos Git empaquetados" -#: command-list.h:188 +#: command-list.h:191 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG de etiquetas" -#: command-list.h:189 +#: command-list.h:192 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaz web Git (interfaz web para repositorios Git)" -#: command-list.h:190 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "Muestra logs con las diferencias que cada commit introduce" -#: command-list.h:191 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "Gestiona múltiples árboles de trabajo" -#: command-list.h:192 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "Crea un objeto árbol del índice actual" -#: command-list.h:193 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "Definiendo atributos por ruta" -#: command-list.h:194 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Interfaz y convenciones de línea de comandos de Git" -#: command-list.h:195 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "Un tutorial básico de Git para desarrolladores" -#: command-list.h:196 +#: command-list.h:199 msgid "Git for CVS users" msgstr "Git para usuarios CVS" -#: command-list.h:197 +#: command-list.h:200 msgid "Tweaking diff output" msgstr "Afinar la salida de diff" -#: command-list.h:198 +#: command-list.h:201 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunto mínimo útil de comandos diarios de Git" -#: command-list.h:199 +#: command-list.h:202 msgid "A Git Glossary" msgstr "Un Glosario de Git" -#: command-list.h:200 +#: command-list.h:203 msgid "Hooks used by Git" msgstr "Hooks utilizados por Git" -#: command-list.h:201 +#: command-list.h:204 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" -#: command-list.h:202 +#: command-list.h:205 msgid "Defining submodule properties" msgstr "Definiendo las propiedades del submódulo" -#: command-list.h:203 +#: command-list.h:206 msgid "Git namespaces" -msgstr "namespaces de Git" +msgstr "Namespaces de Git" -#: command-list.h:204 +#: command-list.h:207 msgid "Git Repository Layout" msgstr "Disposición del repositorio Git" -#: command-list.h:205 +#: command-list.h:208 msgid "Specifying revisions and ranges for Git" msgstr "Especificando revisiones y rangos para Git" -#: command-list.h:206 +#: command-list.h:209 +msgid "Mounting one repository inside another" +msgstr "Montando un repositorio dentro de otro" + +#: command-list.h:210 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial de introducción a Git: parte dos" -#: command-list.h:207 +#: command-list.h:211 msgid "A tutorial introduction to Git" msgstr "Un tutorial de introducción para Git" -#: command-list.h:208 +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "Una visión general de flujos de trabajo recomendados con Git" -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "" -"actualizar el índice con la resolución de conflictos reutilizada si es " -"posible" - #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Debes iniciar con \"git bisect start\"" @@ -19274,133 +23176,49 @@ msgstr "Debes iniciar con \"git bisect start\"" msgid "Do you want me to do it for you [Y/n]? " msgstr "¿Quieres que lo haga por ti [Y/n]? " -#: git-bisect.sh:121 -#, sh-format -msgid "unrecognised option: '$arg'" -msgstr "opción no reconocida: '$arg'" - -#: git-bisect.sh:125 -#, sh-format -msgid "'$arg' does not appear to be a valid revision" -msgstr "'$arg' no parece ser una revisión válida" - -#: git-bisect.sh:154 -msgid "Bad HEAD - I need a HEAD" -msgstr "Mal HEAD - Necesito un HEAD" - -#: git-bisect.sh:167 -#, sh-format -msgid "" -"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." -msgstr "" -"Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'." - -#: git-bisect.sh:177 -msgid "won't bisect on cg-seek'ed tree" -msgstr "no se bisecará en un árbol con cg-seek" - -#: git-bisect.sh:181 -msgid "Bad HEAD - strange symbolic ref" -msgstr "Mal HEAD - ref simbólico extraño" - -#: git-bisect.sh:233 -#, sh-format -msgid "Bad bisect_write argument: $state" -msgstr "Mal argumento bisect_write: $state" - -#: git-bisect.sh:246 +#: git-bisect.sh:101 #, sh-format msgid "Bad rev input: $arg" msgstr "Mala entrada rev: $arg" -#: git-bisect.sh:265 +#: git-bisect.sh:121 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Mala entrada rev: $bisected_head" -#: git-bisect.sh:274 +#: git-bisect.sh:130 #, sh-format msgid "Bad rev input: $rev" msgstr "Mala entrada rev: $rev" -#: git-bisect.sh:283 +#: git-bisect.sh:139 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento." -#: git-bisect.sh:306 -#, sh-format -msgid "Warning: bisecting only with a $TERM_BAD commit." -msgstr "Peligro: bisecando solo con un $TERM_BAD commit." - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:312 -msgid "Are you sure [Y/n]? " -msgstr "¿Estás seguro [Y/n]? " - -#: git-bisect.sh:324 -#, sh-format -msgid "" -"You need to give me at least one $bad_syn and one $good_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"Tiene que dar al menos un $bad_syn y un $good_syn revision.\n" -"(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" - -#: git-bisect.sh:327 -#, sh-format -msgid "" -"You need to start by \"git bisect start\".\n" -"You then need to give me at least one $good_syn and one $bad_syn revision.\n" -"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" -msgstr "" -"Tiene que comenzar por \"git bisect start\".\n" -"Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n" -"(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" - -#: git-bisect.sh:398 git-bisect.sh:512 -msgid "We are not bisecting." -msgstr "No estamos bisecando." - -#: git-bisect.sh:405 -#, sh-format -msgid "'$invalid' is not a valid commit" -msgstr "'$invalid' no es un commit válido" - -#: git-bisect.sh:414 -#, sh-format -msgid "" -"Could not check out original HEAD '$branch'.\n" -"Try 'git bisect reset <commit>'." -msgstr "" -"No se pudo revisar el HEAD original '$branch'.\n" -"Intente 'git bisect reset <commit>'." - -#: git-bisect.sh:422 +#: git-bisect.sh:209 msgid "No logfile given" msgstr "Ningún logfile proporcionado" -#: git-bisect.sh:423 +#: git-bisect.sh:210 #, sh-format msgid "cannot read $file for replaying" msgstr "no se puede leer $file para reproducir" -#: git-bisect.sh:444 +#: git-bisect.sh:232 msgid "?? what are you talking about?" msgstr "?? ¿De qué estás hablando?" -#: git-bisect.sh:453 +#: git-bisect.sh:241 msgid "bisect run failed: no command provided." msgstr "bisect falló: no se proveyó comando." -#: git-bisect.sh:458 +#: git-bisect.sh:246 #, sh-format msgid "running $command" msgstr "ejecutando $command" -#: git-bisect.sh:465 +#: git-bisect.sh:253 #, sh-format msgid "" "bisect run failed:\n" @@ -19409,11 +23227,11 @@ msgstr "" "bisect falló:\n" "código de salida $res de '$command' es <0 o >=128" -#: git-bisect.sh:491 +#: git-bisect.sh:279 msgid "bisect run cannot continue any more" msgstr "bisect no puede seguir continuando" -#: git-bisect.sh:497 +#: git-bisect.sh:285 #, sh-format msgid "" "bisect run failed:\n" @@ -19422,36 +23240,20 @@ msgstr "" "bisect falló:\n" "'bisect_state $state' salió con código de error $res" -#: git-bisect.sh:504 +#: git-bisect.sh:292 msgid "bisect run success" msgstr "bisect exitoso" -#: git-bisect.sh:533 -#, sh-format -msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." -msgstr "" -"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD." - -#: git-bisect.sh:567 -msgid "no terms defined" -msgstr "no hay términos definidos" - -#: git-bisect.sh:584 -#, sh-format -msgid "" -"invalid argument $arg for 'git bisect terms'.\n" -"Supported options are: --term-good|--term-old and --term-bad|--term-new." -msgstr "" -"argumento inválido $arg para 'git bisect terms'.\n" -"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-" -"new." +#: git-bisect.sh:300 +msgid "We are not bisecting." +msgstr "No estamos bisecando." #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" msgstr "" -"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por " +"Error: Tus cambios locales de los siguientes archivos serán sobrescritos por " "la fusión" #: git-merge-octopus.sh:61 @@ -19486,293 +23288,132 @@ msgstr "Intentando fusión simple con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Fusión simple no funcionó, intentando fusión automática." -#: git-legacy-rebase.sh:434 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "No se puede regresar a $head_name" - -#: git-legacy-rebase.sh:460 -#, sh-format -msgid "" -"It seems that there is already a $state_dir_base directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t$cmd_live_rebase\n" -"If that is not the case, please\n" -"\t$cmd_clear_stale_rebase\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there." -msgstr "" -"Parece que ya hay un directorio $state_dir_base, y\n" -"me pregunto si está en medio de otro rebase. Si ese es el \n" -"caso, por favor intente\n" -"\t$cmd_live_rebase\n" -"Si no es el caso, por favor\n" -"\t$cmd_clear_stale_rebase\n" -"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" -"algo de valor ahí." - -#: git-legacy-rebase.sh:525 -msgid "error: cannot combine '--signoff' with '--preserve-merges'" -msgstr "error: no se puede combinar '--signoff' con '--preserve-merges'" - -#: git-legacy-rebase.sh:570 -#, sh-format -msgid "invalid upstream '$upstream_name'" -msgstr "upstream inválido '$upstream_name'" - -#: git-legacy-rebase.sh:594 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: hay más de una base de fusión" - -#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "$onto_name: no hay base de fusión" - -#: git-legacy-rebase.sh:606 -#, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "No apunta a un commit válido: $onto_name" - -#: git-legacy-rebase.sh:632 -#, sh-format -msgid "fatal: no such branch/commit '$branch_name'" -msgstr "fatal: no existe la rama/commit: '$branch_name'" - -#: git-legacy-rebase.sh:670 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "Autostash creado: $stash_abbrev" - -#: git-legacy-rebase.sh:699 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "La rama actual $branch_name está actualizada." - -#: git-legacy-rebase.sh:709 -#, sh-format -msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "Rama actual $branch_name está actualizada, rebase forzado." - -#: git-legacy-rebase.sh:723 -#, sh-format -msgid "Changes to $onto:" -msgstr "Cambios hacia $onto:" - -#: git-legacy-rebase.sh:725 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "Cambios desde $mb a $onto:" - -#: git-legacy-rebase.sh:736 -msgid "First, rewinding head to replay your work on top of it..." -msgstr "" -"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " -"de ésta..." - -#: git-legacy-rebase.sh:746 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "Avance rápido de $branch_name a $onto_name." - -#: git-stash.sh:61 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear con parámetros no está implementado" - -#: git-stash.sh:108 -msgid "You do not have the initial commit yet" -msgstr "Aún no tienes un commit inicial" - -#: git-stash.sh:123 -msgid "Cannot save the current index state" -msgstr "No se puede guardar el estado actual del índice" - -#: git-stash.sh:138 -msgid "Cannot save the untracked files" -msgstr "No se pueden guardar los archivos no rastreados" - -#: git-stash.sh:158 git-stash.sh:171 -msgid "Cannot save the current worktree state" -msgstr "No se puede guardar el estado actual del árbol de trabajo" - -#: git-stash.sh:175 -msgid "No changes selected" -msgstr "Sin cambios seleccionados" - -#: git-stash.sh:178 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "No se puede eliminar el índice temporal (no puede suceder)" -#: git-stash.sh:191 -msgid "Cannot record working tree state" -msgstr "No se puede grabar el estado del árbol de trabajo" - -#: git-stash.sh:229 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No se puede actualizar $ref_stash con $w_commit" -#: git-stash.sh:281 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "error: opción desconocida para 'stash pus': $option" -#: git-stash.sh:295 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" - -#: git-stash.sh:303 -msgid "No local changes to save" -msgstr "No hay cambios locales para guardar" - -#: git-stash.sh:308 -msgid "Cannot initialize stash" -msgstr "No se puede inicializar stash" - -#: git-stash.sh:312 -msgid "Cannot save the current status" -msgstr "No se puede guardar el estado actual" - -#: git-stash.sh:313 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" -#: git-stash.sh:342 -msgid "Cannot remove worktree changes" -msgstr "No se pueden eliminar cambios del árbol de trabajo" - -#: git-stash.sh:490 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "opción desconocida: $opt" -#: git-stash.sh:503 -msgid "No stash entries found." -msgstr "No se encontraron entradas de stash." - -#: git-stash.sh:510 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Se especificaron demasiadas revisiones: $REV" -#: git-stash.sh:525 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no es una referencia válida" -#: git-stash.sh:553 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no es un commit estilo stash" -#: git-stash.sh:564 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no es una referencia stash" -#: git-stash.sh:572 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "incapaz de refrescar el índice" -#: git-stash.sh:576 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "No se puede aplicar un stash en medio de una fusión" -#: git-stash.sh:584 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "Conflictos en índice. Intente sin --index." -#: git-stash.sh:586 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "No se puede guardar el índice del árbol" -#: git-stash.sh:595 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" -#: git-stash.sh:620 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "No se puede sacar de stage archivos modificados" -#: git-stash.sh:635 -msgid "Index was not unstashed." -msgstr "El índice no fue sacado de stash." - -#: git-stash.sh:649 -msgid "The stash entry is kept in case you need it again." -msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." - -#: git-stash.sh:658 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Botado ${REV} ($s)" -#: git-stash.sh:659 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No se pudo borrar entrada stash" -#: git-stash.sh:667 -msgid "No branch name specified" -msgstr "No se especificó el nombre de la rama" - -#: git-stash.sh:746 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "(Para restaurarlos, escribe \"git stash apply\")" -#: git-submodule.sh:198 +#: git-submodule.sh:203 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "La ruta relativa sólo se puede usar desde el nivel superior del árbol de " "trabajo" -#: git-submodule.sh:208 +#: git-submodule.sh:213 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../" -#: git-submodule.sh:227 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ya existe en el índice" -#: git-submodule.sh:230 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ya existe en el índice y no es un submódulo" -#: git-submodule.sh:236 +#: git-submodule.sh:242 #, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$sm_path\n" -"Use -f if you really want to add it." -msgstr "" -"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" -"$sm_path\n" -"Usa -f si en verdad quieres agregarlo." +msgid "'$sm_path' does not have a commit checked out" +msgstr "'$sm_path' no tiene un commit checked out" -#: git-submodule.sh:259 +#: git-submodule.sh:273 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Agregando el repositorio existente en '$sm_path' al índice" -#: git-submodule.sh:261 +#: git-submodule.sh:275 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ya existe y no es un repositorio git válido" -#: git-submodule.sh:269 +#: git-submodule.sh:283 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Se encontró localmente un directorio git para '$sm_name' con el(los) " "remoto(s):" -#: git-submodule.sh:271 +#: git-submodule.sh:285 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -19784,44 +23425,44 @@ msgid "" msgstr "" "Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n" " $realrepo\n" -"use la opción '--force'. Si el directorio git local no es el repositorio " +"usa la opción '--force'. Si el directorio git local no es el repositorio " "correcto\n" -"o no está seguro de lo que esto significa, escoja otro nombre con la opción " +"o no estás seguro de lo que esto significa, escoge otro nombre con la opción " "'--name'." -#: git-submodule.sh:277 +#: git-submodule.sh:291 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reactivar directorio git local para el submódulo '$sm_name'." -#: git-submodule.sh:289 +#: git-submodule.sh:303 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No es posible hacer checkout al submódulo '$sm_path'" -#: git-submodule.sh:294 +#: git-submodule.sh:308 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falló al agregar el submódulo '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:317 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falló al registrar el submódulo '$sm_path'" -#: git-submodule.sh:563 +#: git-submodule.sh:590 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No se pudo encontrar la revisión actual en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:573 +#: git-submodule.sh:600 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" -#: git-submodule.sh:578 +#: git-submodule.sh:605 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -19830,12 +23471,16 @@ msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " "de submódulo '$sm_path'" -#: git-submodule.sh:596 +#: git-submodule.sh:623 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "" +"No es posible realizar fetch en la ruta de submódulo '$displaypath'; " +"intentando hacer un fetch directo $sha1:" -#: git-submodule.sh:602 +#: git-submodule.sh:629 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -19844,75 +23489,75 @@ msgstr "" "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " "Fetch directo del commit falló." -#: git-submodule.sh:609 +#: git-submodule.sh:636 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:610 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:614 +#: git-submodule.sh:641 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:615 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:647 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'" -#: git-submodule.sh:621 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:626 +#: git-submodule.sh:653 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falló la ejecución de '$command $sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:627 +#: git-submodule.sh:654 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:658 +#: git-submodule.sh:685 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:754 +#: git-submodule.sh:896 msgid "The --cached option cannot be used with the --files option" msgstr "La opción --cached no puede ser usada con la opción --files" -#: git-submodule.sh:806 +#: git-submodule.sh:948 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:826 +#: git-submodule.sh:968 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Advertencia: $display_name no contiene el commit $sha1_src" -#: git-submodule.sh:829 +#: git-submodule.sh:971 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" -#: git-submodule.sh:832 +#: git-submodule.sh:974 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -19923,12 +23568,21 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Véase git-${cmd}(1) para más detalles." -#: git-rebase--preserve-merges.sh:136 +#: git-rebase--preserve-merges.sh:109 +msgid "Applied autostash." +msgstr "Autostash aplicado." + +#: git-rebase--preserve-merges.sh:112 +#, sh-format +msgid "Cannot store $stash_sha1" +msgstr "No se puede almacenar $stash_sha1" + +#: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Rebasando ($new_count/$total)" -#: git-rebase--preserve-merges.sh:152 +#: git-rebase--preserve-merges.sh:207 msgid "" "\n" "Commands:\n" @@ -19968,7 +23622,7 @@ msgstr "" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: git-rebase--preserve-merges.sh:215 +#: git-rebase--preserve-merges.sh:270 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -19979,91 +23633,91 @@ msgid "" "\n" "\tgit rebase --continue" msgstr "" -"Puede enmendar el commit ahora, con\n" +"Puedes enmendar el commit ahora, con\n" "\n" "\tgit commit --amend $gpg_sign_opt_quoted\n" "\n" -"Una vez que esté satisfecho con los cambios, ejecute\n" +"Una vez que estés satisfecho con los cambios, ejecuta\n" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:240 +#: git-rebase--preserve-merges.sh:295 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: no es un commit que pueda ser cogido" -#: git-rebase--preserve-merges.sh:279 +#: git-rebase--preserve-merges.sh:334 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nombre de commit inválido: $sha1" -#: git-rebase--preserve-merges.sh:309 +#: git-rebase--preserve-merges.sh:364 msgid "Cannot write current commit's replacement sha1" msgstr "No se puede escribir el remplazo sha1 del commit actual" -#: git-rebase--preserve-merges.sh:360 +#: git-rebase--preserve-merges.sh:415 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:362 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "No se puede realizar avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:371 +#: git-rebase--preserve-merges.sh:426 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "No se puede mover HEAD a $first_parent" -#: git-rebase--preserve-merges.sh:376 +#: git-rebase--preserve-merges.sh:431 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Rehusando a ejecutar squash en fusión: $sha1" -#: git-rebase--preserve-merges.sh:394 +#: git-rebase--preserve-merges.sh:449 #, sh-format msgid "Error redoing merge $sha1" msgstr "Error rehaciendo fusión $sha1" -#: git-rebase--preserve-merges.sh:403 +#: git-rebase--preserve-merges.sh:458 #, sh-format msgid "Could not pick $sha1" msgstr "No se pudo coger $sha1" -#: git-rebase--preserve-merges.sh:412 +#: git-rebase--preserve-merges.sh:467 #, sh-format msgid "This is the commit message #${n}:" msgstr "Este es el mensaje del commit #${n}:" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:472 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "El mensaje del commit #${n} será ignorado:" -#: git-rebase--preserve-merges.sh:428 +#: git-rebase--preserve-merges.sh:483 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Esta es una combinación de $count commit." msgstr[1] "Esta es la combinación de $count commits." -#: git-rebase--preserve-merges.sh:437 +#: git-rebase--preserve-merges.sh:492 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No se puede escribir $fixup_msg" -#: git-rebase--preserve-merges.sh:440 +#: git-rebase--preserve-merges.sh:495 msgid "This is a combination of 2 commits." msgstr "Esto es una combinación de 2 commits." -#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 -#: git-rebase--preserve-merges.sh:527 +#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 +#: git-rebase--preserve-merges.sh:582 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No se puede aplicar $sha1... $rest" -#: git-rebase--preserve-merges.sh:556 +#: git-rebase--preserve-merges.sh:611 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -20076,35 +23730,35 @@ msgstr "" "$rest\n" "Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-" "commit\n" -"ha fallado. Si el hook pre-commit falló, es posible que deba resolver el " +"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el " "problema antes\n" "de que sea capaz de reformular el commit." -#: git-rebase--preserve-merges.sh:571 +#: git-rebase--preserve-merges.sh:626 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Detenido en $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:586 +#: git-rebase--preserve-merges.sh:641 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "No se puede '$squash_style' sin un commit previo" -#: git-rebase--preserve-merges.sh:628 +#: git-rebase--preserve-merges.sh:683 #, sh-format msgid "Executing: $rest" msgstr "Ejecutando: $rest" -#: git-rebase--preserve-merges.sh:636 +#: git-rebase--preserve-merges.sh:691 #, sh-format msgid "Execution failed: $rest" msgstr "Ejecución fallida: $rest" -#: git-rebase--preserve-merges.sh:638 +#: git-rebase--preserve-merges.sh:693 msgid "and made changes to the index and/or the working tree" msgstr "y hizo cambios al índice y/o al árbol de trabajo" -#: git-rebase--preserve-merges.sh:640 +#: git-rebase--preserve-merges.sh:695 msgid "" "You can fix the problem, and then run\n" "\n" @@ -20115,7 +23769,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:653 +#: git-rebase--preserve-merges.sh:708 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -20126,29 +23780,29 @@ msgid "" msgstr "" "La ejecución tuvo éxito: $rest\n" "Pero dejó cambios en el índice y/o en el árbol de trabajo\n" -"Realice un commit o stash con los cambios y, a continuación, ejecute\n" +"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:664 +#: git-rebase--preserve-merges.sh:719 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Comando desconocido: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:665 +#: git-rebase--preserve-merges.sh:720 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." -#: git-rebase--preserve-merges.sh:700 +#: git-rebase--preserve-merges.sh:755 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebasado y actualizado satisfactoriamente." -#: git-rebase--preserve-merges.sh:757 +#: git-rebase--preserve-merges.sh:812 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No se pudo eliminar CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:762 +#: git-rebase--preserve-merges.sh:817 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -20165,26 +23819,26 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"Tiene cambios en el área de stage de su árbol de trabajo.\n" +"Tienes cambios en el área de stage de tu árbol de trabajo.\n" "Si estos cambios están destinados a \n" -"ser aplastados en el commit previo, ejecute:\n" +"ser aplastados en el commit previo, ejecuta:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" -"Si estos están destinados a ir en un nuevo commit, ejecute:\n" +"Si estos están destinados a ir en un nuevo commit, ejecuta:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" -"En ambos casos, cuando termine, continue con:\n" +"En ambos casos, cuando termines, continue con:\n" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:779 +#: git-rebase--preserve-merges.sh:834 msgid "Error trying to find the author identity to amend commit" msgstr "" "Error tratando de encontrar la identidad del autor para remediar el commit" -#: git-rebase--preserve-merges.sh:784 +#: git-rebase--preserve-merges.sh:839 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -20192,40 +23846,44 @@ msgstr "" "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n" "primero y entonces ejecuta 'git rebase --continue' de nuevo." -#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 +#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 msgid "Could not commit staged changes." msgstr "No se pudo realizar el commit con los cambios en el área de stage." -#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 msgid "Could not execute editor" msgstr "No se pudo ejecutar el editor" -#: git-rebase--preserve-merges.sh:845 +#: git-rebase--preserve-merges.sh:900 #, sh-format msgid "Could not checkout $switch_to" msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" -#: git-rebase--preserve-merges.sh:852 +#: git-rebase--preserve-merges.sh:907 msgid "No HEAD?" msgstr "¿Sin HEAD?" -#: git-rebase--preserve-merges.sh:853 +#: git-rebase--preserve-merges.sh:908 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No se pudo crear $state_dir temporalmente" -#: git-rebase--preserve-merges.sh:856 +#: git-rebase--preserve-merges.sh:911 msgid "Could not mark as interactive" msgstr "No se pudo marcar como interactivo" -#: git-rebase--preserve-merges.sh:888 +#: git-rebase--preserve-merges.sh:943 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" -#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +#: git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Tenga en cuenta que los commits vacíos están comentados" + +#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" @@ -20234,146 +23892,84 @@ msgstr "No se puede inicializar los commits reescritos" msgid "usage: $dashless $USAGE" msgstr "uso: $dashless $USAGE" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "" "No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo" -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo." -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." msgstr "" "No se puede aplicar rebase: Tienes cambios que no están en el área de stage." -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" "No se puede reescribir las ramas: Tienes cambios que no están en el área de " "stage." -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "No se puede aplicar pull con rebase: Tienes cambios que no están en el área " "de stage." -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "No se puede $action: Tienes cambios que no están en el área de stage." -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" "No se puede hacer rebase: Tu índice contiene cambios que no están en un " "commit." -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "No se puede hacer pull con rebase: Tu índice contiene cambios que no están " "en un commit." -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "No se puede $action: El índice contiene cambios sin confirmar." -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit." -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "" "Necesitas ejecutar este comando desde el nivel superior de tu árbol de " "trabajo." -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "Incapaz de determinar la ruta absoluta del directorio git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:196 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:197 -msgid "staged" -msgstr "rastreado" - -#: git-add--interactive.perl:197 -msgid "unstaged" -msgstr "no rastreado" - -#: git-add--interactive.perl:253 git-add--interactive.perl:278 -msgid "binary" -msgstr "binario" - -#: git-add--interactive.perl:262 git-add--interactive.perl:316 -msgid "nothing" -msgstr "nada" - -#: git-add--interactive.perl:298 git-add--interactive.perl:313 -msgid "unchanged" -msgstr "sin cambios" - -#: git-add--interactive.perl:609 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "agregada %d ruta\n" -msgstr[1] "agregadas %d rutas\n" - -#: git-add--interactive.perl:612 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "actualizada %d ruta\n" -msgstr[1] "actualizadas %d rutas\n" - -#: git-add--interactive.perl:615 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "revertida %d ruta\n" -msgstr[1] "revertidas %d rutas\n" - -#: git-add--interactive.perl:618 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "touch hecho a %d ruta\n" msgstr[1] "touch hecho a %d rutas\n" -#: git-add--interactive.perl:627 -msgid "Update" -msgstr "Actualizar" - -#: git-add--interactive.perl:639 -msgid "Revert" -msgstr "Revertir" - -#: git-add--interactive.perl:662 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "nota: %s no es rastreado ahora.\n" - -#: git-add--interactive.perl:673 -msgid "Add untracked" -msgstr "Agregar no rastreados" - -#: git-add--interactive.perl:679 -msgid "No untracked files.\n" -msgstr "No hay archivos sin rastrear.\n" - -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -20381,7 +23977,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el área de stage." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -20389,7 +23985,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -20397,7 +23993,8 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del área de stage." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -20405,7 +24002,8 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -20413,16 +24011,12 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "falló al abrir el archivo de adición del hunk para escritura: %s" -#: git-add--interactive.perl:1086 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" - -#: git-add--interactive.perl:1092 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -20433,37 +24027,14 @@ msgstr "" "---\n" "Para eliminar '%s' líneas, haga de ellas líneas ' ' (contexto).\n" "Para eliminar '%s' líneas, bórrelas.\n" -"Lineas comenzando con %s serán removidas.\n" +"Lineas comenzando con %s serán eliminadas.\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1100 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Si esto no aplica de manera limpia, se le da la oportunidad de \n" -"editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n" -"la edición es abortada y el hunk queda sin cambios.\n" - -#: git-add--interactive.perl:1114 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "falló al abrir el archivo de edición del hunk para lectura: %s" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1213 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? " - -#: git-add--interactive.perl:1222 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -20478,7 +24049,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1228 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -20492,7 +24063,7 @@ msgstr "" "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -20507,7 +24078,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1240 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -20521,7 +24092,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunko ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -20535,7 +24106,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -20549,7 +24120,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -20563,7 +24134,21 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1296 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - aplicar este hunk al índice y al árbol de trabajo\n" +"n - no aplicar este hunk al índice y al árbol de trabajo\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunk o ninguno de los siguientes en este archivo" + +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -20581,217 +24166,89 @@ msgstr "" "J - dejar este hunk por definir, ver siguiente hunk\n" "k - dejar este hunk por definir, ver hunk previo por definir\n" "K - dejar este hunk por definir, ver hunk previo\n" -"s - dividir el hunk actual en hunks mas pequeños\n" +"s - dividir el hunk actual en hunks más pequeños\n" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: git-add--interactive.perl:1304 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" -msgstr "Los hunks seleccionados no aplican al índice!\n" - -#: git-add--interactive.perl:1305 -msgid "Apply them to the worktree anyway? " -msgstr "Aplicarlos al árbol de trabajo de todas maneras? " - -#: git-add--interactive.perl:1308 -msgid "Nothing was applied.\n" -msgstr "Nada fue aplicado.\n" +msgstr "¡Los hunks seleccionados no aplican al índice!\n" -#: git-add--interactive.perl:1319 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1328 -msgid "Only binary files changed.\n" -msgstr "Solo cambiaron archivos binarios.\n" - -#: git-add--interactive.perl:1330 -msgid "No changes.\n" -msgstr "Sin cambios.\n" - -#: git-add--interactive.perl:1338 -msgid "Patch update" -msgstr "Actualización del parche" - -#: git-add--interactive.perl:1390 -#, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1391 -#, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1392 +#: git-add--interactive.perl:1468 #, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1395 -#, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1396 -#, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1397 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1400 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1401 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1402 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? " +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1469 #, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1406 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? " +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1407 +#: git-add--interactive.perl:1470 #, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1410 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1411 -#, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1412 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1415 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1416 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1417 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1420 -#, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1421 -#, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1422 -#, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " - -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1570 msgid "No other hunks to goto\n" msgstr "No hay más pedazos para el ir\n" -#: git-add--interactive.perl:1529 -msgid "go to which hunk (<ret> to see more)? " -msgstr "a que hunk ir (<enter> para ver mas)? " - -#: git-add--interactive.perl:1531 -msgid "go to which hunk? " -msgstr "a que hunk ir? " - -#: git-add--interactive.perl:1540 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero inválido: '%s'\n" -#: git-add--interactive.perl:1545 +#: git-add--interactive.perl:1593 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lo siento, solo %d hunk disponible.\n" msgstr[1] "Lo siento, solo %d hunks disponibles.\n" -#: git-add--interactive.perl:1571 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "No hay más pedazos para buscar\n" -#: git-add--interactive.perl:1575 -msgid "search for regex? " -msgstr "buscar para regexp? " - -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp para la búsqueda mal formado %s: %s\n" -#: git-add--interactive.perl:1598 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patrón entregado.\n" -#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "Perdón, no se puede dividir este pedazo\n" -#: git-add--interactive.perl:1650 +#: git-add--interactive.perl:1698 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Cortar en %d hunk.\n" msgstr[1] "Cortar en %d hunks.\n" -#: git-add--interactive.perl:1660 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "Perdón, no se puede editar este pedazo\n" -#: git-add--interactive.perl:1706 -msgid "Review diff" -msgstr "Revisión de diff" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -20811,18 +24268,19 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 -#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 -#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 +#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 +#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 +#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 +#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1763 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, se esperaba --" @@ -20835,31 +24293,31 @@ msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "el offset del tiempo local es mayor o igual a 24 horas\n" -#: git-send-email.perl:219 git-send-email.perl:225 +#: git-send-email.perl:223 git-send-email.perl:229 msgid "the editor exited uncleanly, aborting everything" msgstr "el editor se cerro inapropiadamente, abortando todo" -#: git-send-email.perl:302 +#: git-send-email.perl:310 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contiene una versión intermedia del correo que se estaba generando.\n" -#: git-send-email.perl:307 +#: git-send-email.perl:315 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contiene el email generado.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:408 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases no es compatible con otras opciones.\n" -#: git-send-email.perl:395 git-send-email.perl:650 +#: git-send-email.perl:481 git-send-email.perl:683 msgid "Cannot run git format-patch from outside a repository\n" msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n" -#: git-send-email.perl:398 +#: git-send-email.perl:484 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -20867,37 +24325,37 @@ msgstr "" "`batch-size` y `relogin` deben ser especificados juntos (via la línea de " "comando o por opción de configuración)\n" -#: git-send-email.perl:468 +#: git-send-email.perl:497 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo --suppress-cc desconocido: '%s'\n" -#: git-send-email.perl:497 +#: git-send-email.perl:528 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Configuración --confirm desconocida: '%s'\n" -#: git-send-email.perl:525 +#: git-send-email.perl:556 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" -#: git-send-email.perl:527 +#: git-send-email.perl:558 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "peligro: `:include:` no soportado: %s\n" -#: git-send-email.perl:529 +#: git-send-email.perl:560 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n" -#: git-send-email.perl:534 +#: git-send-email.perl:565 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "advertencia: línea sendmail no reconocida: %s\n" -#: git-send-email.perl:616 +#: git-send-email.perl:649 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -20912,12 +24370,12 @@ msgstr "" " * Diciendo \"./%s\" si se quiere decir un archivo; o\n" " * Agregando la opción --format-patch si se quiere decir un rango.\n" -#: git-send-email.perl:637 +#: git-send-email.perl:670 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Falló al abrir directorio %s: %s" -#: git-send-email.perl:661 +#: git-send-email.perl:694 #, perl-format msgid "" "fatal: %s: %s\n" @@ -20926,7 +24384,7 @@ msgstr "" "fatal: %s: %s\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:672 +#: git-send-email.perl:705 msgid "" "\n" "No patch files specified!\n" @@ -20936,17 +24394,17 @@ msgstr "" "No se especificaron parches!\n" "\n" -#: git-send-email.perl:685 +#: git-send-email.perl:718 #, perl-format msgid "No subject line in %s?" -msgstr "No hay línea de subject en %s?" +msgstr "¿No hay línea de subject en %s?" -#: git-send-email.perl:695 +#: git-send-email.perl:728 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Falló al abrir para escritura %s: %s" -#: git-send-email.perl:706 +#: git-send-email.perl:739 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -20954,33 +24412,33 @@ msgid "" "\n" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -"Lineas que comienzan en \"GIT:\" serán removidas.\n" +"Lineas que comienzan en \"GIT:\" serán eliminadas.\n" "Considere incluir un diffstat global o una tabla de contenidos\n" -"para el parche que está escribiendo.\n" +"para el parche que estás escribiendo.\n" "\n" -"Limpiar el contenido de body si usted no desea mandar un resumen.\n" +"Limpiar el contenido de body si no deseas mandar un resumen.\n" -#: git-send-email.perl:730 +#: git-send-email.perl:763 #, perl-format msgid "Failed to open %s: %s" msgstr "Falló al abrir %s: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:780 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Falló al abrir %s.final: %s" -#: git-send-email.perl:790 +#: git-send-email.perl:823 msgid "Summary email is empty, skipping it\n" msgstr "Archivo de resumen está vacío, saltando al siguiente\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:825 +#: git-send-email.perl:858 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " -msgstr "Esta seguro de que desea usar <%s> [y/N]? " +msgstr "¿Estás seguro de que deseas usar <%s> [y/N]? " -#: git-send-email.perl:880 +#: git-send-email.perl:913 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -20988,11 +24446,11 @@ msgstr "" "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:885 +#: git-send-email.perl:918 msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Que codificación de 8bit debería declarar [UTF-8]? " +msgstr "¿Que codificación de 8bit debería declarar [UTF-8]? " -#: git-send-email.perl:893 +#: git-send-email.perl:926 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -21005,39 +24463,39 @@ msgstr "" "tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo " "deseas mandar.\n" -#: git-send-email.perl:912 +#: git-send-email.perl:945 msgid "To whom should the emails be sent (if anyone)?" -msgstr "A quien se deben mandar los correos (si existe)?" +msgstr "¿A quien se deben mandar los correos (si existe)?" -#: git-send-email.perl:930 +#: git-send-email.perl:963 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' se expande a si mismo\n" -#: git-send-email.perl:942 +#: git-send-email.perl:975 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -"Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " +"¿Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " "existe alguno)? " -#: git-send-email.perl:1000 git-send-email.perl:1008 +#: git-send-email.perl:1033 git-send-email.perl:1041 #, perl-format msgid "error: unable to extract a valid address from: %s\n" -msgstr "error: no es posible extraer una dirección valida de %s\n" +msgstr "error: no es posible extraer una dirección válida de %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1012 +#: git-send-email.perl:1045 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " +msgstr "¿Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " -#: git-send-email.perl:1329 +#: git-send-email.perl:1362 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Ruta CA \"%s\" no existe" -#: git-send-email.perl:1412 +#: git-send-email.perl:1445 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -21057,7 +24515,7 @@ msgstr "" " Este comportamiento is controlado por el valor de configuración " "sendemail.confirm.\n" "\n" -" Para mas información, ejecuta 'git send-email --help'.\n" +" Para más información, ejecuta 'git send-email --help'.\n" " Para mantener el comportamiento actual, pero evitar este mensaje,\n" " ejecuta 'git config --global sendemail.confirm auto'.\n" "\n" @@ -21065,142 +24523,499 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1427 +#: git-send-email.perl:1460 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -msgstr "Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): " +msgstr "¿Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): " -#: git-send-email.perl:1430 +#: git-send-email.perl:1463 msgid "Send this email reply required" msgstr "Necesitas mandar esta respuesta de email" -#: git-send-email.perl:1458 +#: git-send-email.perl:1491 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP no esta definido adecuadamente." -#: git-send-email.perl:1505 +#: git-send-email.perl:1538 #, perl-format msgid "Server does not support STARTTLS! %s" -msgstr "El servidor no soporta STARTTLS! %s" +msgstr "¡El servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1510 git-send-email.perl:1514 +#: git-send-email.perl:1543 git-send-email.perl:1547 #, perl-format msgid "STARTTLS failed! %s" -msgstr "Falló STARTTLS! %s" +msgstr "¡Falló STARTTLS! %s" -#: git-send-email.perl:1523 +#: git-send-email.perl:1556 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---" "smtp-debug." -#: git-send-email.perl:1541 +#: git-send-email.perl:1574 #, perl-format msgid "Failed to send %s\n" msgstr "Falló al enviar %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1577 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1577 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1579 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1579 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1558 +#: git-send-email.perl:1591 msgid "Result: " msgstr "Resultado: " -#: git-send-email.perl:1561 +#: git-send-email.perl:1594 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1612 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1626 git-send-email.perl:1646 +#: git-send-email.perl:1659 git-send-email.perl:1679 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Agregando cc: %s de línea '%s'\n" -#: git-send-email.perl:1632 +#: git-send-email.perl:1665 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Agregando para: %s de la línea '%s'\n" -#: git-send-email.perl:1685 +#: git-send-email.perl:1718 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1720 +#: git-send-email.perl:1753 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1831 +#: git-send-email.perl:1864 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1838 +#: git-send-email.perl:1871 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1842 +#: git-send-email.perl:1875 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falló al cerrar el pipe para '%s'" -#: git-send-email.perl:1872 +#: git-send-email.perl:1905 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1880 +#: git-send-email.perl:1913 msgid "invalid transfer encoding" msgstr "codificación de transferencia inválida" -#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983 +#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1924 +#: git-send-email.perl:1957 #, perl-format msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: el parche contiene una línea con mas de 998 caracteres" +msgstr "%s: el parche contiene una línea con más de 998 caracteres" -#: git-send-email.perl:1941 +#: git-send-email.perl:1974 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltando %s con el sufijo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1945 +#: git-send-email.perl:1978 #, perl-format msgid "Do you really want to send %s? [y|N]: " -msgstr "Realmente deseas mandar %s?[y|N]: " +msgstr "¿Realmente deseas mandar %s?[y|N]: " -#~ msgid "could not parse '%s' (looking for '%s')" -#~ msgstr "no se pudo configurar '%s' (buscando '%s')" +#, c-format +#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " +#~ msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? " + +#, c-format +#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " +#~ msgstr "¿Aplicar stage al borrado [y,n,a,q,d%s,?]? " + +#, c-format +#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " +#~ msgstr "¿Aplicar stage a este hunk [y,n,a,q,d%s,?]? " + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for staging.\n" +#~ msgstr "" +#~ "Si el parche aplica limpiamente, el hunk editado sera marcado\n" +#~ "inmediatamente para el área de stage.\n" + +#~ msgid "" +#~ "y - stage this hunk\n" +#~ "n - do not stage this hunk\n" +#~ "q - quit; do not stage this hunk or any of the remaining ones\n" +#~ "a - stage this and all the remaining hunks\n" +#~ "d - do not stage this hunk nor any of the remaining hunks\n" +#~ msgstr "" +#~ "y - aplicar stage a este hunk\n" +#~ "n - no aplicar stage a este hunk\n" +#~ "q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" +#~ "a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" +#~ "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " +#~ "archivo\n" + +#, c-format +#~ msgid "could not copy '%s' to '%s'." +#~ msgstr "no se pudo copiar '%s' a '%s'." + +#~ msgid "malformed ident line" +#~ msgstr "línea de entrada mal formada" + +#~ msgid "corrupted author without date information" +#~ msgstr "autor corrupto sin información de fecha" + +#, c-format +#~ msgid "could not parse '%.*s'" +#~ msgstr "no se puede analizar '%.*s'" + +#, c-format +#~ msgid "could not checkout %s" +#~ msgstr "no se puede hacer checkout a %s" + +#, c-format +#~ msgid "filename in tree entry contains backslash: '%s'" +#~ msgstr "nombre de archivo en el árbol contiene un backslash: '%s'" + +#, c-format +#~ msgid "Use -f if you really want to add them.\n" +#~ msgstr "Usa -f si realmente quieres agregarlos.\n" + +#, c-format +#~ msgid "Maybe you wanted to say 'git add .'?\n" +#~ msgstr "¿Tal vez quiso decir 'git add .'?\n" + +#, c-format +#~ msgid "packfile is invalid: %s" +#~ msgstr "packfile es inválido: %s" + +#, c-format +#~ msgid "unable to open packfile for reuse: %s" +#~ msgstr "no es posible abrir packfile para reusar: %s" + +#~ msgid "unable to seek in reused packfile" +#~ msgstr "no es posible buscar en los packfile reusados" + +#~ msgid "unable to read from reused packfile" +#~ msgstr "no es posible leer de packfile reusado" + +#~ msgid "no HEAD?" +#~ msgstr "¿Sin HEAD?" + +#~ msgid "make committer date match author date" +#~ msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" + +#~ msgid "ignore author date and use current date" +#~ msgstr "ignorar la fecha del autor y usar la fecha actual" + +#~ msgid "synonym of --reset-author-date" +#~ msgstr "sinónimo para --reset-author-date" + +#~ msgid "ignore changes in whitespace" +#~ msgstr "ignorar cambios en espacios en blanco" + +#~ msgid "preserve empty commits during rebase" +#~ msgstr "preservar commits vacíos durante el rebase" + +#~ msgid "cannot combine --use-bitmap-index with object filtering" +#~ msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" + +#, sh-format +#~ msgid "" +#~ "The following path is ignored by one of your .gitignore files:\n" +#~ "$sm_path\n" +#~ "Use -f if you really want to add it." +#~ msgstr "" +#~ "La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" +#~ "$sm_path\n" +#~ "Usa -f si en verdad quieres agregarlo." + +#, c-format +#~ msgid "unable to get tree for %s" +#~ msgstr "no se pudo obtener árbol para %s" + +#~ msgid "Use an experimental heuristic to improve diffs" +#~ msgstr "Usar un heurístico experimental para mejorar los diffs" + +#~ msgid "git commit-graph [--object-dir <objdir>]" +#~ msgstr "git commit-graph [--object-dir <objdir>]" + +#~ msgid "git commit-graph read [--object-dir <objdir>]" +#~ msgstr "git commit-graph read [--object-dir <objdir>]" + +#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +#~ msgstr "" +#~ "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " +#~ "defecto" + +#~ msgid "cannot change partial clone promisor remote" +#~ msgstr "no se puede cambiar un clon parcial remoto promisor" + +#~ msgid "error building trees" +#~ msgstr "error construyendo árboles" + +#~ msgid "invalid date format '%s' in '%s'" +#~ msgstr "formato de fecha inválido '%s' en '%s'" + +#~ msgid "writing root commit" +#~ msgstr "escribiendo commit raíz" + +#~ msgid "staged changes in the following files may be lost: %s" +#~ msgstr "" +#~ "cambios en el área de stage en el siguiente archivo pueden ser perdidos: " +#~ "%s" + +#~ msgid "" +#~ "--filter can only be used with the remote configured in extensions." +#~ "partialClone" +#~ msgstr "" +#~ "--filter solo puede ser usado con el remoto configurado en extensions." +#~ "partialClone" + +#~ msgid "verify commit-msg hook" +#~ msgstr "verificar el hook commit-msg" + +#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'" + +#~ msgid "invalid sparse value '%s'" +#~ msgstr "valor disperso inválido: '%s'" + +#~ msgid "Server supports multi_ack_detailed" +#~ msgstr "El servidor soporta ulti_ack_detailed" + +#~ msgid "Server supports no-done" +#~ msgstr "El servidor soporta no-done" -#~ msgid "bad quoting on %s value in '%s'" -#~ msgstr "mal citado en %s valor en '%s'" +#~ msgid "Server supports multi_ack" +#~ msgstr "El servidor soporta multi_ack" -#~ msgid "Could not unset core.worktree setting in submodule '%s'" -#~ msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'" +#~ msgid "Server supports side-band-64k" +#~ msgstr "El servidor soporta side-band-64k" + +#~ msgid "Server supports side-band" +#~ msgstr "El servidor soporta side-band" + +#~ msgid "Server supports allow-tip-sha1-in-want" +#~ msgstr "El servidor soporta allow-tip-sha1-in-want" + +#~ msgid "Server supports allow-reachable-sha1-in-want" +#~ msgstr "El servidor soporta allow-reachable-sha1-in-want" + +#~ msgid "Server supports ofs-delta" +#~ msgstr "El servidor soporta ofs-delta" + +#~ msgid "(HEAD detached at %s)" +#~ msgstr "(HEAD desacoplado en %s)" + +#~ msgid "(HEAD detached from %s)" +#~ msgstr "(HEAD desacoplado de %s)" + +#~ msgid "Checking out files" +#~ msgstr "Revisando archivos" + +#~ msgid "cannot be interactive without stdin connected to a terminal." +#~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal." + +#~ msgid "failed to stat %s\n" +#~ msgstr "falló al analizar %s\n" + +#~ msgid "" +#~ "If you wish to skip this commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n" +#~ "the remaining commits.\n" +#~ msgstr "" +#~ "Si quiere saltar este commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n" +#~ "para los commits restantes.\n" + +#~ msgid "unrecognized verb: %s" +#~ msgstr "verbo no reconocido: %s" + +#~ msgid "hash version %X does not match version %X" +#~ msgstr "versión de hash %X no concuerda con versión %X" + +#~ msgid "option '%s' requires a value" +#~ msgstr "opción '%s' requiere un valor" + +#~ msgid "could not transform the todo list" +#~ msgstr "no se pudo transformar lista de pendientes" + +#~ msgid "default" +#~ msgstr "default" + +#~ msgid "Could not create directory '%s'" +#~ msgstr "No se pudo crear el directorio '%s'" + +#~ msgid "allow rerere to update index with resolved conflict" +#~ msgstr "permitir rerere actualizar index con conflictos resueltos" + +#~ msgid "could not open %s" +#~ msgstr "no se pudo abrir %s" + +#~ msgid "Could not move back to $head_name" +#~ msgstr "No se puede regresar a $head_name" + +#~ msgid "" +#~ "It seems that there is already a $state_dir_base directory, and\n" +#~ "I wonder if you are in the middle of another rebase. If that is the\n" +#~ "case, please try\n" +#~ "\t$cmd_live_rebase\n" +#~ "If that is not the case, please\n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "and run me again. I am stopping in case you still have something\n" +#~ "valuable there." +#~ msgstr "" +#~ "Parece que ya hay un directorio $state_dir_base, y\n" +#~ "me pregunto si está en medio de otro rebase. Si ese es el \n" +#~ "caso, por favor intente\n" +#~ "\t$cmd_live_rebase\n" +#~ "Si no es el caso, por favor\n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n" +#~ "algo de valor ahí." + +#~ msgid "" +#~ "fatal: cannot combine am options with either interactive or merge options" +#~ msgstr "" +#~ "fatal: no se puede combinar opciones am con opciones interactivas o de " +#~ "merge" + +#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" +#~ msgstr "fatal: no se puede combinar '--signoff' con '--preserve-merges'" + +#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" +#~ msgstr "" +#~ "fatal: no se puede combinar '--preserve-merges' con '--rebase-merges'" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "" +#~ "fatal: no se puede combinar '--rebase-merges' con '--strategy-option'" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" +#~ msgstr "fatal: no se puede combinar '--rebase-merges' con '--strategy'" + +#~ msgid "invalid upstream '$upstream_name'" +#~ msgstr "upstream inválido '$upstream_name'" + +#~ msgid "$onto_name: there are more than one merge bases" +#~ msgstr "$onto_name: hay más de una base de fusión" + +#~ msgid "$onto_name: there is no merge base" +#~ msgstr "$onto_name: no hay base de fusión" + +#~ msgid "Does not point to a valid commit: $onto_name" +#~ msgstr "No apunta a un commit válido: $onto_name" + +#~ msgid "fatal: no such branch/commit '$branch_name'" +#~ msgstr "fatal: no existe la rama/commit: '$branch_name'" + +#~ msgid "Created autostash: $stash_abbrev" +#~ msgstr "Autostash creado: $stash_abbrev" + +#~ msgid "Current branch $branch_name is up to date." +#~ msgstr "La rama actual $branch_name está actualizada." + +#~ msgid "Current branch $branch_name is up to date, rebase forced." +#~ msgstr "Rama actual $branch_name está actualizada, rebase forzado." + +#~ msgid "Changes to $onto:" +#~ msgstr "Cambios hacia $onto:" + +#~ msgid "Changes from $mb to $onto:" +#~ msgstr "Cambios desde $mb a $onto:" + +#~ msgid "Fast-forwarded $branch_name to $onto_name." +#~ msgstr "Avance rápido de $branch_name a $onto_name." + +#~ msgid "First, rewinding head to replay your work on top of it..." +#~ msgstr "" +#~ "En primer lugar, rebobinando HEAD para después reproducir tus cambios " +#~ "encima de ésta..." + +#~ msgid "ignoring unknown color-moved-ws mode '%s'" +#~ msgstr "ignorando modo desconocido color-moved-ws '%s'" + +#~ msgid "only 'tree:0' is supported" +#~ msgstr "solo 'tree:0' es soportado" + +#~ msgid "Renaming %s to %s and %s to %s instead" +#~ msgstr "Renombrando %s a %s y %s a %s más bien" + +#~ msgid "Adding merged %s" +#~ msgstr "Agregar %s fusionado" + +#~ msgid "Internal error" +#~ msgstr "Error interno" + +#~ msgid "mainline was specified but commit %s is not a merge." +#~ msgstr "línea principal especificada pero el commit %s no es una fusión." + +#~ msgid "unable to write sha1 filename %s" +#~ msgstr "incapaz de escribir el nombre de archivo sha1 %s" + +#~ msgid "cannot read sha1_file for %s" +#~ msgstr "no se puede leer sha1_file para %s" + +#~ msgid "" +#~ "error: cannot combine interactive options (--interactive, --exec, --" +#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am " +#~ "options (%s)" +#~ msgstr "" +#~ "error: no se puede combinar opciones interactivas (--interactive, --exec, " +#~ "--rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con " +#~ "opciones (%s)" + +#~ msgid "" +#~ "error: cannot combine merge options (--merge, --strategy, --strategy-" +#~ "option) with am options (%s)" +#~ msgstr "" +#~ "error: no se puede combinar opciones de merge (--merge, --strategy, --" +#~ "strategy-option) con opciones de am (%s)" + +#~ msgid "unrecognised option: '$arg'" +#~ msgstr "opción no reconocida: '$arg'" + +#~ msgid "'$invalid' is not a valid commit" +#~ msgstr "'$invalid' no es un commit válido" + +#~ msgid "could not parse '%s' (looking for '%s')" +#~ msgstr "no se pudo configurar '%s' (buscando '%s')" #~ msgid "deprecated synonym for --create-reflog" #~ msgstr "sinónimo deprecado para --create-reflog" @@ -21223,12 +25038,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgid "cannot remove a locked working tree" #~ msgstr "no se puede eliminar árbol de trabajo encerrado" -#~ msgid "Applied autostash." -#~ msgstr "Autostash aplicado." - -#~ msgid "Cannot store $stash_sha1" -#~ msgstr "No se puede almacenar $stash_sha1" - #~ msgid "" #~ "\n" #~ "\tHowever, if you remove everything, the rebase will be aborted.\n" @@ -21293,7 +25102,7 @@ msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgstr "Error en el objeto" #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" -#~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF" +#~ msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo EOF" #~ msgid "invalid filter-spec expression '%s'" #~ msgstr "expresión filter-spec inválida '%s'" @@ -21323,9 +25132,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgid "could not truncate '%s'" #~ msgstr "no se pudo truncar '%s'" -#~ msgid "could not finish '%s'" -#~ msgstr "no se pudo finalizar '%s'" - #~ msgid "could not close %s" #~ msgstr "no se pudo cerrar %s" @@ -21338,9 +25144,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgid "Don't know how to clone %s" #~ msgstr "No se sabe como clonar %s" -#~ msgid "show ignored files" -#~ msgstr "mostrar archivos ignorados" - #~ msgid "Don't know how to fetch from %s" #~ msgstr "No se sabe como extraer de %s" @@ -21379,9 +25182,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgid "basename" #~ msgstr "nombre base" -#~ msgid "prepend parent project's basename to output" -#~ msgstr "anteponer el nombre base del proyecto padre a la salida" - #~ msgid "" #~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" #~ " - $line" |