diff options
Diffstat (limited to 'po/es.po')
| -rw-r--r-- | po/es.po | 10746 |
1 files changed, 5924 insertions, 4822 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: 2020-07-10 09:53+0800\n" -"PO-Revision-Date: 2020-07-26 10:11-0500\n" +"POT-Creation-Date: 2021-03-04 22:41+0800\n" +"PO-Revision-Date: 2021-03-07 18:29-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,235 +16,235 @@ 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.3\n" +"X-Generator: Poedit 2.4.1\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "¿Ahh (%s)?" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 -#: builtin/rebase.c:1919 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "no se pudo leer índice" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binario" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "nada" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "sin cambios" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "Actualizar" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "no se pudo poner en stage '%s'" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" msgstr "no se pudo escribir índice" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, 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 +#: add-interactive.c:724 git-add--interactive.perl:676 #, 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:294 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 #: builtin/reset.c:145 #, 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 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "Revertir" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" -msgstr "no se pudo analizar HEAD^{tree}" +msgstr "No se pudo analizar HEAD^{tree}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, 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 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "No hay archivos sin rastrear.\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Agregar no rastreados" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, 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 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorando lo no fusionado: %s" -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Solo cambiaron archivos binarios.\n" -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Sin cambios.\n" -#: add-interactive.c:935 git-add--interactive.perl:1378 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Actualización del parche" -#: add-interactive.c:974 git-add--interactive.perl:1771 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Revisión de diff" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "mostrar rutas con cambios" -#: add-interactive.c:1004 +#: add-interactive.c:1012 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 +#: add-interactive.c:1014 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 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "elegir hunks y actualizar de forma selectiva" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "ver diff entre HEAD e index" -#: add-interactive.c:1012 +#: add-interactive.c:1020 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 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "Mostrar ayuda:" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "selecciona un único objeto" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "selecciona un rango de objetos" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "selecciona multiples rangos" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "seleccionar objeto basado en prefijo único" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "quitar objetos especificados" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "escoger todos los objetos" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(vacío) finalizar selección" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "selecciona un objeto numerado" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(vacío) selecciona nada" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "Ahora que" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "rastreado" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "no rastreado" -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 -#: builtin/merge.c:276 builtin/pull.c:190 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 bugreport.c:135 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "ruta" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "no se pudo refrescar el index" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" -#: add-patch.c:34 git-add--interactive.perl:1430 +#: add-patch.c:34 git-add--interactive.perl:1431 #, 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:35 git-add--interactive.perl:1431 +#: add-patch.c:35 git-add--interactive.perl:1432 #, 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:36 git-add--interactive.perl:1432 +#: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1433 +#: add-patch.c:37 git-add--interactive.perl:1434 #, 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,?]? " @@ -272,22 +272,22 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo\n" -#: add-patch.c:56 git-add--interactive.perl:1436 +#: add-patch.c:56 git-add--interactive.perl:1437 #, 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:57 git-add--interactive.perl:1437 +#: add-patch.c:57 git-add--interactive.perl:1438 #, 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:58 git-add--interactive.perl:1438 +#: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1439 +#: add-patch.c:59 git-add--interactive.perl:1440 #, 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,?]? " @@ -314,22 +314,22 @@ 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\n" -#: add-patch.c:80 git-add--interactive.perl:1442 +#: add-patch.c:80 git-add--interactive.perl:1443 #, 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:81 git-add--interactive.perl:1443 +#: add-patch.c:81 git-add--interactive.perl:1444 #, 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:82 git-add--interactive.perl:1444 +#: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1445 +#: add-patch.c:83 git-add--interactive.perl:1446 #, 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,?]? " @@ -357,22 +357,22 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo\n" -#: add-patch.c:103 git-add--interactive.perl:1448 +#: add-patch.c:103 git-add--interactive.perl:1449 #, 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:104 git-add--interactive.perl:1449 +#: add-patch.c:104 git-add--interactive.perl:1450 #, 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:105 git-add--interactive.perl:1450 +#: add-patch.c:105 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1451 +#: add-patch.c:106 git-add--interactive.perl:1452 #, 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,?]? " @@ -399,26 +399,26 @@ 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\n" -#: add-patch.c:126 git-add--interactive.perl:1454 -#: git-add--interactive.perl:1472 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, 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:127 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, 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:128 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, 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,?]? " @@ -445,23 +445,23 @@ 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\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, 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:150 add-patch.c:195 git-add--interactive.perl:1461 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, 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:151 add-patch.c:196 git-add--interactive.perl:1462 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -481,24 +481,24 @@ msgstr "" "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:171 add-patch.c:216 git-add--interactive.perl:1466 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, 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:172 add-patch.c:217 git-add--interactive.perl:1467 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, 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:173 add-patch.c:218 git-add--interactive.perl:1468 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, 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,?]? " @@ -531,34 +531,34 @@ 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\n" -#: add-patch.c:328 +#: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:347 add-patch.c:351 +#: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:405 +#: add-patch.c:419 msgid "could not parse diff" msgstr "no se puede analizar diff" -#: add-patch.c:424 +#: add-patch.c:438 msgid "could not parse colored diff" msgstr "no se pudo analizar diff a colores" -#: add-patch.c:438 +#: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "falló al ejecutar '%s'" -#: add-patch.c:602 +#: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "output de interactive.diffFilter no concuerda" -#: add-patch.c:603 +#: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -566,7 +566,7 @@ msgstr "" "Tu filtro tiene que mantener correspondencia de uno a uno\n" "entre las líneas de entrada y salida." -#: add-patch.c:776 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -575,7 +575,7 @@ msgstr "" "se esperaba línea de contexto #%d en\n" "%.*s" -#: add-patch.c:791 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -588,11 +588,11 @@ msgstr "" "\tno acaba con:\n" "%.*s" -#: add-patch.c:1067 git-add--interactive.perl:1114 +#: add-patch.c:1081 git-add--interactive.perl:1115 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:1071 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -606,7 +606,7 @@ msgstr "" "Lineas comenzando con %c serán eliminadas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1085 git-add--interactive.perl:1128 +#: add-patch.c:1099 git-add--interactive.perl:1129 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" @@ -616,11 +616,11 @@ msgstr "" "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:1118 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "no se puede analizar hunk header" -#: add-patch.c:1163 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "falló 'git apply --cached'" @@ -636,26 +636,26 @@ msgstr "falló 'git apply --cached'" #. 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:1232 git-add--interactive.perl:1241 +#: add-patch.c:1246 git-add--interactive.perl:1242 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:1275 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "¡Los hunks seleccionados no aplican al índice!" -#: add-patch.c:1276 git-add--interactive.perl:1345 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? " -#: add-patch.c:1283 git-add--interactive.perl:1348 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Nada fue aplicado.\n" -#: add-patch.c:1340 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -677,73 +677,73 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: add-patch.c:1463 add-patch.c:1473 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "No el anterior hunk" -#: add-patch.c:1468 add-patch.c:1478 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "No el siguiente hunk" -#: add-patch.c:1484 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "No hay más pedazos para el ir" -#: add-patch.c:1495 git-add--interactive.perl:1594 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "¿a que hunk ir (<enter> para ver más)? " -#: add-patch.c:1496 git-add--interactive.perl:1596 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "¿a que hunk ir? " -#: add-patch.c:1507 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "Numero inválido: '%s'" -#: add-patch.c:1512 +#: add-patch.c:1565 #, 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:1521 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "No hay más pedazos para buscar" -#: add-patch.c:1527 git-add--interactive.perl:1640 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "¿buscar para regexp? " -#: add-patch.c:1542 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regexp para la búsqueda mal formado %s: %s" -#: add-patch.c:1559 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" -msgstr "No hay hunks que concuerden con el patrón entregado." +msgstr "No hay hunks que concuerden con el patrón entregado" -#: add-patch.c:1566 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "Perdón, no se puede dividir este pedazo" -#: add-patch.c:1570 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "Cortar en %d hunk." -#: add-patch.c:1574 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "Perdón, no se puede editar este pedazo" -#: add-patch.c:1625 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "falló 'git apply'" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" @@ -752,38 +752,38 @@ msgstr "" "\n" "Desactivar este mensaje con \"git config advice.%s false\"" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:247 +#: advice.c:250 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:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:257 +#: advice.c:260 #, 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:265 +#: advice.c:268 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." @@ -791,23 +791,23 @@ 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:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:278 builtin/merge.c:1353 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1107,7 +1107,8 @@ msgstr "el parche falló: %s:%ld" msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" @@ -1127,7 +1128,7 @@ msgstr "la ruta %s ha sido renombrada/suprimida" msgid "%s: does not exist in index" msgstr "%s: no existe en el índice" -#: apply.c:3537 apply.c:3708 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el índice" @@ -1177,182 +1178,182 @@ msgstr "%s: tipo incorrecto" msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" -#: apply.c:3936 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el índice" -#: apply.c:3939 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3959 +#: apply.c:3974 #, 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:3964 +#: apply.c:3979 #, 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:3984 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' está tras un enlace simbólico" -#: apply.c:3988 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4003 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4095 +#: apply.c:4110 #, 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:4102 +#: apply.c:4117 #, 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:4105 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4114 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo añadir %s al índice temporal" -#: apply.c:4124 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4262 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del índice" -#: apply.c:4296 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submódulo %s" -#: apply.c:4302 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4310 +#: apply.c:4325 #, 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:4316 apply.c:4461 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4359 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir para '%s'" -#: apply.c:4363 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4433 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4531 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4539 +#: apply.c:4554 msgid "internal error" msgstr "error interno" -#: apply.c:4542 +#: apply.c:4557 #, 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:4553 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4575 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4579 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4698 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4706 +#: apply.c:4726 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4726 +#: apply.c:4746 msgid "unable to read index file" msgstr "no es posible leer el archivo índice" -#: apply.c:4883 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4910 +#: apply.c:4930 #, 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:4916 apply.c:4931 +#: apply.c:4936 apply.c:4951 #, 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:4924 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1361,185 +1362,180 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4968 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4971 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4973 builtin/am.c:2259 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4974 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4977 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4979 +#: apply.c:4999 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:4983 +#: apply.c:5003 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:4985 +#: apply.c:5005 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:4987 +#: apply.c:5007 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:4989 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4991 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4993 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4995 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4998 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:5000 +#: apply.c:5020 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:5002 +#: apply.c:5022 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:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL" -#: apply.c:5007 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden" -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "acción" -#: apply.c:5009 +#: apply.c:5029 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:5012 apply.c:5015 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5018 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5020 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:5022 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5024 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5027 +#: apply.c:5047 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:5030 +#: apply.c:5050 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:5032 builtin/am.c:2247 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "raíz" -#: apply.c:5033 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "no se puede transmitir el blob %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo de archivo no soportado: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "no se puede leer %s" - -#: archive-tar.c:465 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "no se puede comenzar filtro '%s'" -#: archive-tar.c:468 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "incapaz de redirigir descriptor" -#: archive-tar.c:475 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "filtro '%s' reportó un error" -#: archive-zip.c:319 +#: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" msgstr "ruta no válida UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta muy larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: archive-zip.c:615 +#: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" @@ -1563,134 +1559,156 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "no se puede leer %s" + +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 +#, c-format +msgid "could not read '%s'" +msgstr "no se pudo leer '%s'" + +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 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:401 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "no existe el ref: %.*s" -#: archive.c:407 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "nombre de objeto no válido: %s" -#: archive.c:420 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "no es un objeto tree: %s" -#: archive.c:432 +#: archive.c:485 msgid "current working directory is untracked" msgstr "directorio de trabajo actual no rastreado" -#: archive.c:464 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Archivo no encontrado: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "No es un archivo regular: %s" + +#: archive.c:555 msgid "fmt" msgstr "fmt" -#: archive.c:464 +#: archive.c:555 msgid "archive format" msgstr "formato del archivo" -#: archive.c:465 builtin/log.c:1674 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "prefijo" -#: archive.c:466 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: archive.c:467 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:1208 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "carpeta" -#: archive.c:468 builtin/archive.c:90 +#: archive.c:559 +msgid "add untracked file to archive" +msgstr "incluir archivos sin seguimiento al archivo" + +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escribe el archivo en esta carpeta" -#: archive.c:470 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "leer .gitattributes en el directorio de trabajo" -#: archive.c:471 +#: archive.c:565 msgid "report archived files on stderr" msgstr "reportar archivos archivados por stderr" -#: archive.c:472 -msgid "store only" -msgstr "solo guardar" - -#: archive.c:473 -msgid "compress faster" -msgstr "comprimir más rápido" - -#: archive.c:481 -msgid "compress better" -msgstr "comprimir mejor" +#: archive.c:567 +msgid "set compression level" +msgstr "configurar nivel de compresión" -#: archive.c:484 +#: archive.c:570 msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repo" -#: archive.c:487 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "obtener la carpeta del repositorio remoto <repo>" -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:489 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "ruta para el comando git-upload-archivo remoto" -#: archive.c:496 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Opción inesperada --remote" -#: archive.c:498 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "Opción --exec solo puede ser utilizada con --remote" -#: archive.c:500 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Opción inesperada --output" -#: archive.c:522 +#: archive.c:588 +msgid "Options --add-file and --remote cannot be used together" +msgstr "Opciones --add-file y --remote no pueden ser usadas juntas" + +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de carpeta desconocido '%s'" -#: archive.c:529 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no es un nombre de atributo válido" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no permitido: %s:%d" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1698,22 +1716,22 @@ msgstr "" "Los patrones negativos son ignorados en los atributos de git\n" "Usa '\\!' para comenzar literalmente con exclamación." -#: bisect.c:468 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Revisa las comillas en el archivo '%s': %s" -#: bisect.c:678 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "¡No podemos biseccionar más!\n" -#: bisect.c:745 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit válido %s" -#: bisect.c:770 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1722,7 +1740,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:775 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1731,7 +1749,7 @@ msgstr "" "La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:780 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1740,7 +1758,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:788 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1751,7 +1769,7 @@ msgstr "" "git bisect no puede trabajar bien en este caso.\n" "¿Tal vez confundiste la revisión %s y %s?\n" -#: bisect.c:801 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1762,45 +1780,45 @@ 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:840 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Biseccionando: una base de fisión debe ser probada\n" -#: bisect.c:890 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:966 builtin/merge.c:151 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:997 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "falló leer las refs de bisect" -#: bisect.c:1019 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:1028 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:1057 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1810,7 +1828,7 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1101 #, 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" @@ -1830,11 +1848,11 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 -#: builtin/shortlog.c:192 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "falló la configuración del camino de revisión" @@ -2004,366 +2022,384 @@ msgstr "'%s' ya ha sido marcado en '%s'" msgid "HEAD of working tree %s is not updated" msgstr "HEAD del árbol de trabajo %s no está actualizada" -#: bundle.c:47 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "algoritmo bundle hash desconocido %s" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' no se ve como un archivo bundle v2" +msgid "unknown capability '%s'" +msgstr "capacidad desconocida '%s'" -#: bundle.c:69 -msgid "unknown hash algorithm length" -msgstr "largo del algoritmo hash desconocido" +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' no se ve como un archivo bundle v2 o v3" -#: bundle.c:84 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" -#: bundle.c:163 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Al repositorio le falta estos commits prerrequisito:" -#: bundle.c:166 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "se necesita un repositorio para verificar un bundle" -#: bundle.c:217 +#: bundle.c:243 #, 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:224 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#: bundle.c:226 +#: bundle.c:252 #, 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:293 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:300 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:311 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects murió" -#: bundle.c:353 -msgid "rev-list died" -msgstr "rev-list murió" - -#: bundle.c:402 +#: bundle.c:386 #, 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:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:490 +#, c-format +msgid "unsupported bundle version %d" +msgstr "versión de bundle no soportada %d" + +#: bundle.c:492 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s" + +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:489 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacío." -#: bundle.c:499 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:524 +#: bundle.c:574 msgid "index-pack died" msgstr "index-pack murió" +#: chunk-format.c:113 +msgid "terminating chunk id appears earlier than expected" +msgstr "terminando porque el id del chunk aparece antes de lo esperado" + +#: chunk-format.c:122 +#, c-format +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" +msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>" + +#: chunk-format.c:129 +#, c-format +msgid "duplicate chunk ID %<PRIx32> found" +msgstr "se encontró ID de chuck %<PRIx32> duplicado" + +#: chunk-format.c:143 +#, c-format +msgid "final chunk has non-zero id %<PRIx32>" +msgstr "chunk final tiene un id distinto de cero %<PRIx32>" + #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit-graph.c:238 +#: commit-graph.c:197 midx.c:46 +msgid "invalid hash version" +msgstr "versión de hash inválida" + +#: commit-graph.c:255 msgid "commit-graph file is too small" msgstr "archivo commit-graph es muy pequeño" -#: commit-graph.c:303 +#: commit-graph.c:348 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "firma %X en commit-graph no concuerda con firma %X" -#: commit-graph.c:310 +#: commit-graph.c:355 #, c-format 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:317 +#: commit-graph.c:362 #, c-format 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:339 -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:349 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "offset del chunk de commit-graph inapropiado %08x%08x" - -#: commit-graph.c:417 +#: commit-graph.c:379 #, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" +msgid "commit-graph file is too small to hold %u chunks" +msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks" -#: commit-graph.c:491 +#: commit-graph.c:472 msgid "commit-graph has no base graphs chunk" msgstr "commit-graph no tiene una chunk base de graphs" -#: commit-graph.c:501 +#: commit-graph.c:482 msgid "commit-graph chain does not match" msgstr "cadena commit-graph no concuerda" -#: commit-graph.c:549 +#: commit-graph.c:530 #, c-format 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:573 +#: commit-graph.c:554 msgid "unable to find all commit-graph files" msgstr "no es posible encontrar los archivos commit-graph" -#: commit-graph.c:706 commit-graph.c:770 +#: commit-graph.c:735 commit-graph.c:772 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "posición de commit inválida. commit-graph está probablemente corrupto" -#: commit-graph.c:727 +#: commit-graph.c:756 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:1009 builtin/am.c:1292 +#: commit-graph.c:789 +msgid "commit-graph requires overflow generation data but has none" +msgstr "" +"commit-graph requiere datos de generación de desbordamiento pero no tiene " +"ninguno" + +#: commit-graph.c:1065 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: commit-graph.c:1157 -msgid "Writing changed paths Bloom filters index" -msgstr "Escribiendo cambios de ruta del índice de filtros Bloom" - -#: commit-graph.c:1182 -msgid "Writing changed paths Bloom filters data" -msgstr "Escribiendo cambios de ruta de datos de filtros Bloom" - -#: commit-graph.c:1221 builtin/pack-objects.c:2832 +#: commit-graph.c:1327 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:1257 +#: commit-graph.c:1358 msgid "Loading known commits in commit graph" msgstr "Cargando commits conocidos en commit graph" -#: commit-graph.c:1274 +#: commit-graph.c:1375 msgid "Expanding reachable commits in commit graph" msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:1294 +#: commit-graph.c:1395 msgid "Clearing commit marks in commit graph" msgstr "Limpiando marcas de commits en commit graph" -#: commit-graph.c:1313 +#: commit-graph.c:1414 +msgid "Computing commit graph topological levels" +msgstr "Calculando niveles topológicos de commit graph" + +#: commit-graph.c:1467 msgid "Computing commit graph generation numbers" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1367 +#: commit-graph.c:1548 msgid "Computing commit changed paths Bloom filters" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1423 +#: commit-graph.c:1625 msgid "Collecting referenced commits" msgstr "Recolectando commits referenciados" -#: commit-graph.c:1447 +#: commit-graph.c:1650 #, 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:1460 +#: commit-graph.c:1663 #, c-format msgid "error adding pack %s" msgstr "error agregando pack %s" -#: commit-graph.c:1464 +#: commit-graph.c:1667 #, c-format msgid "error opening index for %s" msgstr "error abriendo index para %s" -#: commit-graph.c:1503 +#: commit-graph.c:1704 msgid "Finding commits for commit graph among packed objects" msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:1518 -msgid "Counting distinct commits in commit graph" -msgstr "Contando commits distintos en commit graph" - -#: commit-graph.c:1550 +#: commit-graph.c:1722 msgid "Finding extra edges in commit graph" msgstr "Encontrando esquinas extra en commit graph" -#: commit-graph.c:1599 +#: commit-graph.c:1771 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:1633 midx.c:812 +#: commit-graph.c:1802 midx.c:794 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1646 +#: commit-graph.c:1815 msgid "unable to create temporary graph layer" msgstr "no es posible crear un una capa de gráfico temporal" -#: commit-graph.c:1651 +#: commit-graph.c:1820 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "no se pudo poner permisos a '%s'" -#: commit-graph.c:1728 +#: commit-graph.c:1879 #, 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:1773 +#: commit-graph.c:1915 msgid "unable to open commit-graph chain file" msgstr "no se pudo abrir la cadena de archivos commit-graph" -#: commit-graph.c:1789 +#: commit-graph.c:1931 msgid "failed to rename base commit-graph file" msgstr "no se pudo renombrar el archivo base commit-graph" -#: commit-graph.c:1809 +#: commit-graph.c:1951 msgid "failed to rename temporary commit-graph file" msgstr "falló al renombrar el archivo temporal commit-graph" -#: commit-graph.c:1935 +#: commit-graph.c:2084 msgid "Scanning merged commits" msgstr "Escaneando commits fusionados" -#: commit-graph.c:1946 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "id de commit duplicado inesperado %s" - -#: commit-graph.c:1969 +#: commit-graph.c:2128 msgid "Merging commit-graph" msgstr "Fusionando commit-graph" -#: commit-graph.c:2156 -#, 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:2235 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "" +"intentando escribir un commit-graph, pero 'core.commitGraph' está " +"deshabilitado" -#: commit-graph.c:2167 +#: commit-graph.c:2342 msgid "too many commits to write graph" msgstr "demasiados commits para escribir el gráfico" -#: commit-graph.c:2260 +#: commit-graph.c:2440 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:2270 +#: commit-graph.c:2450 #, 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:2280 commit-graph.c:2295 +#: commit-graph.c:2460 commit-graph.c:2475 #, 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:2287 +#: commit-graph.c:2467 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "falló al analizar commit %s para commit-graph" -#: commit-graph.c:2305 +#: commit-graph.c:2485 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:2320 +#: commit-graph.c:2500 #, 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:2327 +#: commit-graph.c:2507 #, 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:2337 +#: commit-graph.c:2517 #, 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:2346 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:2360 +#: commit-graph.c:2540 #, 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:2365 +#: commit-graph.c:2545 #, 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:2369 +#: commit-graph.c:2549 #, 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:2385 +#: commit-graph.c:2566 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "generación commit-graph para commit %s es %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2391 +#: commit-graph.c:2572 #, 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>" -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" @@ -2393,27 +2429,27 @@ msgstr "" "Apapa este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1172 +#: commit.c:1223 #, 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:1176 +#: commit.c:1227 #, 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:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1182 +#: commit.c:1233 #, 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:1436 +#: commit.c:1487 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" @@ -2428,7 +2464,7 @@ msgstr "" msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2443,293 +2479,337 @@ msgstr "" "\t%s\n" "Esto puede ser causado por inclusiones circulares." -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "no se pudo expandir rutas de inclusión '%s'" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "inclusiones de configuración relativas tienen que venir de archivos" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" "la configuración relativa incluye condicionales que deben venir de archivos" -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "formato config inválido: %s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "Falta la variable de entorno '%s' para la configuración '%.*s'" + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "llave no contiene una sección: %s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "llave no contiene el nombre de variable: %s" -#: config.c:408 sequencer.c:2456 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "llave inválida: %s" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "llave inválida (nueva línea): %s" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "clave de config vacía" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "parámetro de configuración malogrado: %s" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "formato malogrado en %s" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "conteo malogrado en %s" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "demasiadas entradas en %s" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "llave de configuración faltante %s" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "valor de config faltante para %s" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "mala línea de config %d en el blob %s" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "mala línea de config %d en el archivo %s" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "mala línea de config %d en la entrada standard" -#: config.c:848 +#: config.c:1007 #, 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:852 +#: config.c:1011 #, 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:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "mala línea de config %d en %s" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "fuera de rango" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "unidad inválida" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "mal valor de config numérica '%s' para '%s': %s" -#: config.c:1013 +#: config.c:1163 #, 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:1016 +#: config.c:1166 #, 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:1019 +#: config.c:1169 #, 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:1022 +#: config.c:1172 #, 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:1025 +#: config.c:1175 #, 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:1028 +#: config.c:1178 #, 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:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "mal valor de config booleana '%s' para '%s'" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falló al expandir el directorio de usuario en: '%s'" -#: config.c:1132 +#: config.c:1298 #, 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:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "largo de abreviatura fuera de rango: %d" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "nivel de compresión de zlib erróneo %d" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "core.commentChar debería tener solo un caracter" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido de creación de objetos: %s" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "valor malformado para %s" -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "valor malformado para %s: %s" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1533 builtin/pack-objects.c:3617 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz de cargar configuración de objeto blob '%s'" -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referencia '%s' no apunta a un blob" -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no se posible resolver configuración de blob '%s'" -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2113 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2283 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "Inválido %s: '%s'" -#: config.c:2328 +#: config.c:2509 #, 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:2374 +#: config.c:2555 #, 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:2376 +#: config.c:2557 #, 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:2457 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2489 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2518 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2770 config.c:3094 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2781 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2816 builtin/config.c:344 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:2841 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:2854 config.c:3107 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:2865 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2874 config.c:3112 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:2959 config.c:3209 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:2993 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3085 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "sección de nombre inválida: %s" -#: config.c:3252 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2791,45 +2871,45 @@ msgstr "paquete inválido" msgid "protocol error: unexpected '%s'" msgstr "error de protocolo: '%s' inesperado" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "respuesta de referencias ls-refs inválida: %s" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "flush esperado tras listado de refs" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "se esperaba un paquete final luego del ref listing" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "protocolo '%s' no es soportado" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "no es posible configurar SO_KEEPALIVE en el socket" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "Revisando %s... " -#: connect.c:735 +#: connect.c:761 #, 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:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" @@ -2838,7 +2918,7 @@ msgstr "" "hecho.\n" "Conectando a %s (puerto %s) ... " -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2848,74 +2928,78 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "hecho." -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "no es posible revisar %s (%s)" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "puerto desconocido %s" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "hostname extraño '%s' bloqueado" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "puerto extraño '%s' bloqueado" -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "no se puede comenzar proxy %s" -#: connect.c:1024 +#: connect.c:1050 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:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "variante 'simple' de ssh no soporta -4" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "variante 'simple' de ssh no soporta -6" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "variante ssh 'simple' no soporta configurar puerto" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "ruta extraña '%s' bloqueada" -#: connect.c:1407 +#: connect.c:1436 msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:121 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:141 +#: connected.c:144 msgid "failed write to rev-list" msgstr "falló escribir a rev-list" -#: connected.c:148 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" @@ -2990,40 +3074,40 @@ msgstr "falló al codificar '%s' de %s a %s" 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:668 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no se puede hacer fork para ejecutar filtros externos '%s'" -#: convert.c:688 +#: convert.c:685 #, 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:695 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' falló %d" -#: convert.c:730 convert.c:733 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "lectura de filtro externo '%s' falló" -#: convert.c:736 convert.c:791 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "filtro externo '%s' falló" -#: convert.c:840 +#: convert.c:837 msgid "unexpected filter type" msgstr "tipo de filtro inesperado" -#: convert.c:851 +#: convert.c:848 msgid "path name too long for external filter" msgstr "nombre de ruta muy largo para filtro externo" -#: convert.c:943 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3032,16 +3116,16 @@ msgstr "" "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido " "filtradas" -#: convert.c:1243 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false no son working-tree-encodings válidos" -#: convert.c:1431 convert.c:1465 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: falló al limpiar filtro '%s'" -#: convert.c:1511 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: filtro smudge %s falló" @@ -3059,17 +3143,17 @@ msgstr "rehusando trabajar con credenciales faltantes en el campo host" msgid "refusing to work with credential missing protocol field" msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo" -#: credential.c:396 +#: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "url contiene un espace de línea en su componente %s: %s" -#: credential.c:440 +#: credential.c:438 #, c-format msgid "url has no scheme: %s" msgstr "url no tiene scheme: %s" -#: credential.c:513 +#: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" msgstr "url credencial no puede ser analizada: %s" @@ -3166,6 +3250,31 @@ msgstr "regex isla de config tiene muchos grupos de captura (max=%d)" msgid "Marked %d islands, done.\n" msgstr "%d islas marcadas, listo.\n" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valor desconocido para --diff-merges: %s" + +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "--merge-base no funciona con rangos" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "--merge-base solo funciona con confirmaciones" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "no es posible obtener HEAD" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "no se encontró base de fusión" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "múltiples bases de fusión encontradas" + #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<opciones>] <path> <path>" @@ -3229,35 +3338,35 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4243 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4589 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4592 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4670 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4718 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat inválido: %s" -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numérico" -#: diff.c:4755 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3266,42 +3375,42 @@ msgstr "" "Falló al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4840 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4864 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4878 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4928 diff.c:4934 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4946 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:4967 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:4986 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo inválido '%s' en --color-moved-ws" -#: diff.c:5026 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3309,154 +3418,159 @@ msgstr "" "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5062 diff.c:5082 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "argumento inválido para %s" -#: diff.c:5219 +#: diff.c:5226 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "regex inválido para -I: '%s'" + +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "falló al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5275 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5298 +#: diff.c:5367 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5300 diff.c:5306 +#: diff.c:5369 diff.c:5375 msgid "generate patch" msgstr "generar parche" -#: diff.c:5303 builtin/log.c:177 +#: diff.c:5372 builtin/log.c:179 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5308 diff.c:5422 diff.c:5429 +#: diff.c:5377 diff.c:5491 diff.c:5498 msgid "<n>" msgstr "<n>" -#: diff.c:5309 diff.c:5312 +#: diff.c:5378 diff.c:5381 msgid "generate diffs with <n> lines context" msgstr "genera diffs con <n> líneas de contexto" -#: diff.c:5314 +#: diff.c:5383 msgid "generate the diff in raw format" msgstr "genera el diff en formato raw" -#: diff.c:5317 +#: diff.c:5386 msgid "synonym for '-p --raw'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5321 +#: diff.c:5390 msgid "synonym for '-p --stat'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5325 +#: diff.c:5394 msgid "machine friendly --stat" msgstr "--stat amigable para máquina" -#: diff.c:5328 +#: diff.c:5397 msgid "output only the last line of --stat" msgstr "mostrar solo la última línea para --stat" -#: diff.c:5330 diff.c:5338 +#: diff.c:5399 diff.c:5407 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5331 +#: diff.c:5400 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:5335 +#: diff.c:5404 msgid "synonym for --dirstat=cumulative" msgstr "sinónimo para --dirstat=cumulative" -#: diff.c:5339 +#: diff.c:5408 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo para --dirstat=archivos,param1,param2..." -#: diff.c:5343 +#: diff.c:5412 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:5346 +#: diff.c:5415 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5349 +#: diff.c:5418 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5352 +#: diff.c:5421 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5354 +#: diff.c:5423 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" -#: diff.c:5355 +#: diff.c:5424 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5357 diff.c:5360 diff.c:5363 +#: diff.c:5426 diff.c:5429 diff.c:5432 msgid "<width>" msgstr "<ancho>" -#: diff.c:5358 +#: diff.c:5427 msgid "generate diffstat with a given width" msgstr "genera diffstat con un ancho dado" -#: diff.c:5361 +#: diff.c:5430 msgid "generate diffstat with a given name width" msgstr "genera diffstat con un nombre de ancho dado" -#: diff.c:5364 +#: diff.c:5433 msgid "generate diffstat with a given graph width" msgstr "genera diffstat con un ancho de graph dado" -#: diff.c:5366 +#: diff.c:5435 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5367 +#: diff.c:5436 msgid "generate diffstat with limited lines" msgstr "genera diffstat con líneas limitadas" -#: diff.c:5370 +#: diff.c:5439 msgid "generate compact summary in diffstat" msgstr "genera un resumen compacto de diffstat" -#: diff.c:5373 +#: diff.c:5442 msgid "output a binary diff that can be applied" msgstr "muestra un diff binario que puede ser aplicado" -#: diff.c:5376 +#: diff.c:5445 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:5378 +#: diff.c:5447 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5379 +#: diff.c:5448 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5380 +#: diff.c:5449 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3464,7 +3578,7 @@ msgstr "" "resaltar errores de espacios en blanco en las líneas 'context', 'old' o " "'new' del diff" -#: diff.c:5383 +#: diff.c:5452 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3472,89 +3586,89 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5387 +#: diff.c:5456 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5390 +#: diff.c:5459 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostrar el prefijo de destino en lugar de \"b/\"" -#: diff.c:5393 +#: diff.c:5462 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada línea mostrada" -#: diff.c:5396 +#: diff.c:5465 msgid "do not show any source or destination prefix" msgstr "no mostrar ningún prefijo de fuente o destino" -#: diff.c:5399 +#: diff.c:5468 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:5403 diff.c:5408 diff.c:5413 +#: diff.c:5472 diff.c:5477 diff.c:5482 msgid "<char>" msgstr "<char>" -#: diff.c:5404 +#: diff.c:5473 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:5409 +#: diff.c:5478 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:5414 +#: diff.c:5483 msgid "specify the character to indicate a context instead of ' '" msgstr "especifica el char para indicar un contexto en lugar de ' '" -#: diff.c:5417 +#: diff.c:5486 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5418 +#: diff.c:5487 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5419 +#: diff.c:5488 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:5423 +#: diff.c:5492 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5427 +#: diff.c:5496 msgid "omit the preimage for deletes" msgstr "omite la preimage para borrados" -#: diff.c:5430 +#: diff.c:5499 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5434 +#: diff.c:5503 msgid "use unmodified files as source to find copies" msgstr "usa archivos no modificados como fuente para encontrar copias" -#: diff.c:5436 +#: diff.c:5505 msgid "disable rename detection" msgstr "deshabilita detección de renombres" -#: diff.c:5439 +#: diff.c:5508 msgid "use empty blobs as rename source" msgstr "usa blobs vacíos como fuente de renombre" -#: diff.c:5441 +#: diff.c:5510 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:5444 +#: diff.c:5513 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3562,155 +3676,159 @@ msgstr "" "previene detección de renombre/copias si el número de objetivos para " "renombres/copias excede el límite dado" -#: diff.c:5446 +#: diff.c:5515 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5448 +#: diff.c:5517 msgid "produce the smallest possible diff" msgstr "produce el diff más pequeño posible" -#: diff.c:5451 +#: diff.c:5520 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando líneas" -#: diff.c:5454 +#: diff.c:5523 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de líneas en blanco" -#: diff.c:5457 +#: diff.c:5526 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5460 +#: diff.c:5529 msgid "ignore carrier-return at the end of line" msgstr "ignora carrier-return al final de la línea" -#: diff.c:5463 +#: diff.c:5532 msgid "ignore changes whose lines are all blank" msgstr "ignora cambios cuyas líneas son todas en blanco" -#: diff.c:5466 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +msgid "<regex>" +msgstr "<regex>" + +#: diff.c:5535 +msgid "ignore changes whose all lines match <regex>" +msgstr "ignora cambios cuyas líneas concuerdan con <regex>" + +#: diff.c:5538 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:5469 +#: diff.c:5541 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5473 +#: diff.c:5545 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5475 +#: diff.c:5547 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5476 +#: diff.c:5548 msgid "choose a diff algorithm" msgstr "escoge un algoritmo para diff" -#: diff.c:5478 +#: diff.c:5550 msgid "<text>" msgstr "<texto>" -#: diff.c:5479 +#: diff.c:5551 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera un diff usando algoritmo \"anchored diff\"" -#: diff.c:5481 diff.c:5490 diff.c:5493 +#: diff.c:5553 diff.c:5562 diff.c:5565 msgid "<mode>" msgstr "<modo>" -#: diff.c:5482 +#: diff.c:5554 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5484 diff.c:5487 diff.c:5532 -msgid "<regex>" -msgstr "<regex>" - -#: diff.c:5485 +#: diff.c:5557 msgid "use <regex> to decide what a word is" msgstr "usa <regex> para decidir que palabra es" -#: diff.c:5488 +#: diff.c:5560 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5491 +#: diff.c:5563 msgid "moved lines of code are colored differently" msgstr "líneas movidas de código están coloreadas diferente" -#: diff.c:5494 +#: diff.c:5566 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5497 +#: diff.c:5569 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5499 +#: diff.c:5571 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:5503 +#: diff.c:5575 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5505 +#: diff.c:5577 msgid "swap two inputs, reverse the diff" msgstr "cambia dos inputs, invierte el diff" -#: diff.c:5507 +#: diff.c:5579 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5509 +#: diff.c:5581 msgid "disable all output of the program" msgstr "deshabilita todo el output del programa" -#: diff.c:5511 +#: diff.c:5583 msgid "allow an external diff helper to be executed" msgstr "permite la ejecución de un diff helper externo" -#: diff.c:5513 +#: diff.c:5585 msgid "run external text conversion filters when comparing binary files" msgstr "" "ejecuta filtros de conversión de texto externos cuando comparando binarios" -#: diff.c:5515 +#: diff.c:5587 msgid "<when>" msgstr "<cuando>" -#: diff.c:5516 +#: diff.c:5588 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a submódulos en la generación de diff" -#: diff.c:5519 +#: diff.c:5591 msgid "<format>" msgstr "<formato>" -#: diff.c:5520 +#: diff.c:5592 msgid "specify how differences in submodules are shown" msgstr "especifica como son mostradas las diferencias en submódulos" -#: diff.c:5524 +#: diff.c:5596 msgid "hide 'git add -N' entries from the index" msgstr "ocultar entradas 'git add -N' del index" -#: diff.c:5527 +#: diff.c:5599 msgid "treat 'git add -N' entries as real in the index" msgstr "trata entradas 'git add -N' como reales en el index" -#: diff.c:5529 +#: diff.c:5601 msgid "<string>" msgstr "<string>" -#: diff.c:5530 +#: diff.c:5602 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3718,7 +3836,7 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el string " "especificado" -#: diff.c:5533 +#: diff.c:5605 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3726,23 +3844,35 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el regex " "especificado" -#: diff.c:5536 +#: diff.c:5608 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:5539 +#: diff.c:5611 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:5542 +#: diff.c:5614 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:5543 +#: diff.c:5615 diff.c:5618 +msgid "<path>" +msgstr "<ruta>" + +#: diff.c:5616 +msgid "show the change in the specified path first" +msgstr "mostrar el cambio en la ruta especificada primero" + +#: diff.c:5619 +msgid "skip the output to the specified path" +msgstr "saltar el output de la ruta especificada" + +#: diff.c:5621 msgid "<object-id>" msgstr "<id-objeto>" -#: diff.c:5544 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3750,33 +3880,33 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el objeto " "especificado" -#: diff.c:5546 +#: diff.c:5624 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5547 +#: diff.c:5625 msgid "select files by diff type" msgstr "selecciona archivos por tipo de diff" -#: diff.c:5549 +#: diff.c:5627 msgid "<file>" msgstr "<archivo>" -#: diff.c:5550 +#: diff.c:5628 msgid "Output to a specific file" msgstr "Output a un archivo específico" -#: diff.c:6205 +#: diff.c:6285 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:6208 +#: diff.c:6288 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:6211 +#: diff.c:6291 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3789,65 +3919,70 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "falló al leer orden de archivos '%s'" -#: diffcore-rename.c:592 +#: diffcore-rename.c:786 msgid "Performing inexact rename detection" msgstr "Realizando una detección de cambios de nombre inexacta" -#: dir.c:573 +#: diffcore-rotate.c:29 +#, c-format +msgid "No such path '%s' in the diff" +msgstr "No hay ruta '%s' en el diff" + +#: dir.c:578 #, 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:713 dir.c:742 dir.c:755 +#: dir.c:718 dir.c:747 dir.c:760 #, c-format msgid "unrecognized pattern: '%s'" msgstr "patrón desconocido: '%s'" -#: dir.c:772 dir.c:786 +#: dir.c:777 dir.c:791 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "patrón negativo no reconocido: '%s'" -#: dir.c:804 +#: dir.c:809 #, 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:814 +#: dir.c:819 msgid "disabling cone pattern matching" msgstr "deshabilitar coincidencia de patrónes cono" -#: dir.c:1191 +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusión" -#: dir.c:2296 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2596 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "falló al conseguir la información y nombre del kernel" -#: dir.c:2720 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache está desactivado en este sistema o ubicación" -#: dir.c:3502 +#: dir.c:3534 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo índice corrompido en repositorio %s" -#: dir.c:3547 dir.c:3552 +#: dir.c:3579 dir.c:3584 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3581 +#: dir.c:3613 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -3866,12 +4001,12 @@ msgstr "Filtrando contenido" msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:337 +#: environment.c:335 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no se pudo configurar GIT_DIR a '%s'" @@ -3881,260 +4016,264 @@ msgstr "no se pudo configurar GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "demasiados argumentos para correr %s" -#: fetch-pack.c:152 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: lista poco profunda esperada" -#: fetch-pack.c:155 +#: fetch-pack.c:180 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:166 +#: fetch-pack.c:191 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:186 +#: fetch-pack.c:211 #, 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:197 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "no se puede escribir al remoto" -#: fetch-pack.c:259 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:358 fetch-pack.c:1408 +#: fetch-pack.c:378 fetch-pack.c:1457 #, c-format msgid "invalid shallow line: %s" msgstr "línea poco profunda inválida: %s" -#: fetch-pack.c:364 fetch-pack.c:1414 +#: fetch-pack.c:384 fetch-pack.c:1463 #, c-format msgid "invalid unshallow line: %s" msgstr "línea superficial inválida: %s" -#: fetch-pack.c:366 fetch-pack.c:1416 +#: fetch-pack.c:386 fetch-pack.c:1465 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:369 fetch-pack.c:1419 +#: fetch-pack.c:389 fetch-pack.c:1468 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:371 fetch-pack.c:1421 +#: fetch-pack.c:391 fetch-pack.c:1470 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:374 fetch-pack.c:1425 +#: fetch-pack.c:394 fetch-pack.c:1474 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" -#: fetch-pack.c:416 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "se obtuvo %s %d %s" -#: fetch-pack.c:433 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:464 +#: fetch-pack.c:482 msgid "giving up" msgstr "rindiéndose" -#: fetch-pack.c:477 progress.c:336 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "listo" -#: fetch-pack.c:489 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "se obtuvo %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:756 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:821 +#: fetch-pack.c:844 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:829 +#: fetch-pack.c:852 msgid "protocol error: bad pack header" msgstr "error de protocolo: paquete de header erróneo" -#: fetch-pack.c:910 +#: fetch-pack.c:946 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:927 +#: fetch-pack.c:952 +msgid "fetch-pack: invalid index-pack output" +msgstr "fetch-pack: salida de paquete de índice no válida" + +#: fetch-pack.c:969 #, c-format msgid "%s failed" msgstr "%s falló" -#: fetch-pack.c:929 +#: fetch-pack.c:971 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:976 +#: fetch-pack.c:1031 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 #, c-format msgid "Server supports %s" msgstr "El servidor soporta %s" -#: fetch-pack.c:983 +#: fetch-pack.c:1041 msgid "Server does not support shallow clients" msgstr "El servidor no soporta clientes superficiales" -#: fetch-pack.c:1043 +#: fetch-pack.c:1101 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shalow-since" -#: fetch-pack.c:1048 +#: fetch-pack.c:1106 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shalow-exclude" -#: fetch-pack.c:1052 +#: fetch-pack.c:1110 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:1054 +#: fetch-pack.c:1112 msgid "Server does not support this repository's object format" msgstr "El servidor no soporta el formato de objetos de este repositorio" -#: fetch-pack.c:1071 +#: fetch-pack.c:1125 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1083 fetch-pack.c:1639 +#: fetch-pack.c:1138 fetch-pack.c:1682 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch falló." -#: fetch-pack.c:1211 +#: fetch-pack.c:1265 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "algoritmos no compatibles: cliente %s; servidor %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1269 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servidor no soporta el algoritmo '%s'" -#: fetch-pack.c:1235 +#: fetch-pack.c:1289 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1242 +#: fetch-pack.c:1296 msgid "Server supports filter" msgstr "El servidor soporta filtro" -#: fetch-pack.c:1286 +#: fetch-pack.c:1335 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" -#: fetch-pack.c:1304 +#: fetch-pack.c:1353 #, c-format msgid "error reading section header '%s'" msgstr "error leyendo sección header '%s'" -#: fetch-pack.c:1310 +#: fetch-pack.c:1359 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibió '%s'" -#: fetch-pack.c:1371 +#: fetch-pack.c:1420 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "línea de confirmación inesperada: '%s'" -#: fetch-pack.c:1376 +#: fetch-pack.c:1425 #, c-format msgid "error processing acks: %d" msgstr "error procesando acks: %d" -#: fetch-pack.c:1386 +#: fetch-pack.c:1435 msgid "expected packfile to be sent after 'ready'" msgstr "espere que el packfile sea mandado luego del 'listo'" -#: fetch-pack.c:1388 +#: fetch-pack.c:1437 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:1430 +#: fetch-pack.c:1479 #, c-format msgid "error processing shallow info: %d" msgstr "error procesando información superficial: %d" -#: fetch-pack.c:1477 +#: fetch-pack.c:1526 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1482 +#: fetch-pack.c:1531 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1487 +#: fetch-pack.c:1536 #, c-format msgid "error processing wanted refs: %d" msgstr "error procesando refs deseadas: %d" -#: fetch-pack.c:1517 +#: fetch-pack.c:1566 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: se espera un paquete final de respuesta" -#: fetch-pack.c:1921 +#: fetch-pack.c:1960 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1944 builtin/clone.c:692 +#: fetch-pack.c:1983 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: fetch-pack.c:1971 +#: fetch-pack.c:2010 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1974 +#: fetch-pack.c:2013 #, 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:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falló al escribir la firma separada para '%s'" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg falló al firmar la data" @@ -4143,7 +4282,7 @@ msgstr "gpg falló al firmar la data" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color inválido '%.*s' en log.graphColors" -#: grep.c:668 +#: grep.c:543 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4151,18 +4290,18 @@ msgstr "" "el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es " "soportado con -P bajo PCRE v2" -#: grep.c:2128 +#: grep.c:1906 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falló al marcar '%s'" -#: grep.c:2156 +#: grep.c:1934 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -4219,41 +4358,41 @@ msgstr "Comandos de bajo nivel / Sincronización de repositorios" msgid "Low-level Commands / Internal Helpers" msgstr "Comandos de bajo nivel / Auxiliares internos" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "comandos disponibles de git en '%s'" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "comandos disponibles de git desde otro lugar en tu $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Estos son comandos comunes de Git usados en varias situaciones:" -#: help.c:363 git.c:99 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "comando de listado de tipos no soportado '%s'" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Las guías comunes de Git son:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Las guías de conceptos de Git son:" -#: help.c:427 +#: help.c:429 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:432 +#: help.c:434 msgid "External commands" msgstr "Comandos externos" -#: help.c:447 +#: help.c:449 msgid "Command aliases" msgstr "Aliases de comando" -#: help.c:511 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4262,31 +4401,31 @@ msgstr "" "'%s' parece ser un comando de git, pero no hemos\n" "podido ejecutarlo. ¿Tal vez git-%s se ha roto?" -#: help.c:570 +#: help.c:543 help.c:631 +#, 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:591 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:592 +#: help.c:613 #, 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:597 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuando asumiendo que quisiste decir '%s'." -#: help.c:602 +#: help.c:623 #, 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:610 -#, 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:614 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4300,16 +4439,16 @@ msgstr[1] "" "\n" "Los comandos más similares son" -#: help.c:654 +#: help.c:675 msgid "git version [<options>]" msgstr "git versión [<opciones>]" -#: help.c:709 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:713 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4323,7 +4462,15 @@ msgstr[1] "" "\n" "¿Quisiste decir alguno de estos?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Identidad del autor desconocido\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Se desconoce la identidad del autor\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4349,66 +4496,66 @@ msgstr "" "Omite --global para configurar tu identidad solo en este repositorio.\n" "\n" -#: ident.c:379 +#: ident.c:397 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:384 +#: ident.c:402 #, 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:401 +#: ident.c:419 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:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "no se puede tener un nombre vacío (para <%s>)" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:436 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inválido: %s" -#: list-objects-filter-options.c:58 +#: list-objects-filter-options.c:81 msgid "expected 'tree:<depth>'" msgstr "se esperaba 'tree:<depth>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:96 msgid "sparse:path filters support has been dropped" msgstr "soporte para filtros sparse:path ha sido discontinuado" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:109 #, c-format msgid "invalid filter-spec '%s'" msgstr "filtro -spec inválido '%s'" -#: list-objects-filter-options.c:102 +#: list-objects-filter-options.c:125 #, 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 +#: list-objects-filter-options.c:167 msgid "expected something after combine:" msgstr "se espera algo luego de combine:" -#: list-objects-filter-options.c:226 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" -#: list-objects-filter-options.c:330 +#: list-objects-filter-options.c:361 msgid "unable to upgrade repository format to support partial clone" msgstr "" "no es posible actualizar el formato del repositorio para soportar clonado " @@ -4464,10 +4611,266 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "No se pudo crear '%s.lock': %s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "valor inválido '%s' para lsrefs.unborn" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "se esperaba un flush luego de argumentos ls-refs" +#: merge-ort.c:888 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-ort.c:897 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-ort.c:906 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-ort.c:916 merge-ort.c:923 +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "Nota: Fast-forward de submódulo %s a %s" + +#: merge-ort.c:944 +#, c-format +msgid "Failed to merge submodule %s" +msgstr "falló al fusionar el submódulo %s" + +#: merge-ort.c:951 +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" +"Falló al fusionar el submódulo %s, pero existen posibles soluciones de " +"fusión:\n" +"%s\n" + +#: merge-ort.c:955 merge-recursive.c:1259 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Si esto es correcto simplemente agrégalo al índice por ejemplo\n" +"usando:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"el cual aceptará esta sugerencia.\n" + +#: merge-ort.c:968 +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" +"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n" +"%s" + +#: merge-ort.c:1127 merge-recursive.c:1341 +msgid "Failed to execute internal merge" +msgstr "Falló al ejecutar la fusión interna" + +#: merge-ort.c:1132 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-ort.c:1139 merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "Auto-fusionando %s" + +#: merge-ort.c:1278 merge-recursive.c:2100 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio " +"existente en %s se interpone con el cambio de nombres implícito, poniendo " +"la(s) siguiente(s) ruta(s) aquí: %s." + +#: merge-ort.c:1288 merge-recursive.c:2110 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +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-ort.c:1471 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" +"CONFLICTO (división de cambio de nombre de directorio): No está claro dónde " +"cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, " +"sin que ningún destino obtenga la mayoría de los archivos." + +#: merge-ort.c:1637 merge-recursive.c:2447 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" +"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " +"renombrado." + +#: merge-ort.c:1781 merge-recursive.c:3215 +#, 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-ort.c:1788 merge-recursive.c:3222 +#, 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-ort.c:1801 merge-recursive.c:3218 +#, 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-ort.c:1809 merge-recursive.c:3225 +#, 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-ort.c:1952 +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" +"CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s." + +#: merge-ort.c:2047 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" +"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de%s -" +">%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede " +"resultar en marcadores de conflicto anidados." + +#: merge-ort.c:2066 merge-ort.c:2090 +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" +"CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado " +"en %s." + +#: merge-ort.c:2735 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" +"CONFLICTO (archivo / directorio): directorio en el camino de%s de%s; " +"moviéndolo a%s en su lugar." + +#: merge-ort.c:2808 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"of them so each can be recorded somewhere." +msgstr "" +"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; " +"renombrado%s de ellos para que cada uno pueda ser grabado en algún lugar." + +#: merge-ort.c:2812 +msgid "both" +msgstr "ambos" + +#: merge-ort.c:2812 +msgid "one" +msgstr "uno" + +#: merge-ort.c:2907 merge-recursive.c:3052 +msgid "content" +msgstr "contenido" + +#: merge-ort.c:2909 merge-recursive.c:3056 +msgid "add/add" +msgstr "agregar/agregar" + +#: merge-ort.c:2911 merge-recursive.c:3101 +msgid "submodule" +msgstr "submódulo" + +#: merge-ort.c:2913 merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "CONFLICTO (%s): Conflicto de fusión en %s" + +#: merge-ort.c:2938 +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. " +"Versión %s de %s restante en el árbol." + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:3406 +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "" +"La recopilación de información de fusión falló para los árboles %s, %s, %s" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#, 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-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "¡Ya está actualizado!" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit erróneo)\n" @@ -4526,21 +4929,6 @@ msgstr "falló al crear el enlace simbólico '%s': %s" msgid "do not know what to do with %06o %s '%s'" msgstr "no se que hacer con %06o %s '%s'" -#: 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: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: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:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" @@ -4566,42 +4954,11 @@ msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)" 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:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Si esto es correcto simplemente agrégalo al índice por ejemplo\n" -"usando:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"el cual aceptará esta sugerencia.\n" - #: 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:1341 -msgid "Failed to execute internal merge" -msgstr "Falló al ejecutar la fusión interna" - -#: 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:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "Auto-fusionando %s" - #: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." @@ -4713,25 +5070,6 @@ 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:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio " -"existente en %s se interpone con el cambio de nombres implícito, poniendo " -"la(s) siguiente(s) ruta(s) aquí: %s." - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -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:2202 #, c-format msgid "" @@ -4741,15 +5079,6 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" -"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " -"renombrado." - #: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" @@ -4768,70 +5097,16 @@ msgstr "modificar" msgid "modified" msgstr "modificado" -#: merge-recursive.c:3052 -msgid "content" -msgstr "contenido" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "agregar/agregar" - #: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3101 git-submodule.sh:959 -msgid "submodule" -msgstr "submódulo" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLICTO (%s): Conflicto de fusión en %s" - #: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:3215 -#, 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:3218 -#, 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:3222 -#, 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:3225 -#, 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:3339 #, c-format msgid "Removing %s" @@ -4862,46 +5137,33 @@ msgstr "Agregando %s" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "¡Ya está actualizado!" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:3549 +#: merge-recursive.c:3539 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3562 +#: merge-recursive.c:3552 #, 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:3612 +#: merge-recursive.c:3602 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3671 -#, 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:3768 +#: merge-recursive.c:3758 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 +#: builtin/stash.c:471 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -4909,187 +5171,181 @@ msgstr "Incapaz de escribir el índice." msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" -#: midx.c:68 +#: midx.c:62 +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "" +"El abanico de OID de índice de paquetes múltiples es del tamaño incorrecto" + +#: midx.c:93 #, c-format msgid "multi-pack-index file %s is too small" msgstr "archivo multi-pack-index %s es muy pequeño" -#: midx.c:84 +#: midx.c:109 #, 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:89 +#: midx.c:114 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versión %d de multi-pack-index no reconocida" -#: midx.c:94 +#: midx.c:119 #, c-format -msgid "hash version %u does not match" -msgstr "versión de hash %u no concuerda" - -#: midx.c:108 -msgid "invalid chunk offset (too large)" -msgstr "offset inválido del conjunto (muy grande)" - -#: midx.c:132 -msgid "terminating multi-pack-index chunk id appears earlier than expected" +msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -"terminando multi-pack-index porque el id del conjunto aparece antes de lo " -"esperado" +"La versión de hash de índice de paquetes múltiples %u no coincide con la " +"versión %u" -#: midx.c:145 +#: midx.c:136 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index le falta el conjunto pack-name requerido" -#: midx.c:147 +#: midx.c:138 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:149 +#: midx.c:140 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:151 +#: midx.c:142 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido" -#: midx.c:165 +#: midx.c:158 #, 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:208 +#: midx.c:202 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mal pack-int-id: %u (%u paquetes totales)" -#: midx.c:258 +#: midx.c:252 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:286 -msgid "error preparing packfile from multi-pack-index" -msgstr "error preparando packfile de multi-pack-index" - -#: midx.c:470 +#: midx.c:467 #, c-format msgid "failed to add packfile '%s'" msgstr "falló al agregar packfile '%s'" -#: midx.c:476 +#: midx.c:473 #, c-format msgid "failed to open pack-index '%s'" msgstr "falló al abrir pack-index '%s'" -#: midx.c:536 +#: midx.c:533 #, c-format msgid "failed to locate object %d in packfile" msgstr "falló al ubicar objeto %d en packfile" -#: midx.c:840 +#: midx.c:821 msgid "Adding packfiles to multi-pack-index" msgstr "Agregando packfiles a multi-pack-index" -#: midx.c:873 +#: midx.c:855 #, c-format msgid "did not see pack-file %s to drop" msgstr "no se vió pack-file %s caer" -#: midx.c:925 +#: midx.c:904 msgid "no pack files to index." msgstr "no hay archivos pack para indexar." -#: midx.c:977 -msgid "Writing chunks to multi-pack-index" -msgstr "Escribiendo chunks a multi-pack-index" - -#: midx.c:1056 +#: midx.c:965 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falló al limpiar multi-pack-index en %s" -#: midx.c:1112 +#: midx.c:1021 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" +"El archivo de índice de paquetes múltiples existe, pero no se pudo analizar" + +#: midx.c:1029 msgid "Looking for referenced packfiles" msgstr "Buscando por packfiles referidos" -#: midx.c:1127 +#: midx.c:1044 #, 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:1132 +#: midx.c:1049 msgid "the midx contains no oid" msgstr "el midx no contiene oid" -#: midx.c:1141 +#: midx.c:1058 msgid "Verifying OID order in multi-pack-index" msgstr "Verificando orden de OID en multi-pack-index" -#: midx.c:1150 +#: midx.c:1067 #, 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:1170 +#: midx.c:1087 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1177 +#: midx.c:1094 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1193 +#: midx.c:1110 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1199 +#: midx.c:1116 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "falló al cargar el pack-index para packfile %s" -#: midx.c:1208 +#: midx.c:1125 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1233 +#: midx.c:1150 msgid "Counting referenced objects" msgstr "Contando objetos no referenciados" -#: midx.c:1243 +#: midx.c:1160 msgid "Finding and deleting unreferenced packfiles" msgstr "Encontrando y borrando packfiles sin referencias" -#: midx.c:1433 +#: midx.c:1351 msgid "could not start pack-objects" msgstr "no se pudo empezar los pack-objetcts" -#: midx.c:1452 +#: midx.c:1371 msgid "could not finish pack-objects" msgstr "no se pudo finalizar pack-objetcts" -#: name-hash.c:537 +#: name-hash.c:538 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no es posible crear hilo lazy_dir: %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "no es posible crear hilo lazy_name: %s" -#: name-hash.c:565 +#: name-hash.c:566 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "no es posible unir hilo lazy_name: %s" @@ -5136,6 +5392,363 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor erróneo para %s: '%s'" +#: object-file.c:480 +#, 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" + +#: object-file.c:531 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "incapaz de normalizar la ruta de objeto alterno: %s" + +#: object-file.c:603 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" + +#: object-file.c:610 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "incapaz de normalizar directorio de objeto: %s" + +#: object-file.c:653 +msgid "unable to fdopen alternates lockfile" +msgstr "no es posible hacer fdopen en lockfile alternos" + +#: object-file.c:671 +msgid "unable to read alternates file" +msgstr "no es posible leer archivos alternos" + +#: object-file.c:678 +msgid "unable to move new alternates file into place" +msgstr "no es posible mover archivos alternos en el lugar" + +#: object-file.c:713 +#, c-format +msgid "path '%s' does not exist" +msgstr "ruta '%s' no existe" + +#: object-file.c:734 +#, 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." + +#: object-file.c:740 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "repositorio de referencia '%s' no es un repositorio local." + +#: object-file.c:746 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "repositorio de referencia '%s' es superficial (shallow)" + +#: object-file.c:754 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "repositorio de referencia '% s' está injertado" + +#: object-file.c:814 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "línea inválida mientras se analizaban refs alternas: %s" + +#: object-file.c:964 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" + +#: object-file.c:985 +msgid "mmap failed" +msgstr "mmap falló" + +#: object-file.c:1149 +#, c-format +msgid "object file %s is empty" +msgstr "archivo de objeto %s está vacío" + +#: object-file.c:1284 object-file.c:2477 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "objeto perdido corrupto '%s'" + +#: object-file.c:1286 object-file.c:2481 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "basura al final del objeto perdido '%s'" + +#: object-file.c:1328 +msgid "invalid object type" +msgstr "tipo de objeto inválido" + +#: object-file.c:1412 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "no es posible desempacar header %s con --allow-unknown-type" + +#: object-file.c:1415 +#, c-format +msgid "unable to unpack %s header" +msgstr "incapaz de desempaquetar header %s" + +#: object-file.c:1421 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "no es posible analizar header %s con --allow-unknown-type" + +#: object-file.c:1424 +#, c-format +msgid "unable to parse %s header" +msgstr "incapaz de analizar header %s" + +#: object-file.c:1651 +#, c-format +msgid "failed to read object %s" +msgstr "falló al leer objeto %s" + +#: object-file.c:1655 +#, c-format +msgid "replacement %s not found for %s" +msgstr "reemplazo %s no encontrado para %s" + +#: object-file.c:1659 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "objeto perdido %s (guardado en %s) está corrompido" + +#: object-file.c:1663 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "paquete de objeto %s (guardado en %s) está corrompido" + +#: object-file.c:1768 +#, c-format +msgid "unable to write file %s" +msgstr "no es posible escribir archivo %s" + +#: object-file.c:1775 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "no se pudo poner permisos a '%s'" + +#: object-file.c:1782 +msgid "file write error" +msgstr "falló de escritura" + +#: object-file.c:1802 +msgid "error when closing loose object file" +msgstr "error cerrando el archivo de objeto suelto" + +#: object-file.c:1867 +#, 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" + +#: object-file.c:1869 +msgid "unable to create temporary file" +msgstr "no es posible crear un archivo temporal" + +#: object-file.c:1893 +msgid "unable to write loose object file" +msgstr "no es posible escribir el archivo de objeto suelto" + +#: object-file.c:1899 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "no es posible desinflar el objeto nuevo %s (%d)" + +#: object-file.c:1903 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "deflateEnd en objeto %s falló (%d)" + +#: object-file.c:1907 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "confundido por fuente de data de objetos inestable para %s" + +#: object-file.c:1917 builtin/pack-objects.c:1097 +#, c-format +msgid "failed utime() on %s" +msgstr "falló utime() en %s" + +#: object-file.c:1994 +#, c-format +msgid "cannot read object for %s" +msgstr "no se pudo leer el objeto para %s" + +#: object-file.c:2045 +msgid "corrupt commit" +msgstr "commit corrupto" + +#: object-file.c:2053 +msgid "corrupt tag" +msgstr "tag corrupto" + +#: object-file.c:2153 +#, c-format +msgid "read error while indexing %s" +msgstr "error leyendo al indexar %s" + +#: object-file.c:2156 +#, c-format +msgid "short read while indexing %s" +msgstr "lectura corta al indexar %s" + +#: object-file.c:2229 object-file.c:2239 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: falló al insertar en la base de datos" + +#: object-file.c:2245 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: tipo de archivo no soportado" + +#: object-file.c:2269 +#, c-format +msgid "%s is not a valid object" +msgstr "%s no es objeto válido" + +#: object-file.c:2271 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s no es un objeto '%s' válido" + +#: object-file.c:2298 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "no es posible abrir %s" + +#: object-file.c:2488 object-file.c:2541 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "hash no concuerda para %s (se esperaba %s)" + +#: object-file.c:2512 +#, c-format +msgid "unable to mmap %s" +msgstr "no es posible hacer mmap a %s" + +#: object-file.c:2517 +#, c-format +msgid "unable to unpack header of %s" +msgstr "incapaz de desempaquetar header de %s" + +#: object-file.c:2523 +#, c-format +msgid "unable to parse header of %s" +msgstr "incapaz de analizar header de %s" + +#: object-file.c:2534 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "no es posible desempaquetar contenidos de %s" + +#: object-name.c:486 +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "El ID de objeto corto %s es ambiguo" + +#: object-name.c:497 +msgid "The candidates are:" +msgstr "Los candidatos son:" + +#: object-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 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" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n" +"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 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" +"examina estas refs y tal vez bórralas. Silencia este mensaje \n" +"ejecutando \"git config advice.objectNameWarning false\"" + +#: object-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "log para '%.*s' solo va hasta %s" + +#: object-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "log para '%.*s' solo tiene %d entradas" + +#: object-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "la ruta '%s' existe en disco, pero no en '%.*s'" + +#: object-name.c:1708 +#, 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'?" + +#: object-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "ruta '%s' no existe en '%.*s'" + +#: object-name.c:1745 +#, 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'?" + +#: object-name.c:1761 +#, 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'?" + +#: object-name.c:1769 +#, 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" + +#: object-name.c:1771 +#, 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)" + +#: object-name.c:1784 +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" + +#: object-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "nombre de objeto no válido: '%.*s'." + #: object.c:53 #, c-format msgid "invalid object type \"%s\"" @@ -5161,22 +5774,71 @@ msgstr "incapaz de analizar objeto: %s" msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 #, c-format msgid "unable to get size of %s" msgstr "no se pudo obtener el tamaño de %s" -#: packfile.c:630 +#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#, c-format +msgid "unable to get disk usage of %s" +msgstr "no se puede obtener el uso de disco de %s" + +#: pack-revindex.c:220 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "El archivo de índice inverso %s es demasiado pequeño" + +#: pack-revindex.c:225 +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "El archivo de índice inverso %s está dañado" + +#: pack-revindex.c:233 +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "El archivo de índice inverso %s tiene una firma desconocida" + +#: pack-revindex.c:237 +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>" + +#: pack-revindex.c:242 +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>" + +#: pack-write.c:236 +msgid "cannot both write and verify reverse index" +msgstr "no puede escribir y verificar el índice inverso" + +#: pack-write.c:257 +#, c-format +msgid "could not stat: %s" +msgstr "no se pudo estad: %s" + +#: pack-write.c:269 +#, c-format +msgid "failed to make %s readable" +msgstr "no pudo hacer %s legible" + +#: pack-write.c:508 +#, c-format +msgid "could not write '%s' promisor file" +msgstr "no se pudo escribir el archivo promisor '%s'" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1900 +#: packfile.c:1934 #, 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?)" -#: packfile.c:1904 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5197,7 +5859,7 @@ msgstr "fecha de expiración mal formada: '%s'" 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 +#: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format msgid "malformed object name '%s'" msgstr "nombre de objeto mal formado '%s'" @@ -5242,31 +5904,31 @@ msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)" msgid "did you mean `--%s` (with two dashes)?" msgstr "¿quisiste decir `--%s` (con dos guiones)?" -#: parse-options.c:663 parse-options.c:963 +#: parse-options.c:666 parse-options.c:971 #, c-format msgid "alias of --%s" msgstr "alias de --%s" -#: parse-options.c:854 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "opción `%s' desconocida" -#: parse-options.c:856 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "switch desconocido `%c'" -#: parse-options.c:858 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opción desconocida en string no ascii: `%s'" -#: parse-options.c:882 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:901 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -5274,17 +5936,17 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:907 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:910 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:949 +#: parse-options.c:957 msgid "-NUM" msgstr "-NUM" @@ -5423,29 +6085,37 @@ msgstr "error de protocolo: mal caracter de largo de línea: %.4s" msgid "protocol error: bad line length %d" msgstr "error de protocolo: mal largo de línea %d" -#: pkt-line.c:373 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "error remoto: %s" -#: preload-index.c:119 +#: preload-index.c:125 msgid "Refreshing index" msgstr "Refrescando index" -#: preload-index.c:138 +#: preload-index.c:144 #, c-format msgid "unable to create threaded lstat: %s" msgstr "no es posible crear lstat hilado: %s" -#: pretty.c:982 +#: pretty.c:984 msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Remoto sin URL" +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación" -#: promisor-remote.c:58 +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso" + +#: promisor-remote.c:53 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "nombre remoto promisor no puede comenzar con '/': %s" @@ -5454,20 +6124,20 @@ msgstr "nombre remoto promisor no puede comenzar con '/': %s" msgid "Removing duplicate objects" msgstr "Removiendo objetos duplicados" -#: range-diff.c:77 +#: range-diff.c:78 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:79 +#: range-diff.c:80 msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:98 sequencer.c:5143 +#: range-diff.c:101 sequencer.c:5318 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -5476,65 +6146,69 @@ msgstr "" "no se pudo leer la primera línea de salida `log`: no comienza con 'commit ': " "'%s'" -#: range-diff.c:137 +#: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "no se puede analizar git header '%.*s'" -#: range-diff.c:301 +#: range-diff.c:306 msgid "failed to generate diff" msgstr "falló al generar diff" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:558 +msgid "--left-only and --right-only are mutually exclusive" +msgstr "--left-only y --right-only son mutuamente exclusivas" + +#: range-diff.c:561 range-diff.c:563 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" -#: read-cache.c:680 +#: read-cache.c:682 #, 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 +#: read-cache.c:698 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 +#: read-cache.c:720 #, 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 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' no tiene un commit checked out" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "no es posible indexar archivo '%s'" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "no es posible agregar '%s' al index" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "incapaz de correr stat en '%s'" -#: read-cache.c:1330 +#: read-cache.c:1318 #, 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 +#: read-cache.c:1532 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1651 +#: read-cache.c:1657 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5543,7 +6217,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1661 +#: read-cache.c:1667 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5552,139 +6226,139 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1717 +#: read-cache.c:1723 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1726 #, c-format msgid "bad index version %d" msgstr "mala versión del índice %d" -#: read-cache.c:1729 +#: read-cache.c:1735 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1759 +#: read-cache.c:1765 #, 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 +#: read-cache.c:1767 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensión %.4s" -#: read-cache.c:1798 +#: read-cache.c:1804 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de index desconocido 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1820 #, 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:1871 +#: read-cache.c:1877 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1874 +#: read-cache.c:1880 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "múltiples entradas extrañas para archivo fusionado '%s'" -#: read-cache.c:1877 +#: read-cache.c:1883 #, 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:488 builtin/checkout.c:674 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "archivo índice corrompido" -#: read-cache.c:2124 +#: read-cache.c:2133 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2137 +#: read-cache.c:2146 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entires: %s" -#: read-cache.c:2170 +#: read-cache.c:2179 #, c-format msgid "%s: index file open failed" msgstr "%s: falló al abrir el archivo index" -#: read-cache.c:2174 +#: read-cache.c:2183 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: no se puede hacer stat del index abierto" -#: read-cache.c:2178 +#: read-cache.c:2187 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index más pequeño de lo esperado" -#: read-cache.c:2182 +#: read-cache.c:2191 #, c-format msgid "%s: unable to map index file" msgstr "%s: no se pudo mapear el archivo index" -#: read-cache.c:2224 +#: read-cache.c:2233 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2251 +#: read-cache.c:2260 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2283 +#: read-cache.c:2292 #, c-format msgid "could not freshen shared index '%s'" msgstr "no se pudo refrescar el index compartido '%s'" -#: read-cache.c:2330 +#: read-cache.c:2339 #, 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:1171 wrapper.c:630 builtin/merge.c:1130 +#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 +#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:3142 +#: read-cache.c:3151 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3154 +#: read-cache.c:3163 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3179 +#: read-cache.c:3188 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3328 +#: read-cache.c:3337 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: no se puede eliminar a stage #0" @@ -5755,7 +6429,7 @@ 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 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5763,7 +6437,7 @@ msgstr "" "\n" "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5771,7 +6445,7 @@ msgstr "" "\n" "Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5785,7 +6459,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5795,14 +6469,14 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 +#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 +#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 -#: builtin/rebase.c:240 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 +#: builtin/rebase.c:254 #, c-format msgid "could not write '%s'." msgstr "no se pudo escribir '%s'." @@ -5834,14 +6508,14 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 -#: builtin/rebase.c:252 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 +#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 +#: builtin/rebase.c:266 #, c-format msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: ref-filter.c:42 wt-status.c:1977 +#: ref-filter.c:42 wt-status.c:1975 msgid "gone" msgstr "desaparecido" @@ -5860,238 +6534,248 @@ msgstr "detrás %d" msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:165 +#: ref-filter.c:175 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:167 +#: ref-filter.c:177 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:199 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:203 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:205 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:250 +#: ref-filter.c:260 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningún argumento" -#: ref-filter.c:272 +#: ref-filter.c:282 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "%%(objectsize) no reconocido argumento: %s" -#: ref-filter.c:280 +#: ref-filter.c:290 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) no toma argumentos" -#: ref-filter.c:292 +#: ref-filter.c:302 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:301 +#: ref-filter.c:315 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) no toma ningún argumento" +msgid "unrecognized %%(subject) argument: %s" +msgstr "argumento %%(sujeto) no reconocido: %s" -#: ref-filter.c:323 +#: ref-filter.c:334 +#, c-format +msgid "expected %%(trailers:key=<value>)" +msgstr "se esperaba %%(trailers:key=<value>)" + +#: ref-filter.c:336 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:352 +#: ref-filter.c:367 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:369 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:369 +#: ref-filter.c:384 +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "valor positivo esperado '%s' en %% (%s)" + +#: ref-filter.c:388 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "valor positivo esperado objectname:short=%s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "argumento no reconocido:'%s' en %%(%s)" -#: ref-filter.c:373 +#: ref-filter.c:402 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "argumento: %s no reconocido %%(objectname)" +msgid "unrecognized email option: %s" +msgstr "opción de email desconocida: %s" -#: ref-filter.c:403 +#: ref-filter.c:432 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:415 +#: ref-filter.c:444 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:422 +#: ref-filter.c:451 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:431 +#: ref-filter.c:460 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:439 +#: ref-filter.c:468 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:486 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:559 +#: ref-filter.c:588 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:615 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:619 #, 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:714 +#: ref-filter.c:743 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:808 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: átomo %%(then) usado más de una vez" -#: ref-filter.c:781 +#: ref-filter.c:810 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:840 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:842 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: átomo %%(else) usado más de una vez" -#: ref-filter.c:828 +#: ref-filter.c:857 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:885 +#: ref-filter.c:914 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1486 +#: ref-filter.c:1555 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(no hay rama, rebasando %s)" + +#: ref-filter.c:1558 #, c-format -msgid "no branch, rebasing %s" -msgstr "no hay rama, rebasando %s" +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(no una rama, rebasando con HEAD desacoplado %s)" -#: ref-filter.c:1489 +#: ref-filter.c:1561 #, c-format -msgid "no branch, rebasing detached HEAD %s" -msgstr "(o hay rama, rebasando con HEAD desacoplado %s" +msgid "(no branch, bisect started on %s)" +msgstr "(no hay rama, comenzando biseccón en %s)" -#: ref-filter.c:1492 +#: ref-filter.c:1565 #, c-format -msgid "no branch, bisect started on %s" -msgstr "no hay rama, comenzando biseccón en %s" +msgid "(HEAD detached at %s)" +msgstr "(HEAD desacoplado en %s)" -#: ref-filter.c:1502 -msgid "no branch" -msgstr "sin rama" +#: ref-filter.c:1568 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD desacoplado de %s)" + +#: ref-filter.c:1571 +msgid "(no branch)" +msgstr "(sin rama)" -#: ref-filter.c:1538 ref-filter.c:1747 +#: ref-filter.c:1603 ref-filter.c:1812 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1548 +#: ref-filter.c:1613 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:2001 +#: ref-filter.c:1996 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:2090 +#: ref-filter.c:2085 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2095 refs.c:657 +#: ref-filter.c:2090 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: ref-filter.c:2395 +#: ref-filter.c:2430 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2495 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "opción `%s' es incompatible con --merged" - -#: ref-filter.c:2498 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "opción `%s' es incompatible con --no-merged" - -#: ref-filter.c:2508 +#: ref-filter.c:2529 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: ref-filter.c:2513 +#: ref-filter.c:2534 #, c-format msgid "option `%s' must point to a commit" msgstr "opción '%s' debe apuntar a un commit" @@ -6101,172 +6785,163 @@ msgstr "opción '%s' debe apuntar a un commit" msgid "%s does not point to a valid object!" msgstr "¡%s no apunta a ningún objeto válido!" -#: refs.c:572 +#: refs.c:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" +"Usando '%s' como el nombre de la rama inicial. Este nombre de rama " +"predeterminado\n" +"está sujeto a cambios. Para configurar el nombre de la rama inicial para " +"usar en todos\n" +"de sus nuevos repositorios, que suprimirán esta advertencia, llame a:\n" +"\n" +"\tgit config --global init.defaultBranch <nombre>\n" +"\n" +"Los nombres comúnmente elegidos en lugar de 'maestro' son 'principal', " +"'troncal' y\n" +"'desarrollo'. Se puede cambiar el nombre de la rama recién creada mediante " +"este comando:\n" +"\n" +"\tgit branch -m <nombre>\n" + +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "no se pudo recibir `%s`" -#: refs.c:579 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" -msgstr "Nombre de rama inválido: %s = %s" +msgstr "nombre de rama inválido: %s = %s" -#: refs.c:655 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorando referencia rota %s" -#: refs.c:792 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "no se pudo abrir '%s' para escritura: %s" - -#: refs.c:802 refs.c:853 -#, c-format -msgid "could not read ref '%s'" -msgstr "no se pudo leer la referencia '%s'" - -#: refs.c:808 -#, c-format -msgid "ref '%s' already exists" -msgstr "ref '%s' ya existe" - -#: refs.c:813 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "ID de objecto inesperado al escribir '%s'" - -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 -#: wrapper.c:628 -#, c-format -msgid "could not write to '%s'" -msgstr "no se pudo escribir en '%s'" - -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 -#: builtin/rebase.c:852 -#, c-format -msgid "could not open '%s' for writing" -msgstr "no se pudo abrir '%s' para escritura" - -#: refs.c:855 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "ID de objecto inesperado al borrar '%s'" - -#: refs.c:986 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "log de ref %s tiene un vacío tras %s" -#: refs.c:992 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "log de ref %s finalizado inesperadamente en %s" -#: refs.c:1051 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "log de %s está vacío" -#: refs.c:1143 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "rehusando actualizar ref con mal nombre '%s'" -#: refs.c:1219 +#: refs.c:1157 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref falló para ref '%s': %s" -#: refs.c:2011 +#: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "múltiples actualizaciones para ref '%s' no permitidas" -#: refs.c:2098 +#: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs.c:2109 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "ref update abortado por el hook" -#: refs.c:2209 refs.c:2239 +#: refs.c:2242 refs.c:2272 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe; no se puede crear '%s'" -#: refs.c:2215 refs.c:2250 +#: refs.c:2248 refs.c:2283 #, 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:1233 +#: refs/files-backend.c:1228 #, c-format msgid "could not remove reference %s" msgstr "no se pudo eliminar la referencia %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" -#: refspec.c:137 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "refspec inválido: '%s'" -#: remote.c:355 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "config remote shorthand no puede comenzar con '/': %s" -#: remote.c:403 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "más de un receivepack dado, usando el primero" -#: remote.c:411 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "más de un uploadpack dado, usando el primero" -#: remote.c:594 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:598 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:602 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:670 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "llave '%s' de patrón no tuvo '*'" -#: remote.c:680 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "valor '%s' del patrón no tiene '*'" -#: remote.c:986 +#: remote.c:1083 #, c-format msgid "src refspec %s does not match any" msgstr "src refsoec %s: no concuerda con ninguno" -#: remote.c:991 +#: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" msgstr "src refspec %s concuerda con más de uno" @@ -6275,7 +6950,7 @@ msgstr "src refspec %s concuerda con más de uno" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1006 +#: remote.c:1103 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6299,7 +6974,7 @@ msgstr "" "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el " "full ref." -#: remote.c:1026 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6310,7 +6985,7 @@ msgstr "" "¿Quisiste crear un branch nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1031 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6321,7 +6996,7 @@ msgstr "" "Did you mean to create a new tag by pushing to\n" "'%s:refs/tags/%s'?" -#: remote.c:1036 +#: remote.c:1133 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6332,7 +7007,7 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1041 +#: remote.c:1138 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6343,115 +7018,115 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1077 +#: remote.c:1174 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s no puede ser resolver a un branch" -#: remote.c:1088 +#: remote.c:1185 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no es posible borrar '%s': ref remoto no existe" -#: remote.c:1100 +#: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" msgstr "dst refspec %s concuerda con más de uno" -#: remote.c:1107 +#: remote.c:1204 #, 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:1610 remote.c:1711 +#: remote.c:1724 remote.c:1825 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1619 +#: remote.c:1733 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1622 +#: remote.c:1736 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1628 +#: remote.c:1742 #, 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:1643 +#: remote.c:1757 #, 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:1655 +#: remote.c:1769 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1665 +#: remote.c:1779 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1678 +#: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1700 +#: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino único" -#: remote.c:1826 +#: remote.c:1943 #, c-format msgid "couldn't find remote ref %s" msgstr "no se puedo encontrar ref remota %s" -#: remote.c:1839 +#: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorando ref graciosa '%s' localmente" -#: remote.c:2002 +#: remote.c:2119 #, 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:2006 +#: remote.c:2123 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2009 +#: remote.c:2126 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:2013 +#: remote.c:2130 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Tu rama y '%s' refieren a commits diferentes.\n" -#: remote.c:2016 +#: remote.c:2133 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" para detalles)\n" -#: remote.c:2020 +#: remote.c:2137 #, 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:2026 +#: remote.c:2143 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2029 +#: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6461,11 +7136,11 @@ msgstr[0] "" msgstr[1] "" "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:2037 +#: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2040 +#: remote.c:2157 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6480,11 +7155,11 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2050 +#: remote.c:2167 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:2241 +#: remote.c:2359 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no se puede leer el nombre de objeto '%s'" @@ -6504,101 +7179,96 @@ msgstr "duplicar ref de reemplazo: %s" msgid "replace depth too high for object %s" msgstr "remplazar profundiad muy elevada para objeto %s" -#: repository.c:94 builtin/init-db.c:188 -#, c-format -msgid "The hash algorithm %s is not supported in this build." -msgstr "El algoritmo hash %s no está soportado en este build." - -#: rerere.c:217 rerere.c:226 rerere.c:229 +#: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" msgstr "MERGE_RR corrupto" -#: rerere.c:264 rerere.c:269 +#: rerere.c:248 rerere.c:253 msgid "unable to write rerere record" msgstr "incapaz de escribir entrada rerere" -#: rerere.c:495 +#: rerere.c:479 #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "hubieron errores mientras se escribía '%s' (%s)" -#: rerere.c:498 +#: rerere.c:482 #, c-format msgid "failed to flush '%s'" msgstr "falló al hacer flush '%s'" -#: rerere.c:503 rerere.c:1039 +#: rerere.c:487 rerere.c:1023 #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "no se pudo analizar hunks en conflicto en '%s'" -#: rerere.c:684 +#: rerere.c:668 #, c-format msgid "failed utime() on '%s'" msgstr "falló utime() en '%s'" -#: rerere.c:694 +#: rerere.c:678 #, c-format msgid "writing '%s' failed" msgstr "escribiendo '%s' falló" -#: rerere.c:714 +#: rerere.c:698 #, c-format msgid "Staged '%s' using previous resolution." msgstr "'%s' puesto en stage usando resolución previa." -#: rerere.c:753 +#: rerere.c:737 #, c-format msgid "Recorded resolution for '%s'." msgstr "Resolución guardada para '%s'." -#: rerere.c:788 +#: rerere.c:772 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "'%s' resuelto usando resolución previa." -#: rerere.c:803 +#: rerere.c:787 #, c-format msgid "cannot unlink stray '%s'" msgstr "no se puede desvincular stray '%s'" -#: rerere.c:807 +#: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" msgstr "Resolución precargada para '%s'" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" -#: rerere.c:1057 +#: rerere.c:1041 #, c-format msgid "failed to update conflicted state in '%s'" msgstr "falló al actualizar estado conflictivo en '%s'" -#: rerere.c:1068 rerere.c:1075 +#: rerere.c:1052 rerere.c:1059 #, c-format msgid "no remembered resolution for '%s'" msgstr "resolución para '%s' no recordada" -#: rerere.c:1077 +#: rerere.c:1061 #, c-format msgid "cannot unlink '%s'" msgstr "no se puede desvincular '%s'" -#: rerere.c:1087 +#: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" msgstr "Actualizada preimagen para '%s'" -#: rerere.c:1096 +#: rerere.c:1080 #, c-format msgid "Forgot resolution for '%s'\n" msgstr "Se olvidó resolución para '%s'\n" -#: rerere.c:1199 +#: rerere.c:1191 msgid "unable to open rr-cache directory" msgstr "no es posible abrir directorio rr-cache" @@ -6606,38 +7276,38 @@ msgstr "no es posible abrir directorio rr-cache" msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisión HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3318 +#: reset.c:70 reset.c:76 sequencer.c:3468 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: revision.c:2661 +#: revision.c:2338 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<packfile> ya no es soportado" + +#: revision.c:2668 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2664 +#: revision.c:2671 #, 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:2873 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent es incompatible con --bisect" - #: revision.c:2877 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 +#: run-command.c:767 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" -#: run-command.c:1269 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" -#: run-command.c:1333 +#: run-command.c:1338 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6647,34 +7317,34 @@ msgstr "" "Puedes desactivar esta advertencias con `git config advice.ignoredHook " "false`." -#: send-pack.c:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "flush packet inesperado mientras se leía estatus de desempaquetado remoto" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no es posible analizar el estado de desempaquetado remoto: %s" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "desempaquetado remoto falló: %s" -#: send-pack.c:308 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "falló al firmar el certificado de push" -#: send-pack.c:394 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "el destino no soporta el algoritmo de hash de este repositorio" -#: send-pack.c:403 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta --signed push" -#: send-pack.c:405 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6682,47 +7352,47 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed )" -#: send-pack.c:417 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push atómicos (--atomic)" -#: send-pack.c:422 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:192 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit inválido, modo cleanup '%s'" -#: sequencer.c:297 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "no se pudo eliminar'%s'" -#: sequencer.c:326 +#: sequencer.c:353 msgid "revert" msgstr "revertir" -#: sequencer.c:328 +#: sequencer.c:355 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:330 +#: sequencer.c:357 msgid "rebase" msgstr "rebase" -#: sequencer.c:332 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "acción desconocida: %d" -#: sequencer.c:390 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6730,7 +7400,7 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:393 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6740,43 +7410,43 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:406 sequencer.c:2921 +#: sequencer.c:434 sequencer.c:3070 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:413 +#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 +#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "no se pudo escribir en '%s'" + +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 -#: sequencer.c:3203 +#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 +#: sequencer.c:3353 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 -#, c-format -msgid "could not read '%s'" -msgstr "no se pudo leer '%s'" - -#: sequencer.c:457 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:461 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:493 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" -#: sequencer.c:532 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:598 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup inválido %s" @@ -6784,65 +7454,65 @@ msgstr "Modo cleanup inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:626 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:643 +#: sequencer.c:684 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de la caché" -#: sequencer.c:657 +#: sequencer.c:698 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:737 +#: sequencer.c:778 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:748 +#: sequencer.c:789 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 +#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:795 +#: sequencer.c:836 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:800 +#: sequencer.c:841 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:805 +#: sequencer.c:846 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:809 +#: sequencer.c:850 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:814 +#: sequencer.c:855 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:816 +#: sequencer.c:857 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:818 +#: sequencer.c:859 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:867 +#: sequencer.c:924 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6872,11 +7542,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1141 +#: sequencer.c:1211 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' falló" -#: sequencer.c:1147 +#: sequencer.c:1217 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6903,7 +7573,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1160 +#: sequencer.c:1230 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6927,329 +7597,338 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1202 +#: sequencer.c:1272 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: sequencer.c:1204 +#: sequencer.c:1274 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: sequencer.c:1250 +#: sequencer.c:1320 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1252 +#: sequencer.c:1322 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1256 +#: sequencer.c:1326 msgid " (root-commit)" msgstr " (commit-raíz)" -#: sequencer.c:1277 +#: sequencer.c:1347 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1279 +#: sequencer.c:1349 #, c-format msgid "HEAD %s is not a commit!" msgstr "¡HEAD %s no es un commit!" -#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 +#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1335 sequencer.c:1980 +#: sequencer.c:1409 sequencer.c:2108 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 +#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: sequencer.c:1379 sequencer.c:1450 +#: sequencer.c:1453 sequencer.c:1573 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 -#: builtin/merge.c:919 +#: sequencer.c:1484 sequencer.c:1516 +#, c-format +msgid "invalid author identity '%s'" +msgstr "identidad de autor inválida '%s'" + +#: sequencer.c:1490 +msgid "corrupt author: missing date information" +msgstr "autor corrupto: falta información" + +#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 +#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1433 sequencer.c:4118 +#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:1481 +#: sequencer.c:1605 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1486 +#: sequencer.c:1610 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1569 sequencer.c:1680 +#: sequencer.c:1693 sequencer.c:1804 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1627 sequencer.c:1652 +#: sequencer.c:1751 sequencer.c:1776 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:1637 +#: sequencer.c:1761 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1639 sequencer.c:3230 +#: sequencer.c:1763 sequencer.c:3380 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1641 +#: sequencer.c:1765 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1647 +#: sequencer.c:1771 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1662 +#: sequencer.c:1786 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1669 +#: sequencer.c:1793 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1675 +#: sequencer.c:1799 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:1763 +#: sequencer.c:1887 msgid "your index file is unmerged." msgstr "tu archivo índice no está fusionado." -#: sequencer.c:1770 +#: sequencer.c:1894 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raíz" -#: sequencer.c:1789 +#: sequencer.c:1913 #, 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:1797 sequencer.c:1805 +#: sequencer.c:1921 sequencer.c:1929 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1811 +#: sequencer.c:1935 #, 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:1830 +#: sequencer.c:1954 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1895 +#: sequencer.c:2019 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1952 +#: sequencer.c:2079 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1953 +#: sequencer.c:2080 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1972 +#: sequencer.c:2100 #, 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:2030 +#: sequencer.c:2158 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falló al leer el índice" -#: sequencer.c:2037 +#: sequencer.c:2165 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falló al refrescar el índice" -#: sequencer.c:2114 +#: sequencer.c:2242 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2123 +#: sequencer.c:2251 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2154 +#: sequencer.c:2282 #, c-format msgid "could not parse '%s'" msgstr "no se puede analizar '%s'" -#: sequencer.c:2215 +#: sequencer.c:2343 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:2226 +#: sequencer.c:2354 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2310 +#: sequencer.c:2440 msgid "cancelling a cherry picking in progress" msgstr "cancelando cherry-pick en progreso" -#: sequencer.c:2317 +#: sequencer.c:2449 msgid "cancelling a revert in progress" msgstr "cancelando revert en progreso" -#: sequencer.c:2361 +#: sequencer.c:2493 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2363 +#: sequencer.c:2495 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2368 +#: sequencer.c:2500 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:2379 +#: sequencer.c:2511 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2381 +#: sequencer.c:2513 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2459 +#: sequencer.c:2591 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido para %s: %s" -#: sequencer.c:2556 +#: sequencer.c:2698 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2576 +#: sequencer.c:2718 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2664 sequencer.c:4469 +#: sequencer.c:2811 sequencer.c:4644 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:2680 +#: sequencer.c:2828 msgid "revert is already in progress" msgstr "revert ya está en progreso" -#: sequencer.c:2682 +#: sequencer.c:2830 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" -#: sequencer.c:2685 +#: sequencer.c:2833 msgid "cherry-pick is already in progress" msgstr "cherry-pick ya está en progreso" -#: sequencer.c:2687 +#: sequencer.c:2835 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2701 +#: sequencer.c:2849 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2716 +#: sequencer.c:2864 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2776 sequencer.c:4206 +#: sequencer.c:2924 sequencer.c:4379 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:2778 sequencer.c:2789 +#: sequencer.c:2926 sequencer.c:2937 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2780 sequencer.c:2824 +#: sequencer.c:2928 sequencer.c:2972 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2810 builtin/grep.c:744 +#: sequencer.c:2958 builtin/grep.c:757 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2812 +#: sequencer.c:2960 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2813 +#: sequencer.c:2961 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2819 +#: sequencer.c:2967 #, 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:2830 +#: sequencer.c:2978 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!" -#: sequencer.c:2871 +#: sequencer.c:3019 msgid "no revert in progress" msgstr "no hay revert en progreso" -#: sequencer.c:2879 +#: sequencer.c:3028 msgid "no cherry-pick in progress" msgstr "ningún cherry-pick en progreso" -#: sequencer.c:2889 +#: sequencer.c:3038 msgid "failed to skip the commit" msgstr "falló al escribir el commit" -#: sequencer.c:2896 +#: sequencer.c:3045 msgid "there is nothing to skip" msgstr "no hay nada que saltar" -#: sequencer.c:2899 +#: sequencer.c:3048 #, c-format msgid "" "have you committed already?\n" @@ -7258,16 +7937,16 @@ msgstr "" "¿ya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:3060 sequencer.c:4098 +#: sequencer.c:3210 sequencer.c:4271 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:3077 +#: sequencer.c:3227 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3085 +#: sequencer.c:3235 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7286,27 +7965,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3095 +#: sequencer.c:3245 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:3102 +#: sequencer.c:3252 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 +#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3132 +#: sequencer.c:3282 #, c-format msgid "Executing: %s\n" msgstr "Ejecutando: %s\n" -#: sequencer.c:3147 +#: sequencer.c:3297 #, c-format msgid "" "execution failed: %s\n" @@ -7321,11 +8000,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3153 +#: sequencer.c:3303 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:3159 +#: sequencer.c:3309 #, c-format msgid "" "execution succeeded: %s\n" @@ -7342,90 +8021,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3220 +#: sequencer.c:3370 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3274 +#: sequencer.c:3424 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:3279 +#: sequencer.c:3429 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3363 +#: sequencer.c:3513 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3394 +#: sequencer.c:3546 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3416 +#: sequencer.c:3568 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3425 +#: sequencer.c:3577 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3437 +#: sequencer.c:3589 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:3453 +#: sequencer.c:3605 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3613 +#: sequencer.c:3788 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3629 +#: sequencer.c:3804 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:3703 +#: sequencer.c:3878 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: sequencer.c:3706 +#: sequencer.c:3881 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: sequencer.c:3712 +#: sequencer.c:3887 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: sequencer.c:3715 +#: sequencer.c:3890 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: sequencer.c:3719 +#: sequencer.c:3894 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: sequencer.c:3744 +#: sequencer.c:3919 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3756 +#: sequencer.c:3931 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3759 +#: sequencer.c:3934 #, c-format msgid "" "%s\n" @@ -7437,34 +8116,29 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3764 +#: sequencer.c:3939 msgid "Applying autostash resulted in conflicts." msgstr "Apicar autostash resultó en conflictos." -#: sequencer.c:3765 +#: sequencer.c:3940 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash existe; creando una nueva entrada stash." -#: sequencer.c:3857 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s no es OID válido" - -#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 +#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3877 +#: sequencer.c:4048 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3879 +#: sequencer.c:4050 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3887 +#: sequencer.c:4058 #, c-format msgid "" "Could not execute the todo command\n" @@ -7485,58 +8159,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3931 +#: sequencer.c:4104 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Aplicando rebase (%d/%d)%s" -#: sequencer.c:3976 +#: sequencer.c:4149 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:4047 +#: sequencer.c:4220 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:4106 +#: sequencer.c:4279 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:4111 +#: sequencer.c:4284 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:4125 +#: sequencer.c:4298 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:4185 +#: sequencer.c:4358 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n" -#: sequencer.c:4218 +#: sequencer.c:4391 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:4227 +#: sequencer.c:4400 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4229 +#: sequencer.c:4402 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:4231 +#: sequencer.c:4404 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:4234 +#: sequencer.c:4407 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7547,50 +8221,50 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4270 sequencer.c:4309 +#: sequencer.c:4443 sequencer.c:4482 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4324 +#: sequencer.c:4498 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4331 +#: sequencer.c:4505 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:4446 +#: sequencer.c:4621 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4450 +#: sequencer.c:4625 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4485 +#: sequencer.c:4660 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4962 +#: sequencer.c:5137 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4965 +#: sequencer.c:5140 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:5206 sequencer.c:5223 +#: sequencer.c:5382 sequencer.c:5399 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5242 +#: sequencer.c:5418 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5336 +#: sequencer.c:5512 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." @@ -7647,85 +8321,89 @@ msgstr "" msgid "this operation must be run in a work tree" msgstr "esta operación debe ser realizada en un árbol de trabajo" -#: setup.c:604 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:612 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:631 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "versión de repo es 0, pero extensión v1-only encontrada:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "error abriendo '%s'" -#: setup.c:633 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "muy grande para ser un archivo .git: '%s'" -#: setup.c:635 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "error leyendo %s" -#: setup.c:637 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "formato gitfile inválido: %s" -#: setup.c:639 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "no hay ruta en gitfile: %s" -#: setup.c:641 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "no es un repositorio git: %s" -#: setup.c:743 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' muy grande" -#: setup.c:757 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "no es un repositorio git: '%s'" -#: setup.c:786 setup.c:788 setup.c:819 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "no se puede aplicar chdir a '%s'" -#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "no se puede volver a cwd" -#: setup.c:918 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "falló al determinar '%*s%s%s'" -#: setup.c:1156 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1165 setup.c:1171 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "no se puede cambiar a '%s'" -#: setup.c:1176 +#: setup.c:1245 #, 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:1182 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7735,7 +8413,7 @@ msgstr "" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1293 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7744,375 +8422,18 @@ 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:1340 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "falló al abrir /dev/null o dup" -#: setup.c:1355 +#: setup.c:1424 msgid "fork failed" msgstr "falló fork" -#: setup.c:1360 +#: setup.c:1429 msgid "setsid failed" msgstr "falló setsid" -#: sha1-file.c:470 -#, 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:521 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "incapaz de normalizar la ruta de objeto alterno: %s" - -#: sha1-file.c:593 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" - -#: sha1-file.c:600 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "incapaz de normalizar directorio de objeto: %s" - -#: sha1-file.c:643 -msgid "unable to fdopen alternates lockfile" -msgstr "no es posible hacer fdopen en lockfile alternos" - -#: sha1-file.c:661 -msgid "unable to read alternates file" -msgstr "no es posible leer archivos alternos" - -#: sha1-file.c:668 -msgid "unable to move new alternates file into place" -msgstr "no es posible mover archivos alternos en el lugar" - -#: sha1-file.c:703 -#, c-format -msgid "path '%s' does not exist" -msgstr "ruta '%s' no existe" - -#: sha1-file.c:724 -#, 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:730 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "repositorio de referencia '%s' no es un repositorio local." - -#: sha1-file.c:736 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "repositorio de referencia '%s' es superficial (shallow)" - -#: sha1-file.c:744 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "repositorio de referencia '% s' está injertado" - -#: sha1-file.c:804 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "línea inválida mientras se analizaban refs alternas: %s" - -#: sha1-file.c:954 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" - -#: sha1-file.c:975 -msgid "mmap failed" -msgstr "mmap falló" - -#: sha1-file.c:1139 -#, c-format -msgid "object file %s is empty" -msgstr "archivo de objeto %s está vacío" - -#: sha1-file.c:1274 sha1-file.c:2454 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "objeto perdido corrupto '%s'" - -#: sha1-file.c:1276 sha1-file.c:2458 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "basura al final del objeto perdido '%s'" - -#: sha1-file.c:1318 -msgid "invalid object type" -msgstr "tipo de objeto inválido" - -#: sha1-file.c:1402 -#, 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:1405 -#, c-format -msgid "unable to unpack %s header" -msgstr "incapaz de desempaquetar header %s" - -#: sha1-file.c:1411 -#, 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:1414 -#, c-format -msgid "unable to parse %s header" -msgstr "incapaz de analizar header %s" - -#: sha1-file.c:1640 -#, c-format -msgid "failed to read object %s" -msgstr "falló al leer objeto %s" - -#: sha1-file.c:1644 -#, c-format -msgid "replacement %s not found for %s" -msgstr "reemplazo %s no encontrado para %s" - -#: sha1-file.c:1648 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "objeto perdido %s (guardado en %s) está corrompido" - -#: sha1-file.c:1652 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "paquete de objeto %s (guardado en %s) está corrompido" - -#: sha1-file.c:1757 -#, c-format -msgid "unable to write file %s" -msgstr "no es posible escribir archivo %s" - -#: sha1-file.c:1764 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "no se pudo poner permisos a '%s'" - -#: sha1-file.c:1771 -msgid "file write error" -msgstr "falló de escritura" - -#: sha1-file.c:1791 -msgid "error when closing loose object file" -msgstr "error cerrando el archivo de objeto suelto" - -#: sha1-file.c:1856 -#, 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:1858 -msgid "unable to create temporary file" -msgstr "no es posible crear un archivo temporal" - -#: sha1-file.c:1882 -msgid "unable to write loose object file" -msgstr "no es posible escribir el archivo de objeto suelto" - -#: sha1-file.c:1888 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "no es posible desinflar el objeto nuevo %s (%d)" - -#: sha1-file.c:1892 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "deflateEnd en objeto %s falló (%d)" - -#: sha1-file.c:1896 -#, 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:1906 builtin/pack-objects.c:1085 -#, c-format -msgid "failed utime() on %s" -msgstr "falló utime() en %s" - -#: sha1-file.c:1983 -#, c-format -msgid "cannot read object for %s" -msgstr "no se pudo leer el objeto para %s" - -#: sha1-file.c:2022 -msgid "corrupt commit" -msgstr "commit corrupto" - -#: sha1-file.c:2030 -msgid "corrupt tag" -msgstr "tag corrupto" - -#: sha1-file.c:2130 -#, c-format -msgid "read error while indexing %s" -msgstr "error leyendo al indexar %s" - -#: sha1-file.c:2133 -#, c-format -msgid "short read while indexing %s" -msgstr "lectura corta al indexar %s" - -#: sha1-file.c:2206 sha1-file.c:2216 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s: falló al insertar en la base de datos" - -#: sha1-file.c:2222 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s: tipo de archivo no soportado" - -#: sha1-file.c:2246 -#, c-format -msgid "%s is not a valid object" -msgstr "%s no es objeto válido" - -#: sha1-file.c:2248 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s no es un objeto '%s' válido" - -#: sha1-file.c:2275 builtin/index-pack.c:155 -#, c-format -msgid "unable to open %s" -msgstr "no es posible abrir %s" - -#: sha1-file.c:2465 sha1-file.c:2518 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "hash no concuerda para %s (se esperaba %s)" - -#: sha1-file.c:2489 -#, c-format -msgid "unable to mmap %s" -msgstr "no es posible hacer mmap a %s" - -#: sha1-file.c:2494 -#, c-format -msgid "unable to unpack header of %s" -msgstr "incapaz de desempaquetar header de %s" - -#: sha1-file.c:2500 -#, c-format -msgid "unable to parse header of %s" -msgstr "incapaz de analizar header de %s" - -#: sha1-file.c:2511 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "no es posible desempaquetar contenidos de %s" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "SHA1 %s corto es ambiguo" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "Los candidatos son:" - -#: 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 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" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n" -"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 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" -"examina estas refs y tal vez bórralas. Silencia este mensaje \n" -"ejecutando \"git config advice.objectNameWarning false\"" - -#: 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:848 #, c-format @@ -8165,6 +8486,12 @@ msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:866 +#, c-format +msgid "could not open '%s' for writing" +msgstr "no se pudo abrir '%s' para escritura" + #: strbuf.c:1175 #, c-format msgid "could not edit '%s'" @@ -8225,12 +8552,12 @@ msgstr "en el submódulo no poblado '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" -#: submodule.c:434 +#: submodule.c:435 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "mal argumento --ignore-submodules: %s" -#: submodule.c:815 +#: submodule.c:817 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8239,50 +8566,50 @@ msgstr "" "Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado " "igual. Saltandolo." -#: submodule.c:910 +#: submodule.c:920 #, 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:995 +#: submodule.c:1005 #, 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 " +"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " "el submódulo %s" -#: submodule.c:1118 +#: submodule.c:1128 #, c-format msgid "process for submodule '%s' failed" msgstr "proceso para submódulo '%s' falló" -#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 +#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falló al resolver HEAD como un ref válido." -#: submodule.c:1158 +#: submodule.c:1168 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Empujando submódulo '%s'\n" -#: submodule.c:1161 +#: submodule.c:1171 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "No es posible hacer push al submódulo '%s'\n" -#: submodule.c:1453 +#: submodule.c:1463 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Haciendo fetch al submódulo %s%s\n" -#: submodule.c:1483 +#: submodule.c:1497 #, c-format msgid "Could not access submodule '%s'\n" msgstr "No pudo acceder al submódulo '%s'\n" -#: submodule.c:1637 +#: submodule.c:1652 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8291,61 +8618,61 @@ msgstr "" "Errores durante el fetch del submódulo:\n" "%s" -#: submodule.c:1662 +#: submodule.c:1677 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1679 +#: submodule.c:1694 #, 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 +#: submodule.c:1735 #, 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 +#: submodule.c:1810 #, 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:1813 +#: submodule.c:1823 #, 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:1828 +#: submodule.c:1838 #, 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 +#: submodule.c:1865 submodule.c:2175 #, c-format msgid "could not recurse into submodule '%s'" msgstr "no pudo recursar en el submódulo '%s'" -#: submodule.c:1876 +#: submodule.c:1886 msgid "could not reset submodule index" msgstr "no se pudo reiniciar el index del submódulo" -#: submodule.c:1918 +#: submodule.c:1928 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1970 +#: submodule.c:1980 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:2038 +#: submodule.c:2048 #, 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 +#: submodule.c:2069 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8353,17 +8680,17 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2081 submodule.c:2140 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:2075 +#: submodule.c:2085 #, 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 +#: submodule.c:2092 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8374,65 +8701,65 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2210 +#: submodule.c:2220 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2250 +#: submodule.c:2260 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "ejecución del comando de remolque '%s' falló" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor '%s' desconocido para la clave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "más de un %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "token de remolque vacío en el trailer '%.*s'" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "no se pudo leer el archivo de entrada '%s'" -#: trailer.c:753 +#: trailer.c:751 builtin/mktag.c:91 msgid "could not read from stdin" msgstr "no se pudo leer desde stdin" -#: trailer.c:1011 wrapper.c:673 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "no se pudo definir %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "el archivo %s no es un archivo regular" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "el archivo %s no puede ser escrito por el usuario" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "no se pudo abrir el archivo temporal" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "no se pudo renombrar el archivo temporal a %s" @@ -8481,7 +8808,7 @@ msgstr "no se pudo ejecutar fast-import" msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:549 transport-helper.c:1156 +#: transport-helper.c:549 transport-helper.c:1237 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" @@ -8499,7 +8826,7 @@ msgstr "configurando servicio de ruta remota no soportado por el protocolo" msgid "invalid remote service path" msgstr "ruta de servicio remoto inválida" -#: transport-helper.c:661 transport.c:1347 +#: transport-helper.c:661 transport.c:1447 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" @@ -8508,59 +8835,68 @@ msgstr "operación no soportada por protocolo" msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:740 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'opción' sin una directiva correspondiente 'ok/error'" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:793 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper reportó estado inesperado de %s" -#: transport-helper.c:854 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:857 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:860 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:865 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "helper %s no soporta --atomic" -#: transport-helper.c:871 +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "helper %s no soporta --%s" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:970 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:975 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:1022 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1052 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8569,52 +8905,52 @@ msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" "Tal vez deberías especificar un branch.\n" -#: transport-helper.c:1133 +#: transport-helper.c:1214 #, c-format msgid "unsupported object format '%s'" msgstr "formado de objeto no soportado '%s'" -#: transport-helper.c:1142 +#: transport-helper.c:1223 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1294 +#: transport-helper.c:1375 #, c-format msgid "read(%s) failed" msgstr "leer(%s) falló" -#: transport-helper.c:1321 +#: transport-helper.c:1402 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) falló" -#: transport-helper.c:1370 +#: transport-helper.c:1451 #, c-format msgid "%s thread failed" msgstr "hilo %s falló" -#: transport-helper.c:1374 +#: transport-helper.c:1455 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s falló al unirse: %s" -#: transport-helper.c:1393 transport-helper.c:1397 +#: transport-helper.c:1474 transport-helper.c:1478 #, 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:1434 +#: transport-helper.c:1515 #, c-format msgid "%s process failed to wait" msgstr "proceso %s falló al esperar" -#: transport-helper.c:1438 +#: transport-helper.c:1519 #, c-format msgid "%s process failed" msgstr "proceso %s falló" -#: transport-helper.c:1456 transport-helper.c:1465 +#: transport-helper.c:1537 transport-helper.c:1546 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" @@ -8633,37 +8969,37 @@ msgstr "no se pudo leer el conjunto '%s'" msgid "transport: invalid depth option '%s'" msgstr "transport: opción inválida '%s'" -#: transport.c:272 +#: transport.c:269 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:273 +#: transport.c:270 msgid "server options require protocol version 2 or later" msgstr "opciones del servidor requieren protocolo versión 2 o posterior" -#: transport.c:631 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "no se pudo analizar valor de configuración transport.color.*" -#: transport.c:704 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "soporte para protocolo v2 no implementado todavía" -#: transport.c:838 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconocido para configuración '%s': %s" -#: transport.c:904 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "transporte '%s' no permitido" -#: transport.c:957 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync ya no es soportado" -#: transport.c:1059 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8672,7 +9008,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:1063 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8699,27 +9035,27 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:1071 +#: transport.c:1169 msgid "Aborting." msgstr "Abortando." -#: transport.c:1216 +#: transport.c:1316 msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "objeto de árbol muy corto" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "modo mal formado en la entrada de árbol" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nombre de archivo vacío en la entrada de árbol" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "archivo de árbol muy corto" @@ -8992,7 +9328,7 @@ msgstr "" msgid "Updating index flags" msgstr "Actualizando flags del index" -#: upload-pack.c:1415 +#: upload-pack.c:1543 msgid "expected flush after fetch arguments" msgstr "se espera flush tras argumentos fetch" @@ -9029,50 +9365,118 @@ msgstr "segmento de ruta '..' inválido" msgid "Fetching objects" msgstr "Haciendo fetch a objetos" -#: worktree.c:248 builtin/am.c:2098 +#: worktree.c:238 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#: worktree.c:295 +#: worktree.c:304 #, 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:315 #, 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:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:324 +#: worktree.c:333 #, 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:333 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" -#: wrapper.c:194 wrapper.c:364 +#: worktree.c:608 +msgid "not a directory" +msgstr "no es un directorio" + +#: worktree.c:617 +msgid ".git is not a file" +msgstr ".git no es un archivo" + +#: worktree.c:619 +msgid ".git file broken" +msgstr "archivo .git roto" + +#: worktree.c:621 +msgid ".git file incorrect" +msgstr "archivo .git incorrecto" + +#: worktree.c:727 +msgid "not a valid path" +msgstr "no es una ruta válida" + +#: worktree.c:733 +msgid "unable to locate repository; .git is not a file" +msgstr "no es posible ubicar el repositorio; .git no es un archivo" + +#: worktree.c:737 +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "" +"incapaz de localizar el repositorio; El archivo .git no hace referencia a un " +"repositorio" + +#: worktree.c:741 +msgid "unable to locate repository; .git file broken" +msgstr "no es posible ubicar el repositorio; archivo .git roto" + +#: worktree.c:747 +msgid "gitdir unreadable" +msgstr "gitdir ilegible" + +#: worktree.c:751 +msgid "gitdir incorrect" +msgstr "gitdir incorrecto" + +#: worktree.c:776 +msgid "not a valid directory" +msgstr "no en un directorio válido" + +#: worktree.c:782 +msgid "gitdir file does not exist" +msgstr "archivo gitdir no existe" + +#: worktree.c:787 worktree.c:796 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "no es posible leer archivo gitdir (%s)" + +#: worktree.c:806 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)" + +#: worktree.c:814 +msgid "invalid gitdir file" +msgstr "archivo gitdir inválido" + +#: worktree.c:822 +msgid "gitdir file points to non-existent location" +msgstr "archivo gitdir apunta a una ubicación inexistente" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:395 wrapper.c:596 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "no es posible acceder '%s'" -#: wrapper.c:604 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" @@ -9148,79 +9552,79 @@ 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:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "ambos borrados:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "agregado por nosotros:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "borrados por ellos:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "agregado por ellos:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "borrado por nosotros:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "ambos agregados:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "ambos modificados:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "nuevo archivo:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "copiado:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "borrado:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "modificado:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "renombrado:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "cambio de tipo:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "desconocido:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "des-fusionado:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "nuevos commits, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "contenido modificado, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:904 +#: wt-status.c:905 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" @@ -9484,6 +9888,14 @@ msgstr "rebase interactivo en progreso; en " msgid "rebase in progress; onto " msgstr "rebase en progreso; en " +#: wt-status.c:1747 +msgid "HEAD detached at " +msgstr "HEAD desacoplada en " + +#: wt-status.c:1749 +msgid "HEAD detached from " +msgstr "HEAD desacoplada de " + #: wt-status.c:1752 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." @@ -9534,12 +9946,12 @@ 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:1812 +#: wt-status.c:1813 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1815 +#: wt-status.c:1817 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9548,72 +9960,72 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1818 +#: wt-status.c:1821 #, 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:1821 +#: wt-status.c:1825 #, 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:1824 wt-status.c:1829 +#: wt-status.c:1829 wt-status.c:1835 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1827 +#: wt-status.c:1832 #, 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:1831 +#: wt-status.c:1837 #, 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:1944 +#: wt-status.c:1942 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1948 +#: wt-status.c:1946 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1979 +#: wt-status.c:1977 msgid "different" msgstr "diferente" -#: wt-status.c:1981 wt-status.c:1989 +#: wt-status.c:1979 wt-status.c:1987 msgid "behind " msgstr "detrás " -#: wt-status.c:1984 wt-status.c:1987 +#: wt-status.c:1982 wt-status.c:1985 msgid "ahead " msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2509 +#: wt-status.c:2507 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2515 +#: wt-status.c:2513 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2517 +#: wt-status.c:2515 #, 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." -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "falló al desvincular '%s'" @@ -9622,128 +10034,133 @@ msgstr "falló al desvincular '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opción>] [--] <especificación-de-ruta>..." -#: builtin/add.c:88 +#: builtin/add.c:58 +#, c-format +msgid "cannot chmod %cx '%s'" +msgstr "no se puede aplicar chmod %cx '%s'" + +#: builtin/add.c:96 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:93 builtin/commit.c:285 +#: builtin/add.c:101 builtin/commit.c:285 msgid "updating files failed" msgstr "falló la actualización de carpetas" -#: builtin/add.c:103 +#: builtin/add.c:111 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:186 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:266 builtin/rev-parse.c:904 +#: builtin/add.c:280 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "No se pudo leer el índice" -#: builtin/add.c:277 +#: builtin/add.c:291 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:281 +#: builtin/add.c:295 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:284 +#: builtin/add.c:298 msgid "editing patch failed" msgstr "falló la edición del parche" -#: builtin/add.c:287 +#: builtin/add.c:301 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:289 +#: builtin/add.c:303 msgid "Empty patch. Aborted." msgstr "Parche vacío. Abortado." -#: builtin/add.c:294 +#: builtin/add.c:308 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:302 +#: builtin/add.c:316 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:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "dry run ( ejecución en seco)" -#: builtin/add.c:325 +#: builtin/add.c:339 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 +#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:327 +#: builtin/add.c:341 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:328 +#: builtin/add.c:342 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:329 +#: builtin/add.c:343 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:330 +#: builtin/add.c:344 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:331 +#: builtin/add.c:345 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:332 +#: builtin/add.c:346 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:335 +#: builtin/add.c:349 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:351 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el índice" -#: builtin/add.c:338 +#: builtin/add.c:352 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:339 +#: builtin/add.c:353 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:341 builtin/update-index.c:1004 +#: builtin/add.c:355 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:343 +#: builtin/add.c:357 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:345 +#: builtin/add.c:359 msgid "backend for `git stash -p`" msgstr "backend para `git stash -p`" -#: builtin/add.c:363 +#: builtin/add.c:377 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9774,12 +10191,12 @@ msgstr "" "\n" "Vea \"git help submodule\" para más información." -#: builtin/add.c:391 +#: builtin/add.c:405 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:410 +#: builtin/add.c:424 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -9789,47 +10206,47 @@ msgstr "" "Desactiva este mensaje ejecutando\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:419 +#: builtin/add.c:433 msgid "adding files failed" msgstr "falló al agregar archivos" -#: builtin/add.c:447 builtin/commit.c:345 +#: builtin/add.c:461 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file es incompatible con --interactive/--patch" -#: builtin/add.c:464 +#: builtin/add.c:478 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file es incompatible con --edit" -#: builtin/add.c:476 +#: builtin/add.c:490 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:479 +#: builtin/add.c:493 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:483 +#: builtin/add.c:497 #, 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:501 builtin/checkout.c:1701 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 +#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 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:1713 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 +#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul requiere --pathspec-from-file" -#: builtin/add.c:512 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:514 +#: builtin/add.c:528 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -9887,7 +10304,7 @@ msgstr "offset de zona horaria inválido" msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" @@ -9963,12 +10380,12 @@ msgstr "Falló al fusionar en los cambios." msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1643 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -9976,39 +10393,39 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1658 #, 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: " -#: builtin/am.c:1699 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "no es posible escribir en el archivo índice" -#: builtin/am.c:1703 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1743 builtin/am.c:1811 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1760 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1766 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1770 +#: builtin/am.c:1775 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:1814 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10018,7 +10435,7 @@ msgstr "" "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:1821 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10031,17 +10448,17 @@ msgstr "" "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " "en él." -#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:1980 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2024 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10049,156 +10466,156 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2131 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2171 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valor inválido para --show-current-patch: %s" -#: builtin/am.c:2175 +#: builtin/am.c:2182 #, 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:2206 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2207 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2213 +#: builtin/am.c:2220 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2215 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2217 +#: builtin/am.c:2224 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:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 -#: builtin/repack.c:306 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:334 builtin/stash.c:882 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2220 -msgid "add a Signed-off-by line to the commit message" +#: builtin/am.c:2227 +msgid "add a Signed-off-by trailer to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2223 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2225 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2229 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2231 +#: builtin/am.c:2238 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:2234 +#: builtin/am.c:2241 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:2237 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 -#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/am.c:2266 +#: 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:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 -#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 +#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 -#: bugreport.c:137 +#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2263 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2269 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2271 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2274 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2277 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2280 -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:2287 +msgid "restore the original branch and abort the patching operation" +msgstr "restaurar la rama original y abortar la operación de parcheo" -#: builtin/am.c:2283 -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:2290 +msgid "abort the patching operation but keep HEAD where it is" +msgstr "abortar la operación de parcheo pero mantener HEAD donde está" -#: builtin/am.c:2287 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "muestra el parche siendo aplicado" -#: builtin/am.c:2292 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2294 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 -#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 -#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 +#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 +#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 msgid "GPG-sign commits" msgstr "Commits con firma GPG" -#: builtin/am.c:2300 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2318 +#: builtin/am.c:2325 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." @@ -10206,16 +10623,16 @@ msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" "será eliminada. Por favor no la use más." -#: builtin/am.c:2325 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2340 +#: builtin/am.c:2347 #, 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:2364 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10224,11 +10641,11 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2370 +#: builtin/am.c:2377 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:2380 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "modo interactivo requiere parches en la línea de comando" @@ -10266,43 +10683,15 @@ msgstr "git archive: error de protocolo" msgid "git archive: expected a flush" msgstr "git archive: se esperaba un flush" -#: 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: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:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: 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 +#: builtin/bisect--helper.c:24 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 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10310,48 +10699,76 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:26 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<término> --term-{new," -"bad}=<término>][--no-checkout] [<malo> [<bueno>...]] [--] [<rutas>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<término> --term-{old," +"good}=<término>] [--no-checkout] [--first-parent] [<malo> [<bueno>...]] [--] " +"[<rutas>...]" + +#: builtin/bisect--helper.c:28 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:29 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" + +#: builtin/bisect--helper.c:30 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]" + +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-replay <filename>" +msgstr "git bisect--helper --bisect-replay <archivio>" + +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:107 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "no se puede abrir archivo '%s' en modo '%s'" + +#: builtin/bisect--helper.c:114 +#, c-format +msgid "could not write to file '%s'" +msgstr "no se pudo escribir al archivo '%s'" + +#: builtin/bisect--helper.c:153 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' no es un término válido" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:157 #, 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:100 +#: builtin/bisect--helper.c:167 #, 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:111 +#: builtin/bisect--helper.c:177 msgid "please use two different terms" msgstr "por favor use dos términos diferentes" -#: 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:155 +#: builtin/bisect--helper.c:193 #, c-format msgid "We are not bisecting.\n" msgstr "No estamos bisecando.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:201 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' no es un commit válido" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:210 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10359,27 +10776,27 @@ msgstr "" "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:254 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mal argumento bisect_write: %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:259 #, 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 +#: builtin/bisect--helper.c:271 #, c-format msgid "couldn't open the file '%s'" msgstr "no se pudo abrir el archivo '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:297 #, 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 +#: builtin/bisect--helper.c:324 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10388,7 +10805,7 @@ 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 +#: builtin/bisect--helper.c:328 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10399,7 +10816,7 @@ msgstr "" "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 +#: builtin/bisect--helper.c:348 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -10408,15 +10825,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:356 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:417 msgid "no terms defined" msgstr "no hay términos definidos" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:420 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10425,7 +10842,7 @@ msgstr "" "Tus términos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:430 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10434,267 +10851,308 @@ 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:460 builtin/bisect--helper.c:473 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 +msgid "revision walk setup failed\n" +msgstr "la configuración del recorrido de revisión falló\n" + +#: builtin/bisect--helper.c:519 +#, c-format +msgid "could not open '%s' for appending" +msgstr "no se pudo abrir '%s' en modo append" + +#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 msgid "'' is not a valid term" msgstr "'' no es un término válido" -#: builtin/bisect--helper.c:483 +#: builtin/bisect--helper.c:661 #, c-format msgid "unrecognized option: '%s'" msgstr "opción desconocida: '%s'" -#: builtin/bisect--helper.c:487 +#: builtin/bisect--helper.c:665 #, 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:519 +#: builtin/bisect--helper.c:696 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:534 +#: builtin/bisect--helper.c:711 #, 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:555 +#: builtin/bisect--helper.c:732 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecará en un árbol con cg-seek" -#: builtin/bisect--helper.c:558 +#: builtin/bisect--helper.c:735 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbólico extraño" -#: builtin/bisect--helper.c:582 +#: builtin/bisect--helper.c:755 #, c-format msgid "invalid ref: '%s'" msgstr "ref inválido: '%s'" -#: builtin/bisect--helper.c:638 -msgid "perform 'git bisect next'" -msgstr "realiza 'git bisect next'" +#: builtin/bisect--helper.c:813 +msgid "You need to start by \"git bisect start\"\n" +msgstr "Debes iniciar con \"git bisect start\"\n" -#: builtin/bisect--helper.c:640 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "escribe los términos a .git/BISECT_TERMS" +#. 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:824 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "¿Quieres que lo haga por ti [Y/n]? " -#: builtin/bisect--helper.c:642 -msgid "cleanup the bisection state" -msgstr "limpiar el estado de bisección" +#: builtin/bisect--helper.c:842 +msgid "Please call `--bisect-state` with at least one argument" +msgstr "Llame a `--bisect-state` con al menos un argumento" -#: builtin/bisect--helper.c:644 -msgid "check for expected revs" -msgstr "revisar por revs esperados" +#: builtin/bisect--helper.c:855 +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "'git bisect %s' solo puede tomar un argumento." -#: builtin/bisect--helper.c:646 -msgid "reset the bisection state" -msgstr "reiniciar el estado de bisect" +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#, c-format +msgid "Bad rev input: %s" +msgstr "Mala entrada rev: %s" + +#: builtin/bisect--helper.c:912 +msgid "We are not bisecting." +msgstr "No estamos bisecando." -#: builtin/bisect--helper.c:648 -msgid "write out the bisection state in BISECT_LOG" -msgstr "escribir el estado de bisect en BISECT_LOG" +#: builtin/bisect--helper.c:962 +#, c-format +msgid "'%s'?? what are you talking about?" +msgstr "'%s'?? ¿De qué estás hablando?" + +#: builtin/bisect--helper.c:974 +#, c-format +msgid "cannot read file '%s' for replaying" +msgstr "no se puede leer '%s' para reproducir" -#: builtin/bisect--helper.c:650 -msgid "check and set terms in a bisection state" -msgstr "revisar y configurar los terms en el estado de bisect" +#: builtin/bisect--helper.c:1047 +msgid "reset the bisection state" +msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:1049 msgid "check whether bad or good terms exist" msgstr "revisar si existen términos malos o buenos" -#: builtin/bisect--helper.c:654 +#: builtin/bisect--helper.c:1051 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:656 +#: builtin/bisect--helper.c:1053 msgid "start the bisect session" msgstr "comenzar la sesión de bisect" -#: builtin/bisect--helper.c:658 -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:1055 +msgid "find the next bisection commit" +msgstr "encontrar el siguiente commit de bisección" -#: builtin/bisect--helper.c:660 -msgid "no log for BISECT_WRITE" -msgstr "no hay log para BISECT_WRITE" +#: builtin/bisect--helper.c:1057 +msgid "mark the state of ref (or refs)" +msgstr "marcar el estado de ref (o refs)" -#: builtin/bisect--helper.c:678 -msgid "--write-terms requires two arguments" -msgstr "--write-terms requiere dos argumentos" +#: builtin/bisect--helper.c:1059 +msgid "list the bisection steps so far" +msgstr "listar los pasos de bisección hasta ahora" -#: builtin/bisect--helper.c:682 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state no requiere argumentos" +#: builtin/bisect--helper.c:1061 +msgid "replay the bisection process from the given file" +msgstr "reproducir el proceso de bisección del archivo dado" -#: builtin/bisect--helper.c:689 -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset requiere un commit o ningún argumento" +#: builtin/bisect--helper.c:1063 +msgid "skip some commits for checkout" +msgstr "saltar algunos commits para checkout" -#: builtin/bisect--helper.c:693 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write requiere entre 4 o 5 argumentos" +#: builtin/bisect--helper.c:1065 +msgid "no log for BISECT_WRITE" +msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:699 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "--bisect-clean-state no requiere argumentos" +#: builtin/bisect--helper.c:1080 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset requiere un commit o ningún argumento" -#: builtin/bisect--helper.c:705 +#: builtin/bisect--helper.c:1085 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:1091 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" -#: builtin/blame.c:31 +#: builtin/bisect--helper.c:1100 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next requiere 0 argumentos" + +#: builtin/bisect--helper.c:1111 +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-log requiere 0 argumentos" + +#: builtin/bisect--helper.c:1116 +msgid "no logfile given" +msgstr "ningún logfile proporcionado" + +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> están documentadas en git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "esperando un color: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "tiene que terminar con un color" -#: builtin/blame.c:729 +#: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "color inválido '%s' en color.blame.repeatedLines" -#: builtin/blame.c:747 +#: builtin/blame.c:746 msgid "invalid value for blame.coloring" msgstr "valor inválido para blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:845 #, 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:867 +msgid "show blame entries as we find them, incrementally" +msgstr "mostrar las entradas blame como las encontramos, incrementalmente" -#: 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:868 +msgid "do not show object names of boundary commits (Default: off)" +msgstr "no mostrar nombres de objetos de commits extremos (Default: off)" -#: 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:869 +msgid "do not treat root commits as boundaries (Default: off)" +msgstr "no tratar commits raíces como extremos (Default: off)" -#: builtin/blame.c:847 -msgid "Show work cost statistics" -msgstr "Mostrar estadísticas de costo de trabajo" +#: builtin/blame.c:870 +msgid "show work cost statistics" +msgstr "mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:848 -msgid "Force progress reporting" -msgstr "Forzar el reporte de progreso" +#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 +#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/push.c:575 builtin/send-pack.c:198 +msgid "force progress reporting" +msgstr "forzar el reporte de progreso" -#: 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:872 +msgid "show output score for blame entries" +msgstr "mostrar la puntuación de salida de las entradas de blame" -#: builtin/blame.c:850 -msgid "Show original filename (Default: auto)" -msgstr "Mostrar nombre original del archivo (Default: auto)" +#: builtin/blame.c:873 +msgid "show original filename (Default: auto)" +msgstr "mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:851 -msgid "Show original linenumber (Default: off)" -msgstr "Mostrar número de línea original (Default: off)" +#: builtin/blame.c:874 +msgid "show original linenumber (Default: off)" +msgstr "mostrar número de línea original (Default: off)" -#: 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:875 +msgid "show in a format designed for machine consumption" +msgstr "mostrar en un formato diseñado para consumo de máquina" -#: 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:876 +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: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:877 +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:855 -msgid "Show raw timestamp (Default: off)" -msgstr "Mostrar timestamp en formato raw (Default: off)" +#: builtin/blame.c:878 +msgid "show raw timestamp (Default: off)" +msgstr "mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:856 -msgid "Show long commit SHA1 (Default: off)" -msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" +#: builtin/blame.c:879 +msgid "show long commit SHA1 (Default: off)" +msgstr "mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:857 -msgid "Suppress author name and timestamp (Default: off)" -msgstr "Suprimir nombre del autor y timestamp (Default: off)" +#: builtin/blame.c:880 +msgid "suppress author name and timestamp (Default: off)" +msgstr "suprimir nombre del autor y timestamp (Default: off)" -#: 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:881 +msgid "show author email instead of name (Default: off)" +msgstr "mostrar en cambio el email del autor (Default: off)" -#: builtin/blame.c:859 -msgid "Ignore whitespace differences" -msgstr "Ignorar diferencias de espacios en blanco" +#: builtin/blame.c:882 +msgid "ignore whitespace differences" +msgstr "ignorar diferencias de espacios en blanco" -#: builtin/blame.c:860 builtin/log.c:1721 +#: builtin/blame.c:883 builtin/log.c:1812 msgid "rev" msgstr "rev" -#: builtin/blame.c:860 -msgid "Ignore <rev> when blaming" -msgstr "Ignorar <rev> durante el blame" +#: builtin/blame.c:883 +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:884 +msgid "ignore revisions from <file>" +msgstr "ignorar revisiones de <archivo>" -#: builtin/blame.c:862 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "colorear metadata redundante de líneas previas de manera diferente" -#: builtin/blame.c:863 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "colorear líneas por edad" -#: builtin/blame.c:864 -msgid "Spend extra cycles to find better match" -msgstr "Ocupo más ciclos para encontrar mejoras resultados" +#: builtin/blame.c:887 +msgid "spend extra cycles to find better match" +msgstr "ocupar más ciclos para encontrar mejoras resultados" -#: 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:888 +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:866 -msgid "Use <file>'s contents as the final image" -msgstr "Usar contenido de <archivo> como imagen final" +#: builtin/blame.c:889 +msgid "use <file>'s contents as the final image" +msgstr "usar contenido de <archivo> como imagen final" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "puntaje" -#: 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:890 +msgid "find line copies within and across files" +msgstr "encontrar copias de líneas entre y a través de archivos" -#: 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:891 +msgid "find line movements within and across files" +msgstr "encontrar movimientos de líneas entre y a través de archivos" -#: builtin/blame.c:869 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:892 +msgid "range" +msgstr "rango" -#: 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:893 +msgid "process only line range <start>,<end> or function :<funcname>" +msgstr "" +"Procesar solo el rango de líneas <inicio>,<fin> o función: <nombre-función>" -#: builtin/blame.c:921 +#: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -10706,24 +11164,24 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:996 msgid "4 years, 11 months ago" msgstr "hace 4 años, 11 meses" -#: builtin/blame.c:1087 +#: builtin/blame.c:1112 #, 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:1133 +#: builtin/blame.c:1157 msgid "Blaming lines" msgstr "Blaming a líneas" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<opciones>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -10785,121 +11243,111 @@ msgstr "" msgid "Update of config-file failed" msgstr "Falló de actualización de config-file" -#: builtin/branch.c:220 +#: builtin/branch.c:223 msgid "cannot use -a with -d" msgstr "no se puede usar-a con -d" -#: builtin/branch.c:226 +#: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" msgstr "No se pudo revisar el objeto commit para HEAD" -#: builtin/branch.c:240 +#: builtin/branch.c:244 #, 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:255 +#: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "rama de rastreo remoto '%s' no encontrada." -#: builtin/branch.c:256 +#: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." msgstr "rama '%s' no encontrada." -#: 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:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "Error al eliminar la rama '%s'" - -#: builtin/branch.c:279 +#: builtin/branch.c:291 #, 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:280 +#: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Eliminada la rama %s (era %s)..\n" -#: builtin/branch.c:429 builtin/tag.c:61 +#: builtin/branch.c:438 builtin/tag.c:61 msgid "unable to parse format string" msgstr "no es posible analizar el string de formato" -#: builtin/branch.c:460 +#: builtin/branch.c:469 msgid "could not resolve HEAD" msgstr "no se pudo resolver HEAD" -#: builtin/branch.c:466 +#: builtin/branch.c:475 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) apunta fuera de refs/heads/" -#: builtin/branch.c:481 +#: builtin/branch.c:490 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Rama %s está siendo rebasada en %s" -#: builtin/branch.c:485 +#: builtin/branch.c:494 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Rama %s está siendo bisecada en %s" -#: builtin/branch.c:502 +#: builtin/branch.c:511 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:504 +#: builtin/branch.c:513 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:515 +#: builtin/branch.c:524 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nombre de rama inválido: '%s'" -#: builtin/branch.c:542 +#: builtin/branch.c:553 msgid "Branch rename failed" msgstr "Cambio de nombre de rama fallido" -#: builtin/branch.c:544 +#: builtin/branch.c:555 msgid "Branch copy failed" msgstr "Copiado de rama fallido" -#: builtin/branch.c:548 +#: builtin/branch.c:559 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Copia creada de la rama malnombrada '%s'" -#: builtin/branch.c:551 +#: builtin/branch.c:562 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Rama mal llamada '%s' renombrada" -#: builtin/branch.c:557 +#: builtin/branch.c:568 #, 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:566 +#: builtin/branch.c:577 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:568 +#: builtin/branch.c:579 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:584 +#: builtin/branch.c:595 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10910,180 +11358,180 @@ msgstr "" "%s\n" "Las líneas que comiencen con '%c' serán eliminadas.\n" -#: builtin/branch.c:618 +#: builtin/branch.c:629 msgid "Generic options" msgstr "Opciones genéricas" -#: builtin/branch.c:620 +#: builtin/branch.c:631 msgid "show hash and subject, give twice for upstream branch" msgstr "mostrar hash y tema, dar dos veces para rama upstream" -#: builtin/branch.c:621 +#: builtin/branch.c:632 msgid "suppress informational messages" msgstr "suprimir mensajes informativos" -#: builtin/branch.c:622 +#: builtin/branch.c:633 msgid "set up tracking mode (see git-pull(1))" msgstr "configurando modo tracking (mirar git-pull(1))" -#: builtin/branch.c:624 +#: builtin/branch.c:635 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:520 +#: builtin/branch.c:637 builtin/rebase.c:534 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:626 +#: builtin/branch.c:637 msgid "change the upstream info" msgstr "cambiar info de upstream" -#: builtin/branch.c:627 +#: builtin/branch.c:638 msgid "unset the upstream info" msgstr "desconfigurando la info de upstream" -#: builtin/branch.c:628 +#: builtin/branch.c:639 msgid "use colored output" msgstr "usar salida con colores" -#: builtin/branch.c:629 +#: builtin/branch.c:640 msgid "act on remote-tracking branches" msgstr "actuar en ramas de traqueo remoto" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:642 builtin/branch.c:644 msgid "print only branches that contain the commit" msgstr "mostrar solo ramas que contienen el commit" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:643 builtin/branch.c:645 msgid "print only branches that don't contain the commit" msgstr "mostrar solo ramas que no contienen el commit" -#: builtin/branch.c:637 +#: builtin/branch.c:648 msgid "Specific git-branch actions:" msgstr "Acciones específicas de git-branch:" -#: builtin/branch.c:638 +#: builtin/branch.c:649 msgid "list both remote-tracking and local branches" msgstr "listar ramas de remote-tracking y locales" -#: builtin/branch.c:640 +#: builtin/branch.c:651 msgid "delete fully merged branch" msgstr "borrar ramas totalmente fusionadas" -#: builtin/branch.c:641 +#: builtin/branch.c:652 msgid "delete branch (even if not merged)" msgstr "borrar rama (incluso si no está fusionada)" -#: builtin/branch.c:642 +#: builtin/branch.c:653 msgid "move/rename a branch and its reflog" msgstr "mover/renombrar una rama y su reflog" -#: builtin/branch.c:643 +#: builtin/branch.c:654 msgid "move/rename a branch, even if target exists" msgstr "mover/renombrar una rama, incluso si el destino existe" -#: builtin/branch.c:644 +#: builtin/branch.c:655 msgid "copy a branch and its reflog" msgstr "copiar una rama y su reflog" -#: builtin/branch.c:645 +#: builtin/branch.c:656 msgid "copy a branch, even if target exists" msgstr "copiar una rama, incluso si el objetivo existe" -#: builtin/branch.c:646 +#: builtin/branch.c:657 msgid "list branch names" msgstr "listar nombres de ramas" -#: builtin/branch.c:647 +#: builtin/branch.c:658 msgid "show current branch name" msgstr "muestra el nombre de branch actual" -#: builtin/branch.c:648 +#: builtin/branch.c:659 msgid "create the branch's reflog" msgstr "crea el reflog de la rama" -#: builtin/branch.c:650 +#: builtin/branch.c:661 msgid "edit the description for the branch" msgstr "edita la descripción de la rama" -#: builtin/branch.c:651 +#: builtin/branch.c:662 msgid "force creation, move/rename, deletion" msgstr "fuerza la creación,movimiento/renombrado,borrado" -#: builtin/branch.c:652 +#: builtin/branch.c:663 msgid "print only branches that are merged" msgstr "muestra solo ramas que han sido fusionadas" -#: builtin/branch.c:653 +#: builtin/branch.c:664 msgid "print only branches that are not merged" msgstr "muestra solo ramas que no han sido fusionadas" -#: builtin/branch.c:654 +#: builtin/branch.c:665 msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:667 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:434 +#: builtin/tag.c:466 msgid "object" msgstr "objeto" -#: builtin/branch.c:657 +#: builtin/branch.c:668 msgid "print only branches of the object" msgstr "imprimir sólo las ramas del objeto" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:693 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "¡HEAD no encontrado abajo de refs/heads!" -#: builtin/branch.c:706 +#: builtin/branch.c:717 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:751 +#: builtin/branch.c:764 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripción al HEAD desacoplado" -#: builtin/branch.c:756 +#: builtin/branch.c:769 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:763 +#: builtin/branch.c:776 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aún no hay commits en la rama '%s'." -#: builtin/branch.c:766 +#: builtin/branch.c:779 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:781 +#: builtin/branch.c:794 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operación de copiado" -#: builtin/branch.c:790 +#: builtin/branch.c:803 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operación de renombrado" -#: builtin/branch.c:795 +#: builtin/branch.c:808 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:799 +#: builtin/branch.c:812 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11091,32 +11539,32 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:815 builtin/branch.c:838 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:806 +#: builtin/branch.c:819 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:819 +#: builtin/branch.c:832 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:823 +#: builtin/branch.c:836 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:829 +#: builtin/branch.c:842 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Rama '%s' no tiene información de upstream" -#: builtin/branch.c:839 +#: builtin/branch.c:852 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>?" @@ -11124,7 +11572,7 @@ msgstr "" "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:843 +#: builtin/branch.c:856 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11132,6 +11580,104 @@ msgstr "" "la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--" "set-upstream-to' en cambio." +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "versión de git:\n" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() falló con error '%s' (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "información del compilador: " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "información de libc: " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" +"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"¡Gracias por prepara un reporte de bug de Git!\n" +"Por favor responde las siguientes preguntas para ayudarnos a entender el " +"problema.\n" +"\n" +"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el " +"problema)\n" +"\n" +"¿Qué esperabas que sucediera? (Comportamiento esperado)\n" +"\n" +"¿Qué sucedio en lugar de eso? (Comportamiento real)\n" +"\n" +"¿Qué es diferente entre lo que esperabas y lo que pasó?\n" +"\n" +"Cualquier cosa que quieras agregar:\n" +"\n" +"Por favor revisa el resto del reporte abajo.\n" +"Puedes borrar cualquier línea que no desees compartir.\n" + +#: builtin/bugreport.c:135 +msgid "specify a destination for the bugreport file" +msgstr "especificar el destino para el archivo de reporte de bug" + +#: builtin/bugreport.c:137 +msgid "specify a strftime format suffix for the filename" +msgstr "especificar el sufijo formato strftime para el nombre del archivo" + +#: builtin/bugreport.c:159 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "no se pudo crear directorios principales para '%s'" + +#: builtin/bugreport.c:166 +msgid "System Info" +msgstr "Información del sistema" + +#: builtin/bugreport.c:169 +msgid "Enabled Hooks" +msgstr "Activar Hooks" + +#: builtin/bugreport.c:176 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "no se pudo crear un archivo en '%s'" + +#: builtin/bugreport.c:179 +#, c-format +msgid "unable to write to %s" +msgstr "no es posible escribir en %s" + +#: builtin/bugreport.c:189 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Crear un nuevo reporte en '%s'.\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>" @@ -11148,44 +11694,48 @@ msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3448 +#: builtin/bundle.c:67 builtin/pack-objects.c:3495 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/bundle.c:68 builtin/pack-objects.c:3450 +#: builtin/bundle.c:69 builtin/pack-objects.c:3497 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/bundle.c:70 builtin/pack-objects.c:3452 +#: builtin/bundle.c:71 builtin/pack-objects.c:3499 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:3455 +#: builtin/bundle.c:74 builtin/pack-objects.c:3502 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 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "especificar la versión del formato del paquete" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Se necesita un repositorio para agrupar." -#: builtin/bundle.c:104 +#: builtin/bundle.c:107 msgid "do not show bundle details" msgstr "no mostrar detalles del bundle" -#: builtin/bundle.c:119 +#: builtin/bundle.c:122 #, c-format msgid "%s is okay\n" msgstr "%s está bien\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/bundle.c:168 builtin/remote.c:1686 +#: builtin/bundle.c:171 builtin/remote.c:1700 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 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Sub-comando desconocido: %s" @@ -11238,7 +11788,7 @@ msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" 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:648 git-submodule.sh:958 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" @@ -11299,8 +11849,8 @@ msgstr "leer nombres de archivos de stdin" 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:21 builtin/checkout.c:1486 builtin/gc.c:537 -#: builtin/worktree.c:561 +#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 +#: builtin/worktree.c:489 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -11353,56 +11903,56 @@ msgstr "no es posible analizar el contacto: %s" msgid "no contacts specified" msgstr "contactos no especificados" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opciones>] [--] [<archivo>...]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:169 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:164 +#: builtin/checkout-index.c:186 msgid "check out all files in the index" msgstr "revisar todos los archivos en el índice" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:187 msgid "force overwrite of existing files" msgstr "forzar sobreescritura de los archivos existentes" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:189 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:169 +#: builtin/checkout-index.c:191 msgid "don't checkout new files" msgstr "no revisar archivos nuevos" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:193 msgid "update stat information in the index file" msgstr "actualizar información de estado en el archivo índice" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:197 msgid "read list of paths from the standard input" msgstr "leer lista de rutas desde standard input" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:199 msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" -#: 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:754 +#: builtin/checkout-index.c:200 builtin/column.c:31 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:717 msgid "string" msgstr "string" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:201 msgid "when creating files, prepend <string>" msgstr "cuando cree archivos, anteponer <string>" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:203 msgid "copy out the files from named stage" msgstr "copiar los archivos del stage nombrado" @@ -11437,83 +11987,83 @@ msgstr "ruta '%s' no tiene su versión" msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:256 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:290 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:395 +#: builtin/checkout.c:396 #, 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:400 +#: builtin/checkout.c:401 #, 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:407 +#: builtin/checkout.c:408 #, 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:430 builtin/checkout.c:433 builtin/checkout.c:436 -#: builtin/checkout.c:440 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:443 builtin/checkout.c:446 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:450 +#: builtin/checkout.c:451 #, 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:454 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s' o '%s' están especificados" -#: builtin/checkout.c:458 +#: builtin/checkout.c:459 #, 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:463 builtin/checkout.c:468 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' no puede ser usado con %s" -#: builtin/checkout.c:527 builtin/checkout.c:534 +#: builtin/checkout.c:543 builtin/checkout.c:550 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:702 +#: builtin/checkout.c:718 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:756 +#: builtin/checkout.c:772 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11522,50 +12072,50 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:859 +#: builtin/checkout.c:865 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:907 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:905 builtin/clone.c:720 +#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:909 +#: builtin/checkout.c:915 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:912 +#: builtin/checkout.c:918 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:916 +#: builtin/checkout.c:922 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:918 builtin/checkout.c:1342 +#: builtin/checkout.c:924 builtin/checkout.c:1355 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:920 +#: builtin/checkout.c:926 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:977 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:983 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11588,7 +12138,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11615,19 +12165,19 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1031 +#: builtin/checkout.c:1037 msgid "internal error in revision walk" msgstr "error interno en camino de revisión" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:1075 builtin/checkout.c:1337 +#: builtin/checkout.c:1081 builtin/checkout.c:1350 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1163 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11636,7 +12186,7 @@ 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:1157 +#: builtin/checkout.c:1170 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" @@ -11657,51 +12207,51 @@ msgstr "" "de nombre <nombre> remota, como 'origin', considera configurar\n" "checkout.defaultRemote=origin en tu configuración." -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1180 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1246 msgid "only one reference expected" msgstr "solo una referencia esperada" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1263 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1309 builtin/checkout.c:1675 +#: builtin/checkout.c:1322 builtin/checkout.c:1688 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1371 #, 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:1359 builtin/checkout.c:1367 +#: builtin/checkout.c:1372 builtin/checkout.c:1380 #, c-format msgid "a branch is expected, got '%s'" msgstr "se esperaba branch, se obuto '%s'" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1375 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1391 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11709,7 +12259,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1395 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11717,7 +12267,7 @@ 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:1386 +#: builtin/checkout.c:1399 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11725,7 +12275,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1403 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11733,7 +12283,7 @@ msgstr "" "no se puede cambiar de branch durante un cherry-pick\n" "Considera \"git cherry-pick --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11741,144 +12291,137 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1398 +#: builtin/checkout.c:1411 msgid "you are switching branch while bisecting" msgstr "estás cambiando ramas durante un bisect" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1418 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 +#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 -#: builtin/checkout.c:1431 builtin/checkout.c:1436 +#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 +#: builtin/checkout.c:1444 builtin/checkout.c:1449 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1433 +#: builtin/checkout.c:1446 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1441 +#: builtin/checkout.c:1454 #, 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:1448 +#: builtin/checkout.c:1461 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 -#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 -#: builtin/send-pack.c:173 -msgid "force progress reporting" -msgstr "forzar el reporte de progreso" - -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1504 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:1492 builtin/log.c:1709 parse-options.h:322 +#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1506 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1505 builtin/worktree.c:558 +#: builtin/checkout.c:1518 builtin/worktree.c:486 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1519 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1508 +#: builtin/checkout.c:1521 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1523 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1523 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1512 builtin/merge.c:292 +#: builtin/checkout.c:1525 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1515 +#: builtin/checkout.c:1528 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:1528 +#: builtin/checkout.c:1541 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1544 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1548 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1603 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1594 +#: builtin/checkout.c:1607 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1644 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1636 +#: builtin/checkout.c:1649 #, c-format msgid "missing branch name; try -%c" msgstr "falta nombre de rama; prueba -%c" -#: builtin/checkout.c:1668 +#: builtin/checkout.c:1681 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1684 +#: builtin/checkout.c:1697 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1704 #, 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:1695 +#: builtin/checkout.c:1708 #, 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:1704 +#: builtin/checkout.c:1717 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file es incompatible con --detach" -#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 +#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file es incompatible con --patch" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1733 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11886,70 +12429,70 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1723 +#: builtin/checkout.c:1738 msgid "you must specify path(s) to restore" msgstr "debes especificar path(s) para restaurar" -#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 -#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 -#: builtin/worktree.c:556 +#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 +#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 +#: builtin/worktree.c:484 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1765 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1767 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1768 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1770 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1756 +#: builtin/checkout.c:1771 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1816 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1818 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1820 msgid "second guess 'git switch <no-such-branch>'" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1822 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1856 msgid "which tree-ish to checkout from" msgstr "de qué árbol hacer el checkout" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1858 msgid "restore the index" msgstr "restaurar el index" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1860 msgid "restore the working tree (default)" msgstr "restaurar el árbol de trabajo (default)" -#: builtin/checkout.c:1847 +#: builtin/checkout.c:1862 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1848 +#: builtin/checkout.c:1863 msgid "use overlay mode" msgstr "usar modo overlay" @@ -11989,7 +12532,7 @@ msgstr "falló al borrar %s" msgid "could not lstat %s\n" msgstr "no se pudo lstat %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12002,7 +12545,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12023,8 +12566,8 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "¿Ahh (%s)?\n" @@ -12094,8 +12637,8 @@ msgid "remove whole directories" msgstr "borrar directorios completos" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 -#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" @@ -12136,163 +12679,163 @@ msgstr "-x y -X no pueden ser usadas juntas" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "crear un repositorio vacío" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "crear un repositorio espejo (implica vacío)" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "clonar de un repositorio local" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "no usar hardlinks, siempre copiar" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "configurar como repositorio compartido" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "inicializar submódulos en el clonado" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "numero de submódulos clonados en paralelo" -#: builtin/clone.c:111 builtin/init-db.c:551 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "usa--reference solamente si estás clonado" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 msgid "name" msgstr "nombre" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checkout <rama> en lugar de HEAD remota" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 #: builtin/pull.c:208 msgid "depth" msgstr "profundidad" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503 +#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 #: builtin/pull.c:211 msgid "time" msgstr "tiempo" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" -#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:135 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:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "cualquier submódulo clonado será superficial" -#: builtin/clone.c:137 builtin/init-db.c:560 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "separa git dir del árbol de trabajo" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "llave=valor" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opción para trasmitir" -#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 -#: builtin/push.c:571 +#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 -#: builtin/push.c:573 +#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:150 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 +#: builtin/clone.c:152 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 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12300,42 +12843,42 @@ 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:340 +#: builtin/clone.c:341 #, 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:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, c-format msgid "failed to start iterator over '%s'" msgstr "falló al iniciar el iterador sobre '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "falló al crear link '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "falló al copiar archivo a '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "failed to iterate over '%s'" msgstr "falló al iterar sobre '%s'" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12345,100 +12888,105 @@ msgstr "" "Puedes inspeccionar a qué se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, 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:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:756 +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "falló al inicializar sparse-checkout" -#: builtin/clone.c:779 +#: builtin/clone.c:780 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:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:971 builtin/receive-pack.c:1982 +#: builtin/clone.c:993 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:975 +#: builtin/clone.c:997 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:988 +#: builtin/clone.c:1010 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:991 +#: builtin/clone.c:1013 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:1007 +#: builtin/clone.c:1026 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:1011 builtin/fetch.c:1794 +#: builtin/clone.c:1030 builtin/fetch.c:1951 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:1021 +#: builtin/clone.c:1040 #, 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:1033 +#: builtin/clone.c:1046 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "La ruta del repositorio '%s' ya existe y no es un directorio vacío." + +#: builtin/clone.c:1060 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 -#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 +#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:1053 +#: builtin/clone.c:1080 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:1073 +#: builtin/clone.c:1100 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:1075 +#: builtin/clone.c:1102 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1099 +#: builtin/clone.c:1126 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12446,36 +12994,41 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1164 +#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' no es un nombre remoto válido" + +#: builtin/clone.c:1211 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:1166 +#: builtin/clone.c:1213 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:1168 +#: builtin/clone.c:1215 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1170 +#: builtin/clone.c:1217 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:1173 +#: builtin/clone.c:1220 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1178 +#: builtin/clone.c:1225 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1262 builtin/clone.c:1270 +#: builtin/clone.c:1315 builtin/clone.c:1323 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1273 +#: builtin/clone.c:1326 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -12511,102 +13064,106 @@ msgstr "Realizando padding entre columnas" msgid "--command must be the first argument" msgstr "--command debe ser el primer argumento" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 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:14 builtin/commit-graph.c:26 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <split options>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" -"git commit-graph write [--object-dir <objeto dir>] [--append] [--" +"git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <opciones de split>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>" -#: builtin/commit-graph.c:62 +#: builtin/commit-graph.c:64 #, 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:78 builtin/commit-graph.c:177 -#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 -#: builtin/commit-graph.c:277 -msgid "The object directory to store the graph" -msgstr "El directorio de objetos para guardar el gráfico" +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "the object directory to store the graph" +msgstr "el directorio de objetos para guardar el gráfico" -#: builtin/commit-graph.c:81 +#: builtin/commit-graph.c:83 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:104 +#: builtin/commit-graph.c:106 #, c-format msgid "Could not open commit-graph '%s'" msgstr "No se pudo abrir commit-graph '%s'" -#: builtin/commit-graph.c:138 +#: builtin/commit-graph.c:142 #, c-format msgid "unrecognized --split argument, %s" msgstr "argumento --split no reconocido, %s" -#: builtin/commit-graph.c:151 +#: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "ID de objeto no hex inesperado :%s" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:160 #, c-format msgid "invalid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/commit-graph.c:180 +#: builtin/commit-graph.c:213 msgid "start walk at all refs" msgstr "comenzar caminata en todas las refs" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de índices por stdin por commits" -#: builtin/commit-graph.c:184 +#: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" msgstr "comenzar a caminar a los commits listados por stdin" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:219 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:188 +#: builtin/commit-graph.c:221 msgid "enable computation for changed paths" msgstr "habilitar computación para rutas cambiadas" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:224 msgid "allow writing an incremental commit-graph file" msgstr "permitir escribir un archivo commit-graph incremental" -#: builtin/commit-graph.c:195 +#: builtin/commit-graph.c:228 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:197 +#: builtin/commit-graph.c:230 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:199 +#: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" msgstr "expirar objetos más viejos a una fecha dada" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "número máximo de cambios de ruta de filtro Bloom para computar" + +#: builtin/commit-graph.c:255 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" -#: builtin/commit-graph.c:245 +#: builtin/commit-graph.c:287 msgid "Collecting commits from input" msgstr "Recolectando commits del input" @@ -12623,7 +13180,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "padre duplicado %s ignorado" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto válido %s" @@ -12651,13 +13208,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 -#: builtin/tag.c:413 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 +#: builtin/tag.c:445 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1506 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "mensaje del commit" @@ -12665,7 +13222,7 @@ msgstr "mensaje del commit" msgid "read commit log message from file" msgstr "leer mensaje de commit desde un archivo" -#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -12815,12 +13372,12 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:729 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" @@ -12846,37 +13403,35 @@ msgstr "no se pudo leer MERGE_MSG" msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:852 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" -"Parece que estás haciendo un commit con una fusión dentro.\n" -"Si esto no es correcto, por favor elimina el archivo\n" -"\t%s\n" -"y vuelve a intentar.\n" +"Parece que está realizando una fusión.\n" +"Si esto no es correcto, ejecute\n" +"\tgit update-ref -d MERGE_HEAD\n" +"e intenta de nuevo.\n" -#: builtin/commit.c:857 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\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 vuelve a intentar.\n" +"Parece que puede estar cometiendo una selección de cerebros.\n" +"Si esto no es correcto, ejecute\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"e intenta de nuevo.\n" -#: builtin/commit.c:870 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12886,7 +13441,7 @@ msgstr "" " líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" " vacío aborta el commit.\n" -#: builtin/commit.c:878 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12898,147 +13453,147 @@ msgstr "" " usted mismo si lo desea.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:895 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:903 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:910 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:928 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:999 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:1013 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:308 #, 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:1057 +#: 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:1071 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inválido '%s'" -#: builtin/commit.c:1089 builtin/commit.c:1333 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1129 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1173 +#: 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:1182 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1185 +#: 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:1187 +#: 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:1189 +#: builtin/commit.c:1187 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1192 +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1202 +#: builtin/commit.c:1200 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:1204 +#: builtin/commit.c:1202 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:1213 +#: builtin/commit.c:1211 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:1231 +#: builtin/commit.c:1229 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:1237 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1370 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1372 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1376 +#: builtin/commit.c:1374 msgid "version" msgstr "version" -#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:679 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1379 builtin/commit.c:1537 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1382 builtin/commit.c:1540 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1385 builtin/commit.c:1543 +#: builtin/commit.c:1383 builtin/commit.c:1541 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:1389 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13046,11 +13601,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1391 parse-options.h:192 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "cuando" -#: builtin/commit.c:1392 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13058,173 +13613,173 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1394 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1395 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1397 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1417 +#: builtin/commit.c:1415 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:1499 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1500 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1502 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "author" msgstr "autor" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1505 builtin/gc.c:538 +#: builtin/commit.c:1503 builtin/gc.c:550 msgid "date" msgstr "fecha" -#: builtin/commit.c:1505 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 -#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1507 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1508 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1509 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1510 +#: builtin/commit.c:1508 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:1511 +#: builtin/commit.c:1509 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:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "agregar Signed-off-by: (firmado por)" +msgid "add a Signed-off-by trailer" +msgstr "agregar un firmado por al final" -#: builtin/commit.c:1513 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1514 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1521 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1522 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1523 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1524 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1525 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1526 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1527 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1528 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1542 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1549 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacío" -#: builtin/commit.c:1551 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1624 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1631 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1652 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1659 +#: builtin/commit.c:1657 #, 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:1664 +#: builtin/commit.c:1662 #, 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:1698 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13238,212 +13793,220 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "argumento --type no reconocido, %s" -#: builtin/config.c:116 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "solo un tipo a la vez" -#: builtin/config.c:125 +#: builtin/config.c:130 msgid "Config file location" msgstr "Ubicación del archivo configuración" -#: builtin/config.c:126 +#: builtin/config.c:131 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:127 +#: builtin/config.c:132 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:128 +#: builtin/config.c:133 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:129 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "usar un archivo de config por árbol de trabajo" -#: builtin/config.c:130 +#: builtin/config.c:135 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:132 +#: builtin/config.c:137 msgid "Action" msgstr "Acción" -#: builtin/config.c:133 -msgid "get value: name [value-regex]" -msgstr "obtener valor: nombre [valor-regex]" +#: builtin/config.c:138 +msgid "get value: name [value-pattern]" +msgstr "obtener valor: nombre [patrón de valor]" -#: builtin/config.c:134 -msgid "get all values: key [value-regex]" -msgstr "obtener todos los valores: llave [valores-regex]" +#: builtin/config.c:139 +msgid "get all values: key [value-pattern]" +msgstr "obtener todos los valores: clave [patrón de valor]" -#: 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:140 +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "obtener valores para regexp: name-regex [value-pattern]" -#: builtin/config.c:136 +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "obtener valor especifico para el URL: sección[.var] URL" -#: builtin/config.c:137 -msgid "replace all matching variables: name value [value_regex]" +#: builtin/config.c:142 +msgid "replace all matching variables: name value [value-pattern]" msgstr "" -"remplazar todas las variables que concuerden: nombre valor [valor_regex]" +"reemplazar todas las variables coincidentes: nombre valor [valor-patrón]" -#: builtin/config.c:138 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor" -#: builtin/config.c:139 -msgid "remove a variable: name [value-regex]" -msgstr "borrar una variable. nombre [valor-regex]" +#: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "eliminar una variable: nombre [patrón de valor]" -#: builtin/config.c:140 -msgid "remove all matches: name [value-regex]" -msgstr "borrar todas las concurrencias: nombre [valor-regex]" +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" +msgstr "eliminar todas las coincidencias: nombre [patrón de valor]" -#: builtin/config.c:141 +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "renombrar sección: nombre-viejo nombre-nuevo" -#: builtin/config.c:142 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "borrar una sección: nombre" -#: builtin/config.c:143 +#: builtin/config.c:148 msgid "list all" msgstr "listar todo" -#: builtin/config.c:144 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "use la igualdad de cadenas al comparar valores con 'patrón de valor'" + +#: builtin/config.c:150 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:145 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:146 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:147 +#: builtin/config.c:153 msgid "Type" msgstr "Tipo" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "al valor se ha dado este tipo" -#: builtin/config.c:149 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:151 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:152 +#: builtin/config.c:158 +msgid "value is --bool or string" +msgstr "el valor es --bool o cadena" + +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:153 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "valor es una fecha de expiración" -#: builtin/config.c:154 +#: builtin/config.c:161 msgid "Other" msgstr "Otro" -#: builtin/config.c:155 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "terminar valores con un byte NULL" -#: builtin/config.c:156 +#: builtin/config.c:163 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:157 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "respetar directivas include en la búsqueda" -#: builtin/config.c:158 +#: builtin/config.c:165 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:159 +#: builtin/config.c:166 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 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "valor" -#: builtin/config.c:160 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "con --get, usa el valor por defecto cuando falta una entrada" -#: builtin/config.c:174 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "número de argumentos inválidos, deberían ser %d" -#: builtin/config.c:176 +#: builtin/config.c:183 #, 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:324 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "patrón de llave inválido: %s" -#: builtin/config.c:360 +#: builtin/config.c:377 #, 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:417 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "no se analizar color '%s'" -#: builtin/config.c:459 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "no es posible analizar el valor por defecto de color" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "no en un directorio git" -#: builtin/config.c:515 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "escribir en stdin no está soportado" -#: builtin/config.c:518 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "escribir blobs de configuración no está soportado" -#: builtin/config.c:603 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13458,23 +14021,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "solo un archivo de configuración a la vez" -#: builtin/config.c:632 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:635 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "--blob solo puede ser usado dentro de un repositorio" -#: builtin/config.c:655 +#: builtin/config.c:662 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree solo se puede usar dentro de un repositorio de git" + +#: builtin/config.c:684 msgid "$HOME not set" msgstr "$HOME no está configurado" -#: builtin/config.c:679 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13486,52 +14053,56 @@ msgstr "" "\"\n" "en \"git help worktree\" para más detalles" -#: builtin/config.c:714 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "--get-color y tipo de variable incoherente" -#: builtin/config.c:719 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "solo una acción a la vez" -#: builtin/config.c:732 +#: builtin/config.c:761 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:738 +#: builtin/config.c:767 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:744 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "--default solo es aplicable para --get" -#: builtin/config.c:757 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value solo se aplica con 'value-pattern'" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "no se puede leer el archivo de configuración '%s'" -#: builtin/config.c:760 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "error al procesar archivo(s) de configuración" -#: builtin/config.c:770 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "editar stdin no está soportado" -#: builtin/config.c:772 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "editar blobs no está soportado" -#: builtin/config.c:786 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuración %s" -#: builtin/config.c:799 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13540,7 +14111,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:873 builtin/config.c:884 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "no existe la sección: %s" @@ -13553,6 +14124,38 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "mostrar tamaños en formato legible para humano" +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"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" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "mostrar mensajes de debug en stderr" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache no disponible; sin soporte de socket Unix" + +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "" +"no se puede obtener el bloqueo de almacenamiento de credenciales en %d ms" + #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opciones>] [<commit-ish>...]" @@ -13717,41 +14320,49 @@ msgstr "--dirty es incompatible con commit-ismos" msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" -#: builtin/diff.c:91 +#: builtin/diff-tree.c:155 +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "--stdin and --merge-baseson mutuamente exclusivas" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "--merge-base solo funciona con dos commits" + +#: builtin/diff.c:92 #, 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:242 +#: builtin/diff.c:259 #, c-format msgid "invalid option: %s" msgstr "opción inválida: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: se neceista una base de fusión" -#: builtin/diff.c:469 +#: builtin/diff.c:486 msgid "Not a git repository" msgstr "No es un repositorio git" -#: builtin/diff.c:514 +#: builtin/diff.c:532 builtin/grep.c:682 #, c-format msgid "invalid object '%s' given." msgstr "objeto '%s' entregado no es válido." -#: builtin/diff.c:525 +#: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" msgstr "más de dos blobs entregados: '%s'" -#: builtin/diff.c:530 +#: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." msgstr "objeto no manejado '%s' entregado." -#: builtin/diff.c:564 +#: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: múltiples bases de fusión, usando %s" @@ -13780,7 +14391,7 @@ msgstr "no se pudo leer el archivo symlink %s" msgid "could not read object %s for symlink %s" msgstr "no se pudo leer el objeto %s para el symlink %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13788,54 +14399,54 @@ msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "archivo del árbol de trabajo ha sido dejado." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "tal vez desees limpiar o recuperar estos." -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "herramienta" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 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:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13843,31 +14454,31 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "pasado a `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "difftool requiere un árbol de trabajo o --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "--dirty-diff es incompatible con --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool y --extcmd son mutuamente exclusivas" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -13875,24 +14486,24 @@ msgstr "no se ha entregado <comando> para --extcmd=<comando>" 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 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "tipo" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "default para git_env_*(...) es hacer fallback en" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 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 +#: builtin/env--helper.c:67 #, 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 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -13910,96 +14521,127 @@ msgstr "" "Error: No se puede exportar los tags anidados a menos que --mark-tags sea " "especificado." -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "token --anonymize-map no puede estar vacío" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "mostrar progreso después de <n> objetos" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "seleccionar el manejo de tags firmados" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 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:1206 +#: builtin/fast-export.c:1205 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:1209 -msgid "Dump marks to this file" -msgstr "Volcar marcas a este archivo" +#: builtin/fast-export.c:1208 +msgid "dump marks to this file" +msgstr "volcar marcas a este archivo" -#: builtin/fast-export.c:1211 -msgid "Import marks from this file" -msgstr "Importar marcas de este archivo" +#: builtin/fast-export.c:1210 +msgid "import marks from this file" +msgstr "importar marcas de este archivo" -#: builtin/fast-export.c:1215 -msgid "Import marks from this file if it exists" -msgstr "Importar marcas de este archivo si existe" +#: builtin/fast-export.c:1214 +msgid "import marks from this file if it exists" +msgstr "importar marcas de este archivo si existe" -#: builtin/fast-export.c:1217 -msgid "Fake a tagger when tags lack one" -msgstr "Falsificar un tagger cuando les falta uno" +#: builtin/fast-export.c:1216 +msgid "fake a tagger when tags lack one" +msgstr "falsificar un tagger cuando les falta uno" -#: builtin/fast-export.c:1219 -msgid "Output full tree for each commit" -msgstr "Mostrar todo el árbol para cada commit" +#: builtin/fast-export.c:1218 +msgid "output full tree for each commit" +msgstr "mostrar todo el árbol para cada commit" -#: builtin/fast-export.c:1221 -msgid "Use the done feature to terminate the stream" -msgstr "Use el feature done para terminar el stream" +#: builtin/fast-export.c:1220 +msgid "use the done feature to terminate the stream" +msgstr "use el feature done para terminar el stream" -#: builtin/fast-export.c:1222 -msgid "Skip output of blob data" -msgstr "Saltar el output de data blob" +#: builtin/fast-export.c:1221 +msgid "skip output of blob data" +msgstr "saltar el output de data blob" -#: builtin/fast-export.c:1223 builtin/log.c:1724 +#: builtin/fast-export.c:1222 builtin/log.c:1815 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1224 -msgid "Apply refspec to exported refs" -msgstr "Aplicar refspec para los refs exportados" +#: builtin/fast-export.c:1223 +msgid "apply refspec to exported refs" +msgstr "aplicar refspec para los refs exportados" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "de:para" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert <from> to <to> in anonymized output" msgstr "convertir <de> a <para> en output anonimizado" -#: builtin/fast-export.c:1230 -msgid "Reference parents which are not in fast-export stream by object id" +#: builtin/fast-export.c:1229 +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" +"padres de la referencia que no estan en fast-export stream por id de objeto" -#: builtin/fast-export.c:1232 -msgid "Show original object ids of blobs/commits" -msgstr "Mostrar ids de objetos originales para blobs/commits" +#: builtin/fast-export.c:1231 +msgid "show original object ids of blobs/commits" +msgstr "mostrar ids de objetos originales para blobs/commits" -#: builtin/fast-export.c:1234 -msgid "Label tags with mark ids" -msgstr "Marcar tags con ids de mark" +#: builtin/fast-export.c:1233 +msgid "label tags with mark ids" +msgstr "marcar tags con ids de mark" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "--anonymize-map sin --anonymize no tiene sentido" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 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-pack.c:245 +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Faltan marcas from para el submódulo '%s'" + +#: builtin/fast-import.c:3090 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Faltan marcas to para el submódulo '%s'" + +#: builtin/fast-import.c:3225 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Se esperaba comando 'mark', se obtuvo %s" + +#: builtin/fast-import.c:3230 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Se esperaba comando 'to', se obtuvo %s" + +#: builtin/fast-import.c:3322 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" +"Formato esperado de nombre:nombre de archivo para la opción de sobreescribir " +"submódulo" + +#: builtin/fast-import.c:3377 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "característica '%s' prohibida en input sin --allow-unsafe-features" + +#: builtin/fetch-pack.c:242 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Lockfile creado pero no reportado: %s" @@ -14020,90 +14662,98 @@ msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:117 +#: builtin/fetch.c:120 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel no puede ser negativo" -#: builtin/fetch.c:140 builtin/pull.c:185 +#: builtin/fetch.c:143 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:142 builtin/pull.c:245 +#: builtin/fetch.c:145 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "configurar upstream para git pulll/fetch" -#: builtin/fetch.c:144 builtin/pull.c:188 +#: builtin/fetch.c:147 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:146 builtin/pull.c:191 +#: builtin/fetch.c:149 +msgid "use atomic transaction to update references" +msgstr "usar transacción atómica para actualizar referencias" + +#: builtin/fetch.c:151 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:147 +#: builtin/fetch.c:152 msgid "force overwrite of local reference" msgstr "forzar sobrescritura de referencia local" -#: builtin/fetch.c:149 +#: builtin/fetch.c:154 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:151 builtin/pull.c:195 +#: builtin/fetch.c:156 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:153 +#: builtin/fetch.c:158 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:155 +#: builtin/fetch.c:160 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:157 builtin/pull.c:198 +#: builtin/fetch.c:162 builtin/pull.c:198 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:159 +#: builtin/fetch.c:164 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:160 builtin/fetch.c:183 builtin/pull.c:122 +#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:161 +#: builtin/fetch.c:166 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:165 builtin/pull.c:206 +#: builtin/fetch.c:171 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "escribir referencias obtenidas en el archivo FETCH_HEAD" + +#: builtin/fetch.c:172 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:167 +#: builtin/fetch.c:174 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:172 builtin/pull.c:212 +#: builtin/fetch.c:179 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:178 builtin/pull.c:221 +#: builtin/fetch.c:185 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:181 +#: builtin/fetch.c:188 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submódulo" -#: builtin/fetch.c:184 +#: builtin/fetch.c:191 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14111,94 +14761,98 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:188 builtin/pull.c:224 +#: builtin/fetch.c:195 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:189 builtin/pull.c:226 +#: builtin/fetch.c:196 builtin/pull.c:226 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:190 builtin/pull.c:227 +#: builtin/fetch.c:197 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:197 builtin/pull.c:240 +#: builtin/fetch.c:204 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "reporta que solo tenemos objetos alcanzables de este objeto" -#: builtin/fetch.c:200 -msgid "run 'gc --auto' after fetching" -msgstr "ejecutar 'gc --auto' tras el fetch" +#: builtin/fetch.c:207 builtin/fetch.c:209 +msgid "run 'maintenance --auto' after fetching" +msgstr "ejecute 'maintenance --auto' después de buscar" -#: builtin/fetch.c:202 builtin/pull.c:243 +#: builtin/fetch.c:211 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "verificar updates forzados en todos los branch actualizados" -#: builtin/fetch.c:204 +#: builtin/fetch.c:213 msgid "write the commit-graph after fetching" msgstr "escribir commit-graph luego del fetch" -#: builtin/fetch.c:514 +#: builtin/fetch.c:215 +msgid "accept refspecs from stdin" +msgstr "aceptar refspecs de stdin" + +#: builtin/fetch.c:526 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:654 +#: builtin/fetch.c:697 #, 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:752 +#: builtin/fetch.c:796 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:756 +#: builtin/fetch.c:800 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 +#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:770 +#: builtin/fetch.c:814 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:780 +#: builtin/fetch.c:824 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 -#: builtin/fetch.c:852 +#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 +#: builtin/fetch.c:896 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:785 +#: builtin/fetch.c:829 msgid "would clobber existing tag" msgstr "podría golpear tag existente" -#: builtin/fetch.c:807 +#: builtin/fetch.c:851 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:810 +#: builtin/fetch.c:854 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:813 +#: builtin/fetch.c:857 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:852 +#: builtin/fetch.c:896 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:857 +#: builtin/fetch.c:901 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:878 +#: builtin/fetch.c:1005 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" @@ -14209,7 +14863,7 @@ msgstr "" "show-forced-updates'\n" "o ejecute 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:882 +#: builtin/fetch.c:1009 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14222,22 +14876,22 @@ msgstr "" "false'\n" "para evitar esta validación.\n" -#: builtin/fetch.c:914 +#: builtin/fetch.c:1041 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:935 +#: builtin/fetch.c:1069 #, 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:1020 builtin/fetch.c:1158 +#: builtin/fetch.c:1146 builtin/fetch.c:1297 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1168 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14246,56 +14900,56 @@ 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:1128 +#: builtin/fetch.c:1267 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:1129 +#: builtin/fetch.c:1268 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1300 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1162 builtin/remote.c:1112 +#: builtin/fetch.c:1301 builtin/remote.c:1118 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1185 +#: builtin/fetch.c:1324 #, 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:1204 +#: builtin/fetch.c:1343 #, 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:1207 +#: builtin/fetch.c:1346 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1415 +#: builtin/fetch.c:1558 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "múltiples ramas detectadas, incompatible con --set-upstream" -#: builtin/fetch.c:1430 +#: builtin/fetch.c:1573 msgid "not setting upstream for a remote remote-tracking branch" msgstr "no configurar upstream para una rama de rastreo remoto" -#: builtin/fetch.c:1432 +#: builtin/fetch.c:1575 msgid "not setting upstream for a remote tag" msgstr "no configurar upstream para un tag remoto" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1577 msgid "unknown branch type" msgstr "tipo de branch desconocido" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1579 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14303,22 +14957,22 @@ msgstr "" "no se encontró rama fuente.\n" "tienes que especificar exactamente una rama con la opción --set-upstream." -#: builtin/fetch.c:1562 builtin/fetch.c:1625 +#: builtin/fetch.c:1708 builtin/fetch.c:1771 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 +#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1584 +#: builtin/fetch.c:1730 #, 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:1687 +#: builtin/fetch.c:1834 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14326,44 +14980,44 @@ 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:1724 +#: builtin/fetch.c:1870 msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1935 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1937 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1785 +#: builtin/fetch.c:1942 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1944 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1800 +#: builtin/fetch.c:1961 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1802 +#: builtin/fetch.c:1963 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1811 +#: builtin/fetch.c:1972 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1818 +#: builtin/fetch.c:1979 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:1836 +#: builtin/fetch.c:1997 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14371,6 +15025,14 @@ msgstr "" "--filter solo puede ser usado con el remoto configurado en extensions." "partialClone" +#: builtin/fetch.c:2001 +msgid "--atomic can only be used when fetching from one remote" +msgstr "--atomic solo se puede usar cuando se busca desde un control remoto" + +#: builtin/fetch.c:2005 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin solo se puede usar cuando se busca desde un control remoto" + #: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" @@ -14406,8 +15068,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objeto>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -14433,7 +15095,7 @@ 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:440 +#: builtin/for-each-ref.c:39 builtin/tag.c:472 msgid "respect format colors" msgstr "respetar el formato de colores" @@ -14457,32 +15119,48 @@ msgstr "mostrar solo refs que contienen el commit" msgid "print only refs which don't contain the commit" msgstr "mostrar solo refs que no contienen el commit" -#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "git for-each-repo --config=<config> <argumetnos-de-comando>" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "config" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "clave de configuración que almacena una lista de rutas de repositorio" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=<config>" +msgstr "falta --config=<config>" + +#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 msgid "unknown" msgstr "desconocido" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:101 builtin/fsck.c:121 +#: builtin/fsck.c:83 builtin/fsck.c:103 #, 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:115 +#: builtin/fsck.c:97 #, c-format msgid "warning in %s %s: %s" msgstr "peligro en %s %s: %s" -#: builtin/fsck.c:144 builtin/fsck.c:147 +#: builtin/fsck.c:126 builtin/fsck.c:129 #, c-format msgid "broken link from %7s %s" msgstr "link roto de %7s %s" -#: builtin/fsck.c:156 +#: builtin/fsck.c:138 msgid "wrong object type in link" msgstr "tipo de objeto equivocado en link" -#: builtin/fsck.c:172 +#: builtin/fsck.c:154 #, c-format msgid "" "broken link from %7s %s\n" @@ -14491,240 +15169,240 @@ msgstr "" "link roto de %7s %s\n" " a %7s %s" -#: builtin/fsck.c:283 +#: builtin/fsck.c:265 #, c-format msgid "missing %s %s" msgstr "faltan %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:292 #, c-format msgid "unreachable %s %s" msgstr "inalcanzable %s %s" -#: builtin/fsck.c:330 +#: builtin/fsck.c:312 #, c-format msgid "dangling %s %s" msgstr "actualizando %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:322 msgid "could not create lost-found" msgstr "no se pudo crear lost-found" -#: builtin/fsck.c:351 +#: builtin/fsck.c:333 #, c-format msgid "could not finish '%s'" msgstr "no se pudo finalizar '%s'" -#: builtin/fsck.c:368 +#: builtin/fsck.c:350 #, c-format msgid "Checking %s" msgstr "Revisando %s" -#: builtin/fsck.c:406 +#: builtin/fsck.c:388 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Verificando conectividad (%d objetos)" -#: builtin/fsck.c:425 +#: builtin/fsck.c:407 #, c-format msgid "Checking %s %s" msgstr "Revisando %s %s" -#: builtin/fsck.c:430 +#: builtin/fsck.c:412 msgid "broken links" msgstr "links rotos" -#: builtin/fsck.c:439 +#: builtin/fsck.c:421 #, c-format msgid "root %s" msgstr "raíz %s" -#: builtin/fsck.c:447 +#: builtin/fsck.c:429 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "tag %s %s (%s) en %s" -#: builtin/fsck.c:476 +#: builtin/fsck.c:458 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecto corrupto o faltante" -#: builtin/fsck.c:501 +#: builtin/fsck.c:483 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: referencia inválida %s" -#: builtin/fsck.c:515 +#: builtin/fsck.c:497 #, c-format msgid "Checking reflog %s->%s" msgstr "Revisando reflog %s->%s" -#: builtin/fsck.c:549 +#: builtin/fsck.c:531 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntero sha1 inválido %s" -#: builtin/fsck.c:556 +#: builtin/fsck.c:538 #, c-format msgid "%s: not a commit" msgstr "%s: no es un commit" -#: builtin/fsck.c:610 +#: builtin/fsck.c:592 msgid "notice: No default references" msgstr "aviso: No hay referencias por defecto" -#: builtin/fsck.c:625 +#: builtin/fsck.c:607 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objeto corrupto o no encontrado: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:620 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no se puede analizar objeto: %s" -#: builtin/fsck.c:658 +#: builtin/fsck.c:640 #, c-format msgid "bad sha1 file: %s" msgstr "mal sha1 de archivo: %s" -#: builtin/fsck.c:673 +#: builtin/fsck.c:655 msgid "Checking object directory" msgstr "Revisando directorio de objetos" -#: builtin/fsck.c:676 +#: builtin/fsck.c:658 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:691 +#: builtin/fsck.c:673 #, c-format msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:696 builtin/index-pack.c:843 +#: builtin/fsck.c:678 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "%s inválido" -#: builtin/fsck.c:703 +#: builtin/fsck.c:685 #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a algo extraño (%s)" -#: builtin/fsck.c:709 +#: builtin/fsck.c:691 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD desacoplado apunta a nada" -#: builtin/fsck.c:713 +#: builtin/fsck.c:695 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "aviso: %s apunta a un branch no nacido (%s)" -#: builtin/fsck.c:725 +#: builtin/fsck.c:707 msgid "Checking cache tree" msgstr "Revisando el cache tree" -#: builtin/fsck.c:730 +#: builtin/fsck.c:712 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntero inválido sha1 en cache-tree" -#: builtin/fsck.c:739 +#: builtin/fsck.c:721 msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" -#: builtin/fsck.c:770 +#: builtin/fsck.c:752 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:776 +#: builtin/fsck.c:758 msgid "show unreachable objects" msgstr "mostrar objetos ilegibles" -#: builtin/fsck.c:777 +#: builtin/fsck.c:759 msgid "show dangling objects" msgstr "mostrar objetos colgados" -#: builtin/fsck.c:778 +#: builtin/fsck.c:760 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:779 +#: builtin/fsck.c:761 msgid "report root nodes" msgstr "reportar nodos raíz" -#: builtin/fsck.c:780 +#: builtin/fsck.c:762 msgid "make index objects head nodes" msgstr "hacer objetos índices cabezas de nodos" -#: builtin/fsck.c:781 +#: builtin/fsck.c:763 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:782 +#: builtin/fsck.c:764 msgid "also consider packs and alternate objects" msgstr "también considerar paquetes y objetos alternos" -#: builtin/fsck.c:783 +#: builtin/fsck.c:765 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:784 +#: builtin/fsck.c:766 builtin/mktag.c:78 msgid "enable more strict checking" msgstr "habilitar revisión más estricta" -#: builtin/fsck.c:786 +#: builtin/fsck.c:768 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgados en .git/lost-found" -#: builtin/fsck.c:787 builtin/prune.c:134 +#: builtin/fsck.c:769 builtin/prune.c:134 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:788 +#: builtin/fsck.c:770 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:847 builtin/index-pack.c:225 +#: builtin/fsck.c:829 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/fsck.c:875 +#: builtin/fsck.c:857 #, c-format msgid "%s: object missing" msgstr "%s: objeto faltante" -#: builtin/fsck.c:886 +#: builtin/fsck.c:868 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'" -#: builtin/gc.c:35 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<opciones>]" -#: builtin/gc.c:90 +#: builtin/gc.c:93 #, c-format msgid "Failed to fstat %s: %s" msgstr "Falló el fstat %s: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:129 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "falló al analizar '%s' valor '%s'" -#: builtin/gc.c:475 builtin/init-db.c:57 +#: builtin/gc.c:487 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "no se pudo definir '%s'" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:503 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14739,54 +15417,54 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:551 msgid "prune unreferenced objects" msgstr "limpiar objetos no referenciados" -#: builtin/gc.c:541 +#: builtin/gc.c:553 msgid "be more thorough (increased runtime)" msgstr "ser más exhaustivo (aumentar runtime)" -#: builtin/gc.c:542 +#: builtin/gc.c:554 msgid "enable auto-gc mode" msgstr "habilitar modo auto-gc" -#: builtin/gc.c:545 +#: builtin/gc.c:557 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:548 +#: builtin/gc.c:560 msgid "repack all other packs except the largest pack" msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande" -#: builtin/gc.c:565 +#: builtin/gc.c:576 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "falló al analizar valor %s de gc.logexpirity" -#: builtin/gc.c:576 +#: builtin/gc.c:587 #, c-format msgid "failed to parse prune expiry value %s" msgstr "falló al analizar valor %s de prune expiry" -#: builtin/gc.c:596 +#: builtin/gc.c:607 #, 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:598 +#: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Auto empaquetado del repositorio para performance óptimo.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vea \"git help gc\" para limpieza manual.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14794,23 +15472,187 @@ msgstr "" "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " "es así)" -#: builtin/gc.c:694 +#: builtin/gc.c:705 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/gc.c:715 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" + +#: builtin/gc.c:745 +msgid "--no-schedule is not allowed" +msgstr "--no-schedule no está permitido" + +#: builtin/gc.c:750 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "argumento --schedule no reconocido, '%s'" + +#: builtin/gc.c:869 +msgid "failed to write commit-graph" +msgstr "no se pudo escribir el commit-graph" + +#: builtin/gc.c:914 +msgid "failed to fill remotes" +msgstr "falló al borrar remotos" + +#: builtin/gc.c:1037 +msgid "failed to start 'git pack-objects' process" +msgstr "no pudo iniciar el proceso 'git pack-objects'" + +#: builtin/gc.c:1054 +msgid "failed to finish 'git pack-objects' process" +msgstr "no pudo finalizar el proceso 'git pack-objects'" + +#: builtin/gc.c:1106 +msgid "failed to write multi-pack-index" +msgstr "no se pudo escribir el índice de paquetes múltiples" + +#: builtin/gc.c:1124 +msgid "'git multi-pack-index expire' failed" +msgstr "'git multi-pack-index expire' falló" + +#: builtin/gc.c:1185 +msgid "'git multi-pack-index repack' failed" +msgstr "'git multi-pack-index repack' falló" + +#: builtin/gc.c:1194 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" +"omitiendo la tarea de reempaquetado incremental porque core.multiPackIndex " +"está deshabilitado" + +#: builtin/gc.c:1298 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento" + +#: builtin/gc.c:1328 +#, c-format +msgid "task '%s' failed" +msgstr "tarea '%s' falló" + +#: builtin/gc.c:1410 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' no es una tarea válida" + +#: builtin/gc.c:1415 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "tarea '%s' no puede ser seleccionada múltipes veces" + +#: builtin/gc.c:1430 +msgid "run tasks based on the state of the repository" +msgstr "ejecutar tareas basadas en el estado del repositorio" + +#: builtin/gc.c:1431 +msgid "frequency" +msgstr "frecuencia" + +#: builtin/gc.c:1432 +msgid "run tasks based on frequency" +msgstr "ejecutar tareas basado en frecuencia" + +#: builtin/gc.c:1435 +msgid "do not report progress or other information over stderr" +msgstr "no reportar progreso u otra información por medio de stderr" + +#: builtin/gc.c:1436 +msgid "task" +msgstr "tarea" + +#: builtin/gc.c:1437 +msgid "run a specific task" +msgstr "ruta a tarea específica" + +#: builtin/gc.c:1454 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "usar como máximo una entre --auto y --schedule=<frecuencia>" + +#: builtin/gc.c:1497 +msgid "failed to run 'git config'" +msgstr "no pudo ejecutar 'git config'" + +#: builtin/gc.c:1562 +#, c-format +msgid "failed to expand path '%s'" +msgstr "falló al expandir la ruta '%s'" + +#: builtin/gc.c:1591 +msgid "failed to start launchctl" +msgstr "Falló al iniciar launchctl." + +#: builtin/gc.c:1628 +#, c-format +msgid "failed to create directories for '%s'" +msgstr "falló al crear directorios para '%s'" + +#: builtin/gc.c:1689 +#, c-format +msgid "failed to bootstrap service %s" +msgstr "falló al generar el servicio %s" + +#: builtin/gc.c:1760 +msgid "failed to create temp xml file" +msgstr "no se pudo crear el archivo temp xml" + +#: builtin/gc.c:1850 +msgid "failed to start schtasks" +msgstr "no pudo iniciar schtasks" + +#: builtin/gc.c:1894 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" +"no pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'" + +#: builtin/gc.c:1911 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" +"no pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'" + +#: builtin/gc.c:1915 +msgid "failed to open stdin of 'crontab'" +msgstr "no pudo abrir stdin de 'crontab'" + +#: builtin/gc.c:1956 +msgid "'crontab' died" +msgstr "'crontab' murió" + +#: builtin/gc.c:1990 +msgid "another process is scheduling background maintenance" +msgstr "otro proceso está programando el mantenimiento en segundo plano" + +#: builtin/gc.c:2009 +msgid "failed to add repo to global config" +msgstr "no se pudo agregar el repositorio a la configuración global" + +#: builtin/gc.c:2019 +msgid "git maintenance <subcommand> [<options>]" +msgstr "git maintenance <subcomando> [<opciones>]" + +#: builtin/gc.c:2038 +#, c-format +msgid "invalid subcommand: %s" +msgstr "subcomando no válido: %s" + #: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: falló al crear el hilo: %s" -#: builtin/grep.c:279 +#: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "número inválido de hilos especificado (%d) para %s" @@ -14819,262 +15661,262 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2904 +#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 +#: builtin/pack-objects.c:2944 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:655 +#: builtin/grep.c:656 #, 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:724 +#: builtin/grep.c:737 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:823 +#: builtin/grep.c:836 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:825 +#: builtin/grep.c:838 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:827 +#: builtin/grep.c:840 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:829 +#: builtin/grep.c:842 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:831 +#: builtin/grep.c:844 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:834 +#: builtin/grep.c:847 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:836 +#: builtin/grep.c:849 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:838 +#: builtin/grep.c:851 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:840 +#: builtin/grep.c:853 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:842 +#: builtin/grep.c:855 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:845 +#: builtin/grep.c:858 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:847 +#: builtin/grep.c:860 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:849 +#: builtin/grep.c:862 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:853 +#: builtin/grep.c:866 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:856 +#: builtin/grep.c:869 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:859 +#: builtin/grep.c:872 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:862 +#: builtin/grep.c:875 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:865 +#: builtin/grep.c:878 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:866 +#: builtin/grep.c:879 msgid "show column number of first match" msgstr "mostrar el número de columna de la primer coincidencia" -#: builtin/grep.c:867 +#: builtin/grep.c:880 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:868 +#: builtin/grep.c:881 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:870 +#: builtin/grep.c:883 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:872 +#: builtin/grep.c:885 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:874 +#: builtin/grep.c:887 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:877 +#: builtin/grep.c:890 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:879 +#: builtin/grep.c:892 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:882 +#: builtin/grep.c:895 msgid "show only matching parts of a line" msgstr "mostrar solo partes que concuerdan de una línea" -#: builtin/grep.c:884 +#: builtin/grep.c:897 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:885 +#: builtin/grep.c:898 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:887 +#: builtin/grep.c:900 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:889 +#: builtin/grep.c:902 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:892 +#: builtin/grep.c:905 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:895 +#: builtin/grep.c:908 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:897 +#: builtin/grep.c:910 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:899 +#: builtin/grep.c:912 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:900 +#: builtin/grep.c:913 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:903 +#: builtin/grep.c:916 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:905 +#: builtin/grep.c:918 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:908 +#: builtin/grep.c:921 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:910 +#: builtin/grep.c:923 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:912 +#: builtin/grep.c:925 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:924 +#: builtin/grep.c:937 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:926 +#: builtin/grep.c:939 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:928 -msgid "show parse tree for grep expression" -msgstr "mostrar árbol analizado para la expresión grep" - -#: builtin/grep.c:932 +#: builtin/grep.c:942 msgid "pager" msgstr "paginador" -#: builtin/grep.c:932 +#: builtin/grep.c:942 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:936 +#: builtin/grep.c:946 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:1003 +#: builtin/grep.c:1012 msgid "no pattern given" msgstr "no se ha entregado patrón" -#: builtin/grep.c:1039 +#: builtin/grep.c:1048 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1047 +#: builtin/grep.c:1056 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1077 +#: builtin/grep.c:1086 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked no es soportada con --recurse-submodules" -#: builtin/grep.c:1081 +#: builtin/grep.c:1090 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1084 builtin/pack-objects.c:3623 +#: builtin/grep.c:1093 builtin/pack-objects.c:3672 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 +#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1121 +#: builtin/grep.c:1130 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:1147 +#: builtin/grep.c:1156 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1153 +#: builtin/grep.c:1159 +msgid "--untracked cannot be used with --cached" +msgstr "--untracked no se puede usar con --cached" + +#: builtin/grep.c:1165 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1161 +#: builtin/grep.c:1173 msgid "both --cached and trees are given" msgstr "--cached y árboles han sido entregados" @@ -15207,12 +16049,12 @@ msgstr "ningún visualizador de manual proceso la petición" msgid "no info viewer handled the request" msgstr "ningún visor de info manejo la petición" -#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#: builtin/help.c:520 builtin/help.c:531 git.c:340 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' tiene el alias '%s'" -#: builtin/help.c:534 git.c:367 +#: builtin/help.c:534 git.c:372 #, c-format msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" @@ -15226,353 +16068,357 @@ msgstr "uso: %s%s" msgid "'git help config' for more information" msgstr "'git help config' para más información" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "el tipo del objeto no concuerda en %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "no se recibió el objeto esperado %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, encontrado %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, 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:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "EOF temprano" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "leer error en input" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:618 +#: builtin/index-pack.c:324 builtin/pack-objects.c:624 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:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" -#: builtin/index-pack.c:306 builtin/repack.c:250 +#: builtin/index-pack.c:342 #, c-format msgid "unable to create '%s'" msgstr "no se puede crear '%s'" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "no se puede abrir el archivo de paquete '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "firma del paquete no concuerda" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versión de paquete %<PRIu32> no soportada" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, 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:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "inflate devolvió %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "valor de offset desbordado para el objeto base delta" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "offset de base delta está fuera de límites" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "tipo de objeto %d desconocido" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "no se puede propagar el paquete" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, 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:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: 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 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:824 #, 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:810 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:870 #, 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:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1215 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:1198 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1288 #, 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:1267 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1304 #, 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:1295 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1405 +#: builtin/index-pack.c:1445 #, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" +msgid "packfile name '%s' does not end with '.%s'" +msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1462 +#: builtin/index-pack.c:1503 msgid "error while closing pack file" msgstr "error mientras se cierra el archivo paquete" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1517 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1525 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 +#: builtin/index-pack.c:1534 +msgid "cannot store reverse index file" +msgstr "no se puede almacenar el archivo de índice inverso" + +#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1650 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1652 #, 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:1642 +#: builtin/index-pack.c:1700 #, 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:1649 +#: builtin/index-pack.c:1707 #, 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:1689 +#: builtin/index-pack.c:1765 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 +#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algoritmo hash desconocido '%s'" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1867 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1784 +#: builtin/index-pack.c:1869 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1786 +#: builtin/index-pack.c:1871 msgid "--object-format cannot be used with --stdin" msgstr "--object-format no se puede usar con --stdin" -#: builtin/index-pack.c:1792 +#: builtin/index-pack.c:1886 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" -#: builtin/init-db.c:63 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "no se pudo definir template '%s'" -#: builtin/init-db.c:68 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "no se puede abrir directorio '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "no se puede leer link '%s'" -#: builtin/init-db.c:82 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "no se puede crear symlink '%s' '%s'" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "no se puede copiar '%s' a '%s'" -#: builtin/init-db.c:92 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ignorando template %s" -#: builtin/init-db.c:123 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "template no encontrado en %s" -#: builtin/init-db.c:138 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "no se copian templates de '%s': %s" -#: builtin/init-db.c:276 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "nombre de rama inicial inválido: '%s'" -#: builtin/init-db.c:368 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "no es posible manejar el tipo de archivo %d" -#: builtin/init-db.c:371 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "no se puede mover %s a %s" @@ -15586,32 +16432,32 @@ msgstr "intentar reinicializar el repositorio con un hash diferente" msgid "%s already exists" msgstr "%s ya existe" -#: builtin/init-db.c:444 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: ignorando --initial-branch=%s" -#: builtin/init-db.c:475 +#: builtin/init-db.c:476 #, 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:476 +#: builtin/init-db.c:477 #, 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:480 +#: builtin/init-db.c:481 #, 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:481 +#: builtin/init-db.c:482 #, 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:530 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15619,38 +16465,42 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--" "shared[=<permisos>]] [<directorio>]" -#: builtin/init-db.c:556 +#: builtin/init-db.c:557 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:557 +#: builtin/init-db.c:558 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:563 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "sobrescribir el nombre de la rama inicial" -#: builtin/init-db.c:564 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:565 builtin/show-index.c:22 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "especificar el algoritmo hash a usar" -#: builtin/init-db.c:598 builtin/init-db.c:603 +#: builtin/init-db.c:573 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir y --bare son mutuamente excluyentes" + +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "no se pude crear directorio %s" -#: builtin/init-db.c:607 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "no se puede aplicar chdir a %s" -#: builtin/init-db.c:634 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -15659,11 +16509,15 @@ msgstr "" "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" "dir=<directorio>)" -#: builtin/init-db.c:662 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "No se puede acceder al árbol de trabajo '%s'" +#: builtin/init-db.c:695 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir incompatible con el repositorio desnudo" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -15728,126 +16582,130 @@ msgstr "--trailer con --only-input no tiene sentido" msgid "no input file given for in-place editing" msgstr "no se entregó archivo de entrada para edición en lugar" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" -#: builtin/log.c:58 +#: builtin/log.c:60 msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:111 +#: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:179 -msgid "Use mail map file" -msgstr "Usar archivo de mapa de mail" +#: builtin/log.c:181 +msgid "use mail map file" +msgstr "usar archivo de mapa de mail" -#: builtin/log.c:182 +#: builtin/log.c:184 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrón>" -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patrón>" -#: builtin/log.c:185 +#: builtin/log.c:187 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:188 -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:190 +msgid "" +"trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" +"rastrear la evolución del rango de línea <inicio>, <fin> o función: <nombre-" +"funcion> en <archivo>" + +#: builtin/log.c:213 +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "-L<rango>:<archivo> no se puede usar con pathspec" -#: builtin/log.c:298 +#: builtin/log.c:303 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:556 +#: builtin/log.c:566 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:571 builtin/log.c:666 +#: builtin/log.c:581 builtin/log.c:671 #, c-format msgid "could not read object %s" msgstr "no se pudo leer objeto %s" -#: builtin/log.c:691 +#: builtin/log.c:696 #, c-format msgid "unknown type: %d" msgstr "tipo desconocido: %d" -#: builtin/log.c:835 +#: builtin/log.c:841 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: modo cover from description inválido" -#: builtin/log.c:842 +#: builtin/log.c:848 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:957 -msgid "name of output directory is too long" -msgstr "nombre del directorio de salida es muy largo" - -#: builtin/log.c:973 +#: builtin/log.c:977 #, c-format msgid "cannot open patch file %s" msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:990 +#: builtin/log.c:994 msgid "need exactly one range" msgstr "necesita exactamente un rango" -#: builtin/log.c:1000 +#: builtin/log.c:1004 msgid "not a range" msgstr "no es un rango" -#: builtin/log.c:1164 +#: builtin/log.c:1168 msgid "cover letter needs email format" msgstr "letras de portada necesita formato email" -#: builtin/log.c:1170 +#: builtin/log.c:1174 msgid "failed to create cover-letter file" msgstr "falló al crear los archivos cover-letter" -#: builtin/log.c:1249 +#: builtin/log.c:1261 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1276 +#: builtin/log.c:1288 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1334 +#: builtin/log.c:1346 msgid "two output directories?" msgstr "¿dos directorios de salida?" -#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 +#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 #, c-format msgid "unknown commit %s" msgstr "commit desconocido %s" -#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1508 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 ref válida" -#: builtin/log.c:1460 +#: builtin/log.c:1517 msgid "could not find exact merge base" msgstr "no se pudo encontrar una base de fusión exacta" -#: builtin/log.c:1464 +#: builtin/log.c:1527 msgid "" "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" @@ -15859,281 +16717,290 @@ msgstr "" "O puedes especificar un commit base mediante --base=<id-commit-base> " "manualmente" -#: builtin/log.c:1484 +#: builtin/log.c:1550 msgid "failed to find exact merge base" msgstr "falló al encontrar una base de fusión exacta" -#: builtin/log.c:1495 +#: builtin/log.c:1567 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:1499 +#: builtin/log.c:1577 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:1552 +#: builtin/log.c:1635 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1604 -msgid "failed to infer range-diff ranges" -msgstr "falló al inferir rangos range-diff" +#: builtin/log.c:1692 +msgid "failed to infer range-diff origin of current series" +msgstr "falló al inferir rangos range-diff de la serie actual" + +#: builtin/log.c:1694 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "usando '%s' como origen de diferencia de rango de la serie actual" -#: builtin/log.c:1650 +#: builtin/log.c:1738 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1653 +#: builtin/log.c:1741 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1657 +#: builtin/log.c:1745 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1659 +#: builtin/log.c:1747 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1661 +#: builtin/log.c:1749 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:1662 +#: builtin/log.c:1750 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1663 +#: builtin/log.c:1751 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1665 +#: builtin/log.c:1753 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1667 +#: builtin/log.c:1755 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1669 -msgid "Use [RFC PATCH] instead of [PATCH]" -msgstr "Use [RFC PATCH] en lugar de [PATCH]" +#: builtin/log.c:1757 +msgid "max length of output filename" +msgstr "tamaño máximo de nombre de archivo resultante" -#: builtin/log.c:1672 +#: builtin/log.c:1759 +msgid "use [RFC PATCH] instead of [PATCH]" +msgstr "use [RFC PATCH] en lugar de [PATCH]" + +#: builtin/log.c:1762 msgid "cover-from-description-mode" msgstr "modo-cover-from-description" -#: builtin/log.c:1673 +#: builtin/log.c:1763 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:1675 -msgid "Use [<prefix>] instead of [PATCH]" -msgstr "Use [<prefijo>] en lugar de [PATCH]" +#: builtin/log.c:1765 +msgid "use [<prefix>] instead of [PATCH]" +msgstr "use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1678 +#: builtin/log.c:1768 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1681 +#: builtin/log.c:1771 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1684 +#: builtin/log.c:1774 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1686 +#: builtin/log.c:1776 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1688 +#: builtin/log.c:1778 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:1690 +#: builtin/log.c:1780 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1692 +#: builtin/log.c:1782 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1693 +#: builtin/log.c:1783 msgid "header" msgstr "cabezal" -#: builtin/log.c:1694 +#: builtin/log.c:1784 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1695 builtin/log.c:1696 +#: builtin/log.c:1785 builtin/log.c:1786 msgid "email" msgstr "email" -#: builtin/log.c:1695 +#: builtin/log.c:1785 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1696 +#: builtin/log.c:1786 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1697 +#: builtin/log.c:1787 msgid "ident" msgstr "ident" -#: builtin/log.c:1698 +#: builtin/log.c:1788 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:1700 +#: builtin/log.c:1790 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1701 +#: builtin/log.c:1791 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1702 builtin/log.c:1705 +#: builtin/log.c:1792 builtin/log.c:1795 msgid "boundary" msgstr "límite" -#: builtin/log.c:1703 +#: builtin/log.c:1793 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1706 +#: builtin/log.c:1796 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1710 +#: builtin/log.c:1800 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1712 +#: builtin/log.c:1802 msgid "signature" msgstr "firma" -#: builtin/log.c:1713 +#: builtin/log.c:1803 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1714 +#: builtin/log.c:1804 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1715 +#: builtin/log.c:1805 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:1717 +#: builtin/log.c:1808 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1718 +#: builtin/log.c:1809 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1720 +#: builtin/log.c:1811 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1722 +#: builtin/log.c:1813 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:1725 +#: builtin/log.c:1816 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:1727 +#: builtin/log.c:1818 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creación es pesada" -#: builtin/log.c:1812 +#: builtin/log.c:1904 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1827 +#: builtin/log.c:1919 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1829 +#: builtin/log.c:1921 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1837 +#: builtin/log.c:1929 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1839 +#: builtin/log.c:1931 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1841 +#: builtin/log.c:1933 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1874 -msgid "standard output, or directory, which one?" -msgstr "¿salida standard, o directorio, cual?" +#: builtin/log.c:1955 +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "--stdout, --output, and --output-directory son mutuamente exclusivas" -#: builtin/log.c:1978 +#: builtin/log.c:2078 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche único" -#: builtin/log.c:1982 +#: builtin/log.c:2082 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1983 +#: builtin/log.c:2083 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:1989 +#: builtin/log.c:2089 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:1993 +#: builtin/log.c:2093 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche único" -#: builtin/log.c:2001 +#: builtin/log.c:2101 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2002 +#: builtin/log.c:2102 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:2013 +#: builtin/log.c:2113 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:2049 +#: builtin/log.c:2149 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:2093 +#: builtin/log.c:2193 msgid "failed to create output files" msgstr "falló al crear los archivos de salida" -#: builtin/log.c:2152 +#: builtin/log.c:2252 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:2206 +#: builtin/log.c:2306 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16141,114 +17008,118 @@ msgstr "" "No se pudo encontrar una rama remota rastreada, por favor especifique " "<upstream> manualmente.\n" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:486 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:542 msgid "identify the file status with tags" msgstr "identifique el estado del archivo con tags" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:544 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:546 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:548 msgid "show cached files in the output (default)" msgstr "mostrar archivos en caché en la salida (default)" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:550 msgid "show deleted files in the output" msgstr "mostrar archivos borrados en la salida" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:552 msgid "show modified files in the output" msgstr "mostrar archivos modificados en la salida" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:554 msgid "show other files in the output" msgstr "mostrar otros archivos en la salida" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:556 msgid "show ignored files in the output" msgstr "mostrar archivos ignorados en la salida" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:559 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:546 +#: builtin/ls-files.c:561 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:548 +#: builtin/ls-files.c:563 msgid "show 'other' directories' names only" msgstr "mostrar solo nombres de 'directorios otros'" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:565 msgid "show line endings of files" msgstr "mostrar finales de línea de archivos" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:567 msgid "don't show empty directories" msgstr "no mostrar directorios vacíos" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:570 msgid "show unmerged files in the output" msgstr "mostrar archivos no fusionados en la salida" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:572 msgid "show resolve-undo information" msgstr "mostrar información resolver-deshacer" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:574 msgid "skip files matching pattern" msgstr "saltar archivos que concuerden con el patrón" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:577 msgid "exclude patterns are read from <file>" msgstr "excluir patrones leídos de <archivo>" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:580 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:567 +#: builtin/ls-files.c:582 msgid "add the standard git exclusions" msgstr "agregar las exclusiones standard de git" -#: builtin/ls-files.c:571 +#: builtin/ls-files.c:586 msgid "make the output relative to the project top directory" msgstr "hacer la salida relativa al directorio principal del proyecto" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:589 msgid "recurse through submodules" msgstr "recurrir a través de submódulos" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:591 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:577 +#: builtin/ls-files.c:592 msgid "tree-ish" msgstr "árbol-ismo" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:593 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:580 +#: builtin/ls-files.c:595 msgid "show debugging data" msgstr "mostrar data de debug" +#: builtin/ls-files.c:597 +msgid "suppress duplicate entries" +msgstr "suprimir entradas duplicadas" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -16259,39 +17130,39 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repositorio> [<refs>...]]" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:60 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:1384 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 msgid "exec" msgstr "ejecutar" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 +#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 msgid "path of git-upload-pack on the remote host" msgstr "ruta de git-upload-pack en el host remoto" -#: builtin/ls-remote.c:65 +#: builtin/ls-remote.c:66 msgid "limit to tags" msgstr "limitar a tags" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "limit to heads" msgstr "limitar a heads" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:68 msgid "do not show peeled tags" msgstr "no mostrar tags pelados" -#: builtin/ls-remote.c:69 +#: builtin/ls-remote.c:70 msgid "take url.<base>.insteadOf into account" msgstr "tomar url.<base>.insteadOf en cuenta" -#: builtin/ls-remote.c:72 +#: builtin/ls-remote.c:73 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:75 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostrar ref subyacente en adición al objeto apuntado por él" @@ -16448,193 +17319,193 @@ msgstr "no se pudo resolver ref '%s'" msgid "Merging %s with %s\n" msgstr "Fusionando %s con %s\n" -#: builtin/merge.c:56 +#: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:57 +#: builtin/merge.c:59 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:60 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:121 +#: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:144 +#: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" msgstr "opción `%s' requiere un valor" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:191 +#: builtin/merge.c:200 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:196 +#: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:247 builtin/pull.c:133 +#: builtin/merge.c:256 builtin/pull.c:133 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:250 builtin/pull.c:136 +#: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:251 builtin/pull.c:139 +#: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:253 builtin/pull.c:142 +#: builtin/merge.c:262 builtin/pull.c:142 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:256 builtin/pull.c:148 +#: builtin/merge.c:265 builtin/pull.c:148 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:258 builtin/pull.c:151 +#: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:260 builtin/pull.c:154 +#: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:262 +#: builtin/merge.c:271 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:264 builtin/pull.c:161 +#: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:268 builtin/pull.c:164 +#: builtin/merge.c:277 builtin/pull.c:164 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:269 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:270 builtin/pull.c:169 +#: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:271 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:272 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:274 +#: builtin/merge.c:283 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:281 +#: builtin/merge.c:290 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:283 +#: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" msgstr "--abort pero deja el índice y el árbol de trabajo solos" -#: builtin/merge.c:285 +#: builtin/merge.c:294 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:287 builtin/pull.c:180 +#: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:294 +#: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" -#: builtin/merge.c:311 +#: builtin/merge.c:320 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:316 +#: builtin/merge.c:325 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:321 +#: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:390 +#: builtin/merge.c:399 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:401 +#: builtin/merge.c:410 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:460 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:511 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:589 +#: builtin/merge.c:598 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:716 +#: builtin/merge.c:724 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:730 +#: builtin/merge.c:737 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:745 +#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:797 +#: builtin/merge.c:808 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:806 +#: builtin/merge.c:817 #, 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:812 +#: builtin/merge.c:823 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" @@ -16646,11 +17517,11 @@ msgstr "" "tópico.\n" "\n" -#: builtin/merge.c:817 +#: builtin/merge.c:828 msgid "An empty message aborts the commit.\n" msgstr "Un mensaje vacío aborta el commit.\n" -#: builtin/merge.c:820 +#: builtin/merge.c:831 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -16659,74 +17530,74 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" " el commit.\n" -#: builtin/merge.c:873 +#: builtin/merge.c:884 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:888 +#: builtin/merge.c:899 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:949 +#: builtin/merge.c:960 #, 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:988 +#: builtin/merge.c:999 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:990 +#: builtin/merge.c:1001 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:992 +#: builtin/merge.c:1003 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:997 +#: builtin/merge.c:1008 #, 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:1054 +#: builtin/merge.c:1065 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1157 +#: builtin/merge.c:1168 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1191 +#: builtin/merge.c:1202 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1295 +#: builtin/merge.c:1312 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1299 +#: builtin/merge.c:1316 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1317 +#: builtin/merge.c:1334 msgid "--quit expects no arguments" msgstr "--quit no espera argumentos" -#: builtin/merge.c:1330 +#: builtin/merge.c:1347 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1334 +#: builtin/merge.c:1351 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1350 +#: builtin/merge.c:1367 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16734,7 +17605,7 @@ msgstr "" "No has concluido la fusión (existe MERGE_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1357 +#: builtin/merge.c:1374 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16742,102 +17613,143 @@ msgstr "" "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:1360 +#: builtin/merge.c:1377 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1374 +#: builtin/merge.c:1391 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1376 +#: builtin/merge.c:1393 msgid "You cannot combine --squash with --commit." msgstr "No se puede combinar --squash con --commit." -#: builtin/merge.c:1392 +#: builtin/merge.c:1409 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1409 +#: builtin/merge.c:1426 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:1411 +#: builtin/merge.c:1428 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:1416 +#: builtin/merge.c:1433 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1418 +#: builtin/merge.c:1435 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:1499 +#: builtin/merge.c:1516 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1508 +#: builtin/merge.c:1525 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1518 +#: builtin/merge.c:1535 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1581 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1571 +#: builtin/merge.c:1588 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1613 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1602 +#: builtin/merge.c:1619 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1630 builtin/merge.c:1695 +#: builtin/merge.c:1647 builtin/merge.c:1712 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1634 +#: builtin/merge.c:1651 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1686 +#: builtin/merge.c:1703 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1688 +#: builtin/merge.c:1705 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1697 +#: builtin/merge.c:1714 #, 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:1711 +#: builtin/merge.c:1728 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Fusión automática fue bien; detenida antes del commit como se solicitó\n" +#: builtin/mktag.c:10 +msgid "git mktag" +msgstr "git mktag" + +#: builtin/mktag.c:30 +#, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "peligro: información de tag no pasa fsck: %s" + +#: builtin/mktag.c:41 +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "error: valor de tag no pasa fsck: %s" + +#: builtin/mktag.c:44 +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "%d (FSCK_IGNORE?) nunca debería activar esta devolución de llamada" + +#: builtin/mktag.c:59 +#, c-format +msgid "could not read tagged object '%s'" +msgstr "no se pudo leer objeto de tag '%s'" + +#: builtin/mktag.c:62 +#, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "objeto '%s' es taggeado como '%s', pero es un tipo '%s'" + +#: builtin/mktag.c:99 +msgid "tag on stdin did not pass our strict fsck check" +msgstr "etiqueta en stdin no pasó nuestro estricto control fsck" + +#: builtin/mktag.c:102 +msgid "tag on stdin did not refer to a valid object" +msgstr "tag en stdin no se refería a un objeto válido" + +#: builtin/mktag.c:105 builtin/tag.c:232 +msgid "unable to write tag file" +msgstr "incapaz de escribir el archivo de tag" + #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -16874,7 +17786,10 @@ 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:25 +#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575 msgid "too many arguments" msgstr "muchos argumentos" @@ -16915,68 +17830,72 @@ msgstr "forzar mover/renombrar incluso si el objetivo existe" msgid "skip move/rename errors" msgstr "saltar errores de mover/renombrar" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "destino '%s' no es un directorio" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Revisando cambio de nombre de '%s' a '%s'\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "mala fuente" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "no se pude mover un directorio en sí mismo" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "no se puede mover un directorio dentro de un archivo" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "directorio de fuente está vacío" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "no se encuentra bajo control de versión" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "en conflicto" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "destino existe" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "sobrescribiendo '%s'" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "No se puede sobrescribir" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "múltiples fuentes para el mismo objetivo" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "el directorio de destino no existe" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, fuente=%s, destino=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' falló" @@ -16994,8 +17913,8 @@ msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" #: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" -msgstr "imprimir sólo nombres (sin SHA-1)" +msgid "print only ref-based names (no object names)" +msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)" #: builtin/name-rev.c:525 msgid "only use tags to name the commits" @@ -17170,7 +18089,7 @@ 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:533 +#: builtin/notes.c:242 builtin/tag.c:565 #, c-format msgid "could not open or read '%s'" msgstr "no se pudo abrir o leer '%s'" @@ -17210,12 +18129,6 @@ 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: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:678 #, c-format msgid "no note found for object %s." @@ -17273,8 +18186,8 @@ msgid "load rewriting config for <command> (implies --stdin)" msgstr "cargar configuración de reescritura para <comando> (implica --stdin)" #: builtin/notes.c:517 -msgid "too few parameters" -msgstr "muy pocos parámetros" +msgid "too few arguments" +msgstr "muy pocos argumentos" #: builtin/notes.c:538 #, c-format @@ -17403,7 +18316,7 @@ 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/tag.c:546 +#: builtin/notes.c:897 builtin/tag.c:578 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falló al resolver '%s' como una ref válida." @@ -17421,7 +18334,7 @@ msgstr "intentar eliminar una nota no existente no es un error" msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 msgid "do not remove, show only" msgstr "no eliminar, solo mostrar" @@ -17437,125 +18350,139 @@ msgstr "referencia-de-notas" msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1608 +#: builtin/notes.c:1034 builtin/stash.c:1671 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 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:54 +#: builtin/pack-objects.c:55 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:442 +#: builtin/pack-objects.c:440 +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" +"write_reuse_object: no se pudo localizar %s, se esperaba en el " +"desplazamiento %<PRIuMAX> en el paquete %s" + +#: builtin/pack-objects.c:448 #, c-format msgid "bad packed object CRC for %s" msgstr "mal paquete de objeto CRC para %s" -#: builtin/pack-objects.c:453 +#: builtin/pack-objects.c:459 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:584 +#: builtin/pack-objects.c:590 #, c-format msgid "recursive delta detected for object %s" msgstr "delta recursivo encontrado para objeto %s" -#: builtin/pack-objects.c:795 +#: builtin/pack-objects.c:801 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: builtin/pack-objects.c:1003 +#: builtin/pack-objects.c:896 +#, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s" + +#: builtin/pack-objects.c:1015 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:1016 +#: builtin/pack-objects.c:1028 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1077 builtin/update-index.c:90 +#: builtin/pack-objects.c:1089 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:1130 +#: builtin/pack-objects.c:1141 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1347 +#: builtin/pack-objects.c:1358 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:1774 +#: builtin/pack-objects.c:1806 #, 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:1783 +#: builtin/pack-objects.c:1815 #, 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:2054 +#: builtin/pack-objects.c:2096 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:2199 +#: builtin/pack-objects.c:2241 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 -#: builtin/pack-objects.c:2295 +#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2337 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 +#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 #, 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:2309 +#: builtin/pack-objects.c:2351 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2666 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2805 #, 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:2851 +#: builtin/pack-objects.c:2891 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2897 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2976 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -17564,7 +18491,7 @@ msgstr "" "valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-" "objeto> <hash-de-pack> <uri>' (se tuvo '%s')" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2979 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -17572,7 +18499,7 @@ msgstr "" "objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo " "'%s')" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:3008 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17581,7 +18508,7 @@ msgstr "" "se espseraba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:2967 +#: builtin/pack-objects.c:3014 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17590,240 +18517,240 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:3065 +#: builtin/pack-objects.c:3112 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 +#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3202 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto perdido en %s no pudo ser examinado" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3287 msgid "unable to force loose object" msgstr "incapaz de forzar un objeto perdido" -#: builtin/pack-objects.c:3333 +#: builtin/pack-objects.c:3380 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3383 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3408 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3461 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3418 +#: builtin/pack-objects.c:3465 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3456 +#: builtin/pack-objects.c:3503 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3457 +#: builtin/pack-objects.c:3504 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:3460 +#: builtin/pack-objects.c:3507 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3462 +#: builtin/pack-objects.c:3509 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3464 +#: builtin/pack-objects.c:3511 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:3466 +#: builtin/pack-objects.c:3513 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3468 +#: builtin/pack-objects.c:3515 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:3470 +#: builtin/pack-objects.c:3517 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:3472 +#: builtin/pack-objects.c:3519 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3474 +#: builtin/pack-objects.c:3521 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3523 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3478 +#: builtin/pack-objects.c:3525 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3480 +#: builtin/pack-objects.c:3527 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3482 +#: builtin/pack-objects.c:3529 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3531 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:3487 +#: builtin/pack-objects.c:3534 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3537 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3493 +#: builtin/pack-objects.c:3540 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3543 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3545 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:3500 +#: builtin/pack-objects.c:3547 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3549 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3551 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3554 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3556 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3558 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3560 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3562 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3564 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3566 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3568 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:3523 +#: builtin/pack-objects.c:3570 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:3527 +#: builtin/pack-objects.c:3574 msgid "write a bitmap index if possible" msgstr "escribir un índice de bitmap si es posible" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3578 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3581 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3583 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3538 +#: builtin/pack-objects.c:3585 msgid "protocol" msgstr "protocolo" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3586 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "excluyendo cualquier uploadpack.blobpackfileuri configurado con este " "protocolo" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3617 #, 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:3573 +#: builtin/pack-objects.c:3622 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es muy grande, forzando %d" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3676 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:3629 +#: builtin/pack-objects.c:3678 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3634 +#: builtin/pack-objects.c:3683 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:3637 +#: builtin/pack-objects.c:3686 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3643 +#: builtin/pack-objects.c:3692 msgid "cannot use --filter without --stdout" msgstr "no se puede usar--filter sin --stdout" -#: builtin/pack-objects.c:3703 +#: builtin/pack-objects.c:3752 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:3734 +#: builtin/pack-objects.c:3783 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -17832,6 +18759,20 @@ msgstr "" "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-" "reusado %<PRIu32>" +#: builtin/pack-redundant.c:601 +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" +"'git pack-redundant' está nominado para su eliminación.\n" +"Si todavía usa este comando, agregue un extra\n" +"opción, '--i-still-use-this', en la línea de comando\n" +"y háganos saber que todavía lo usa enviando un correo electrónico\n" +"a <git@vger.kernel.org>. Gracias.\n" + #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<opciones>]" @@ -17890,7 +18831,7 @@ msgstr "Opciones relacionadas a fusión" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" @@ -17915,49 +18856,19 @@ msgstr "número de submódulos que realizan pull en paralelo" msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido para pull.ff: %s" -#: builtin/pull.c:349 -msgid "" -"Pulling without specifying how to reconcile divergent branches is\n" -"discouraged. You can squelch this message by running one of the following\n" -"commands sometime before your next pull:\n" -"\n" -" git config pull.rebase false # merge (the default strategy)\n" -" git config pull.rebase true # rebase\n" -" git config pull.ff only # fast-forward only\n" -"\n" -"You can replace \"git config\" with \"git config --global\" to set a " -"default\n" -"preference for all repositories. You can also pass --rebase, --no-rebase,\n" -"or --ff-only on the command line to override the configured default per\n" -"invocation.\n" -msgstr "" -"Hacer un pull sin especificar cómo reconciliar las ramas es poco\n" -"recomendable. Puedes eliminar este mensaje usando uno de los\n" -"siguientes comandos antes de tu siguiente pull:\n" -"\n" -" git config pull.rebase false # hacer merge (estrategia por defecto)\n" -" git config pull.rebase true # aplicar rebase\n" -" git config pull.ff only # aplicar solo fast-forward\n" -"\n" -"Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n" -"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n" -"--no-rebase, o --ff-only en el comando para sobreescribir la configuración\n" -"por defecto en cada invocación.\n" -"\n" - -#: builtin/pull.c:459 +#: builtin/pull.c:445 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:461 +#: builtin/pull.c:447 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:462 +#: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17966,7 +18877,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:465 +#: builtin/pull.c:451 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17977,44 +18888,43 @@ 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:470 builtin/rebase.c:1234 git-parse-remote.sh:73 +#: builtin/pull.c:456 builtin/rebase.c:1253 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79 +#: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82 +#: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:475 builtin/pull.c:490 +#: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 -#: builtin/rebase.c:1240 git-parse-remote.sh:64 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1259 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 -#: git-parse-remote.sh:65 +#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75 +#: builtin/pull.c:471 builtin/rebase.c:1251 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:494 git-parse-remote.sh:95 +#: builtin/pull.c:480 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:499 +#: builtin/pull.c:485 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -18023,28 +18933,58 @@ 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:610 +#: builtin/pull.c:596 #, c-format msgid "unable to access commit %s" msgstr "no es posible acceder al commit %s" -#: builtin/pull.c:895 +#: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:955 +#: builtin/pull.c:930 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Hacer un pull sin especificar cómo reconciliar las ramas es poco\n" +"recomendable. Puedes eliminar este mensaje usando uno de los\n" +"siguientes comandos antes de tu siguiente pull:\n" +"\n" +" git config pull.rebase false # hacer merge (estrategia por defecto)\n" +" git config pull.rebase true # aplicar rebase\n" +" git config pull.ff only # aplicar solo fast-forward\n" +"\n" +"Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n" +"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n" +"--no-rebase, o --ff-only en el comando para sobreescribir la configuración\n" +"por defecto en cada invocación.\n" +"\n" + +#: builtin/pull.c:991 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:959 +#: builtin/pull.c:995 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:960 +#: builtin/pull.c:996 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:985 +#: builtin/pull.c:1021 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18055,7 +18995,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:991 +#: builtin/pull.c:1027 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18072,15 +19012,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:1006 +#: builtin/pull.c:1042 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:1010 +#: builtin/pull.c:1046 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:1018 +#: builtin/pull.c:1067 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -18090,15 +19030,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "taquigrafía de tag sin <tag>" -#: builtin/push.c:122 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:168 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -18107,7 +19047,7 @@ msgstr "" "Para elegir si la opción es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:171 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -18132,7 +19072,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -18147,7 +19087,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:200 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18161,12 +19101,12 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:202 #, 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:211 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18177,13 +19117,13 @@ msgstr "" "la rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." -#: builtin/push.c:270 +#: builtin/push.c:260 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:277 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18195,7 +19135,7 @@ msgstr "" "'git pull ...') antes de hacer push de nuevo.\n" "Mira 'Note about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:283 +#: builtin/push.c:273 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" @@ -18208,7 +19148,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:289 +#: builtin/push.c:279 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" @@ -18222,12 +19162,12 @@ 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:296 +#: builtin/push.c:286 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:299 +#: builtin/push.c:289 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" @@ -18237,99 +19177,117 @@ msgstr "" "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:361 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"Las actualizaciones se rechazaron porque la sugerencia del seguimiento " +"remoto\n" +"rama se ha actualizado desde la última vez que se realizó la compra. Es " +"posible que desee\n" +"para integrar esos cambios localmente (por ejemplo, 'git pull ...')\n" +"antes de forzar una actualización.\n" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:368 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "falló el push de algunas referencias a '%s'" -#: builtin/push.c:542 +#: builtin/push.c:553 msgid "repository" msgstr "repositorio" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:546 +#: builtin/push.c:557 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:547 +#: builtin/push.c:558 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:550 builtin/send-pack.c:167 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:551 builtin/send-pack.c:179 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:552 builtin/send-pack.c:180 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:555 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "requieren que las actualizaciones remotas se integren localmente" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:556 builtin/send-pack.c:174 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:559 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:562 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "recortando refs eliminadas localmente" -#: builtin/push.c:564 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:565 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:567 builtin/send-pack.c:168 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:569 builtin/send-pack.c:175 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" -#: builtin/push.c:587 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:589 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:609 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "mal repositorio '%s'" -#: builtin/push.c:610 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18351,70 +19309,78 @@ msgstr "" "\n" " git push <nombre>\n" -#: builtin/push.c:625 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:627 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:631 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:633 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:636 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:640 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de línea nueva" -#: builtin/range-diff.c:8 +#: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" "git range-diff [<opciones>] <base-vieja>..<punta-vieja> <base-nueva>..<punta-" "nueva>" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c:10 msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c:11 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:28 msgid "Percentage by which creation is weighted" msgstr "Porcentaje por el cual la creación es pesada" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "usar colores simples de diff" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "notes" msgstr "notas" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "passed to 'git log'" msgstr "pasado a 'git log'" -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:35 +msgid "only emit output related to the first range" +msgstr "solo emite salida relacionada con el primer rango" + +#: builtin/range-diff.c:37 +msgid "only emit output related to the second range" +msgstr "solo emite salida relacionada con el segundo rango" + +#: builtin/range-diff.c:60 builtin/range-diff.c:64 #, c-format -msgid "no .. in range: '%s'" -msgstr "no .. en rango: '%s'" +msgid "not a commit range: '%s'" +msgstr "no es un rango de commit: '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:74 msgid "single arg format must be symmetric range" msgstr "argumento único de formato debe ser un rango simétrico" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:89 msgid "need two commit ranges" msgstr "se necesitan dos rangos de commits" @@ -18519,193 +19485,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 +#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilizable: '%s'" -#: builtin/rebase.c:298 +#: builtin/rebase.c:312 #, c-format msgid "could not create temporary %s" msgstr "no se pudo crear archivo temporal %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:318 msgid "could not mark as interactive" msgstr "no se pudo marcar como interactivo" -#: builtin/rebase.c:358 +#: builtin/rebase.c:371 msgid "could not generate todo list" msgstr "no se pudo generar lista de pendientes" -#: builtin/rebase.c:399 +#: builtin/rebase.c:413 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:468 +#: builtin/rebase.c:482 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opciones>]" -#: builtin/rebase.c:481 builtin/rebase.c:1374 +#: builtin/rebase.c:495 builtin/rebase.c:1394 msgid "keep commits which start empty" msgstr "mantener commits que comienzan con vacío" -#: builtin/rebase.c:485 builtin/revert.c:128 +#: builtin/rebase.c:499 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits con mensajes vacíos" -#: builtin/rebase.c:487 +#: builtin/rebase.c:501 msgid "rebase merge commits" msgstr "rebasando commits de fusión" -#: builtin/rebase.c:489 +#: builtin/rebase.c:503 msgid "keep original branch points of cousins" msgstr "mantener puntos originales de la rama de sus primos" -#: builtin/rebase.c:491 +#: builtin/rebase.c:505 msgid "move commits that begin with squash!/fixup!" msgstr "mover commits que comienzan con squash!/fixup!" -#: builtin/rebase.c:492 +#: builtin/rebase.c:506 msgid "sign commits" msgstr "firmar commits" -#: builtin/rebase.c:494 builtin/rebase.c:1314 +#: builtin/rebase.c:508 builtin/rebase.c:1333 msgid "display a diffstat of what changed upstream" msgstr "mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:496 +#: builtin/rebase.c:510 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:498 +#: builtin/rebase.c:512 msgid "skip commit" msgstr "saltar commit" -#: builtin/rebase.c:499 +#: builtin/rebase.c:513 msgid "edit the todo list" msgstr "editar la lista de pendientes" -#: builtin/rebase.c:501 +#: builtin/rebase.c:515 msgid "show the current patch" msgstr "mostrar el parche actual" -#: builtin/rebase.c:504 +#: builtin/rebase.c:518 msgid "shorten commit ids in the todo list" msgstr "ids de commits cortos en la lista de pendientes" -#: builtin/rebase.c:506 +#: builtin/rebase.c:520 msgid "expand commit ids in the todo list" msgstr "expandir ids de commits en la lista de pendientes" -#: builtin/rebase.c:508 +#: builtin/rebase.c:522 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase.c:510 +#: builtin/rebase.c:524 msgid "rearrange fixup/squash lines" msgstr "reorganizar líneas fixup/squash" -#: builtin/rebase.c:512 +#: builtin/rebase.c:526 msgid "insert exec commands in todo list" msgstr "insertar comando exec en la lista de pendientes" -#: builtin/rebase.c:513 +#: builtin/rebase.c:527 msgid "onto" msgstr "hacia" -#: builtin/rebase.c:516 +#: builtin/rebase.c:530 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:516 +#: builtin/rebase.c:530 msgid "restrict revision" msgstr "restringir revision" -#: builtin/rebase.c:518 +#: builtin/rebase.c:532 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:519 +#: builtin/rebase.c:533 msgid "squash onto" msgstr "squash hacia" -#: builtin/rebase.c:521 +#: builtin/rebase.c:535 msgid "the upstream commit" msgstr "el commit de upstream" -#: builtin/rebase.c:523 +#: builtin/rebase.c:537 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:523 +#: builtin/rebase.c:537 msgid "head name" msgstr "nombre de head" -#: builtin/rebase.c:528 +#: builtin/rebase.c:542 msgid "rebase strategy" msgstr "estrategia de rebase" -#: builtin/rebase.c:529 +#: builtin/rebase.c:543 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:530 +#: builtin/rebase.c:544 msgid "strategy options" msgstr "opciones de estrategia" -#: builtin/rebase.c:531 +#: builtin/rebase.c:545 msgid "switch-to" msgstr "cambiar a" -#: builtin/rebase.c:532 +#: builtin/rebase.c:546 msgid "the branch or commit to checkout" msgstr "la rama o commit para hacer checkout" -#: builtin/rebase.c:533 +#: builtin/rebase.c:547 msgid "onto-name" msgstr "hacia-nombre" -#: builtin/rebase.c:533 +#: builtin/rebase.c:547 msgid "onto name" msgstr "hacia nombre" -#: builtin/rebase.c:534 +#: builtin/rebase.c:548 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:534 +#: builtin/rebase.c:548 msgid "the command to run" msgstr "el comando para ejecutar" -#: builtin/rebase.c:537 builtin/rebase.c:1407 +#: builtin/rebase.c:551 builtin/rebase.c:1427 msgid "automatically re-schedule any `exec` that fails" msgstr "reprogramar automaticamente cualquier `exec` que falle" -#: builtin/rebase.c:553 +#: builtin/rebase.c:567 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" -#: builtin/rebase.c:569 +#: builtin/rebase.c:583 #, c-format msgid "%s requires the merge backend" msgstr "%s requiere un backend de fusión" -#: builtin/rebase.c:612 +#: builtin/rebase.c:626 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:629 +#: builtin/rebase.c:643 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head inválido: '%s'" -#: builtin/rebase.c:654 +#: builtin/rebase.c:668 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando inválido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:813 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" @@ -18720,7 +19686,7 @@ msgstr "" "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:882 +#: builtin/rebase.c:896 #, c-format msgid "" "\n" @@ -18739,7 +19705,7 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1208 +#: builtin/rebase.c:1227 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -18748,7 +19714,7 @@ msgstr "" "tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y " "\"ask\"." -#: builtin/rebase.c:1226 +#: builtin/rebase.c:1245 #, c-format msgid "" "%s\n" @@ -18765,7 +19731,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1242 +#: builtin/rebase.c:1261 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18778,137 +19744,149 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1272 +#: builtin/rebase.c:1291 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1295 msgid "empty exec command" msgstr "comando exec vacío" -#: builtin/rebase.c:1305 +#: builtin/rebase.c:1324 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:1307 +#: builtin/rebase.c:1326 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:1309 +#: builtin/rebase.c:1328 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1311 +#: builtin/rebase.c:1330 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:1317 +#: builtin/rebase.c:1336 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:1320 -msgid "add a Signed-off-by: line to each commit" +#: builtin/rebase.c:1339 +msgid "add a Signed-off-by trailer to each commit" msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit" -#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 -msgid "passed to 'git am'" -msgstr "pasado a 'git am'" +#: builtin/rebase.c:1342 +msgid "make committer date match author date" +msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" -#: builtin/rebase.c:1330 builtin/rebase.c:1332 +#: builtin/rebase.c:1344 +msgid "ignore author date and use current date" +msgstr "ignorar la fecha del autor y usar la fecha actual" + +#: builtin/rebase.c:1346 +msgid "synonym of --reset-author-date" +msgstr "sinónimo para --reset-author-date" + +#: builtin/rebase.c:1348 builtin/rebase.c:1352 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:1334 builtin/rebase.c:1337 +#: builtin/rebase.c:1350 +msgid "ignore changes in whitespace" +msgstr "ignorar cambios en espacios en blanco" + +#: builtin/rebase.c:1354 builtin/rebase.c:1357 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1359 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1362 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1364 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1367 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde está" -#: builtin/rebase.c:1348 +#: builtin/rebase.c:1368 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1351 +#: builtin/rebase.c:1371 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1354 +#: builtin/rebase.c:1374 msgid "use apply strategies to rebase" msgstr "usar estrategias de apply para el rebase" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1378 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusión para el rebase" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1382 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:1366 +#: builtin/rebase.c:1386 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1391 msgid "how to handle commits that become empty" msgstr "como manejar commits que se vuelven vacíos" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1398 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1405 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:1389 +#: builtin/rebase.c:1409 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vacíos" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1413 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1416 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1418 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1400 builtin/revert.c:115 +#: builtin/rebase.c:1420 builtin/revert.c:115 msgid "option" msgstr "opción" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1421 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusión" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1424 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:1409 +#: builtin/rebase.c:1429 msgid "apply all changes, even those already present upstream" msgstr "" "aplicar todos los cambios, incluso aquellos que ya están presentes en " "upstream" -#: builtin/rebase.c:1426 +#: builtin/rebase.c:1446 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18916,42 +19894,42 @@ msgstr "" "el soporte para rebase.useBuiltin ha sido eliminado!\n" "Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:1432 +#: builtin/rebase.c:1452 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:1473 +#: builtin/rebase.c:1493 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:1478 +#: builtin/rebase.c:1498 msgid "cannot combine '--keep-base' with '--onto'" msgstr "no se puede combinar '--keep-base' con '--onto'" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1500 msgid "cannot combine '--keep-base' with '--root'" msgstr "no se puede combinar '--keep-base' con '--root'" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1504 msgid "cannot combine '--root' with '--fork-point'" msgstr "no se puede combinar '--root' con '--fork-point'" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1507 msgid "No rebase in progress?" msgstr "¿No hay rebase en progreso?" -#: builtin/rebase.c:1491 +#: builtin/rebase.c:1511 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:1514 +#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1546 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18959,16 +19937,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1565 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del árbol de trabajo" -#: builtin/rebase.c:1564 +#: builtin/rebase.c:1584 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1610 +#: builtin/rebase.c:1630 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18989,135 +19967,135 @@ msgstr "" "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahí.\n" -#: builtin/rebase.c:1638 +#: builtin/rebase.c:1658 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numérico" -#: builtin/rebase.c:1680 +#: builtin/rebase.c:1700 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1702 +#: builtin/rebase.c:1739 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:1769 msgid "cannot combine apply options with merge options" msgstr "no se pueden combinar opciones de apply con opciones de merge" -#: builtin/rebase.c:1745 +#: builtin/rebase.c:1782 #, c-format msgid "Unknown rebase backend: %s" msgstr "Backend de rebase desconocido: %s" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1812 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: builtin/rebase.c:1790 +#: builtin/rebase.c:1832 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1794 +#: builtin/rebase.c:1836 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:1818 +#: builtin/rebase.c:1860 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inválido '%s'" -#: builtin/rebase.c:1824 +#: builtin/rebase.c:1866 msgid "Could not create new root commit" msgstr "No se pudo crear commit raíz nuevo" -#: builtin/rebase.c:1850 +#: builtin/rebase.c:1892 #, 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:1853 +#: builtin/rebase.c:1895 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusión" -#: builtin/rebase.c:1861 +#: builtin/rebase.c:1903 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit válido '%s'" -#: builtin/rebase.c:1887 +#: builtin/rebase.c:1931 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:1906 +#: builtin/rebase.c:1950 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisión" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1971 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: builtin/rebase.c:1963 +#: builtin/rebase.c:2007 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2018 msgid "HEAD is up to date." msgstr "HEAD está actualizado." -#: builtin/rebase.c:1976 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s está actualizada.\n" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2028 msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: builtin/rebase.c:1986 +#: builtin/rebase.c:2030 #, 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:1994 +#: builtin/rebase.c:2038 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2045 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2004 +#: builtin/rebase.c:2048 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2073 #, 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:2038 +#: builtin/rebase.c:2082 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2091 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rápido de %s a %s.\n" @@ -19126,7 +20104,7 @@ msgstr "Avance rápido de %s a %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:844 +#: builtin/receive-pack.c:1276 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" @@ -19159,7 +20137,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:864 +#: builtin/receive-pack.c:1296 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" @@ -19180,11 +20158,11 @@ msgstr "" "\n" "Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:1970 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1984 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." @@ -19215,36 +20193,36 @@ msgstr "git reflog existe <ref>" msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" -#: builtin/reflog.c:606 +#: builtin/reflog.c:609 #, c-format msgid "Marking reachable objects..." msgstr "Marcando objectos alcanzables..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" msgstr "¡%s apunta a ningún lado!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:699 msgid "no reflog specified to delete" msgstr "no reflog especificado para borrar" -#: builtin/reflog.c:705 +#: builtin/reflog.c:708 #, c-format msgid "not a reflog: %s" msgstr "no es una reflog: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:713 #, c-format msgid "no reflog for '%s'" msgstr "no reflog para '%s'" -#: builtin/reflog.c:756 +#: builtin/reflog.c:759 #, c-format msgid "invalid ref format: %s" msgstr "formato inválido: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:768 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -19382,40 +20360,35 @@ msgstr "especificar una rama master no tiene sentido con --mirror" 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:195 builtin/remote.c:696 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "remoto %s ya existe." -#: 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:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "No se pudo configurar master '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, 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:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "(concordando)" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:653 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "no se pudo configurar '%s'" -#: builtin/remote.c:658 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -19426,17 +20399,17 @@ msgstr "" "\t%s:%d\n" "ahora nombra al remoto inexistente '%s'" -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:710 #, 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:726 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19447,17 +20420,17 @@ msgstr "" "\t%s\n" "\tPor favor actualice la configuración manualmente si es necesario." -#: builtin/remote.c:766 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "borrando '%s' falló" -#: builtin/remote.c:800 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "creando '%s' falló" -#: builtin/remote.c:876 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19472,118 +20445,118 @@ msgstr[1] "" "eliminadas;\n" "para borrarlas, use:" -#: builtin/remote.c:890 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la sección de configuración '%s'" -#: builtin/remote.c:993 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" -#: builtin/remote.c:996 +#: builtin/remote.c:1002 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:998 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " viejo ( use 'git remote prune' para eliminar)" -#: builtin/remote.c:1000 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:1047 #, 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:1050 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1114 msgid "create" msgstr "crear" -#: builtin/remote.c:1111 +#: builtin/remote.c:1117 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1115 +#: builtin/remote.c:1121 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1118 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "puede realizar fast-forward" -#: builtin/remote.c:1121 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1128 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1233 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(sin URL)" @@ -19591,185 +20564,185 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1265 #, 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:1271 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1289 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:1291 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales serán reflejadas por 'git push'" -#: builtin/remote.c:1297 +#: builtin/remote.c:1303 #, 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:1318 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1320 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1337 +#: builtin/remote.c:1343 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:1347 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref válido: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " ¡%s será colgado!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " ¡%s ha sido colgado!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [ejecutará prune] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1530 +#: builtin/remote.c:1539 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1537 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1554 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1556 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1584 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1610 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1612 +#: builtin/remote.c:1623 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1621 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1660 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrón de URL viejo inválido: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "No se encontró URL: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "No borrará todos los URLs de no-push" -#: builtin/repack.c:25 +#: builtin/repack.c:26 msgid "git repack [<options>]" msgstr "git repack [<opciones>]" -#: builtin/repack.c:30 +#: builtin/repack.c:31 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19777,137 +20750,123 @@ 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:193 +#: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:232 builtin/repack.c:418 +#: builtin/repack.c:270 builtin/repack.c:446 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:256 +#: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no se puede finalizar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:294 +#: builtin/repack.c:322 msgid "pack everything in a single pack" msgstr "empaquetar todo en un único paquete" -#: builtin/repack.c:296 +#: builtin/repack.c:324 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:327 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:329 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:331 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:333 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:336 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:338 msgid "write bitmap index" msgstr "escribir un índice de bitmap" -#: builtin/repack.c:312 +#: builtin/repack.c:340 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:341 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:314 +#: builtin/repack.c:342 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:344 msgid "with -a, repack unreachable objects" msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:318 +#: builtin/repack.c:346 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:347 builtin/repack.c:353 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:320 +#: builtin/repack.c:348 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:350 msgid "limits the maximum delta depth" msgstr "limita la profundidad máxima del delta" -#: builtin/repack.c:324 +#: builtin/repack.c:352 msgid "limits the maximum number of threads" msgstr "limita el número máximo de hilos" -#: builtin/repack.c:326 +#: builtin/repack.c:354 msgid "maximum size of each packfile" msgstr "tamaño máximo de cada paquete" -#: builtin/repack.c:328 +#: builtin/repack.c:356 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:330 +#: builtin/repack.c:358 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:340 +#: builtin/repack.c:368 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:372 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:427 +#: builtin/repack.c:455 msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#: builtin/repack.c:488 +#: builtin/repack.c:485 #, 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" +msgid "missing required file: %s" +msgstr "falta archivo requerido: %s" -#: builtin/repack.c:536 +#: builtin/repack.c:487 #, c-format -msgid "failed to remove '%s'" -msgstr "falló al eliminar'%s'" +msgid "could not unlink: %s" +msgstr "no se pudo desvincular: %s" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -20237,8 +21196,8 @@ msgstr "HEAD está ahora en %s" 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:295 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 +#: builtin/stash.c:685 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" @@ -20323,19 +21282,19 @@ msgstr "No se puede reiniciar el índice a la revisión '%s'." msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:534 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:595 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:651 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:615 +#: builtin/rev-list.c:656 msgid "marked counting is incompatible with --objects" msgstr "conteo de marcas es incompatible con --objects" @@ -20448,11 +21407,11 @@ msgstr "preservar commits iniciales vacíos" msgid "keep redundant, empty commits" msgstr "mantener commits redundantes, vacíos" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "falló al revertir" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "cherry-pick falló" @@ -20554,55 +21513,76 @@ msgstr "" "[<ref>...]\n" " --all y especificaciones <ref> explícitas son mutuamente exclusivas." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "nombre remoto" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "usar protocolo RPC sin estado" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "leer refs de stdin" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "mostrar status del remote helper" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shorlog [<opciones>]" -#: builtin/shortlog.c:264 -msgid "Group by committer rather than author" -msgstr "Agrupar por committer en lugar de autor" +#: builtin/shortlog.c:123 +msgid "using multiple --group options with stdin is not supported" +msgstr "no se admite el uso de múltiples opciones de grupo --group con stdin" + +#: builtin/shortlog.c:133 +msgid "using --group=trailer with stdin is not supported" +msgstr "el uso de --group = trailer con stdin no es compatible" + +#: builtin/shortlog.c:323 +#, c-format +msgid "unknown group type: %s" +msgstr "tipo de grupo desconocido: %s" + +#: builtin/shortlog.c:351 +msgid "group by committer rather than author" +msgstr "agrupar por committer en lugar de autor" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" msgstr "ordenar salida de acuerdo al número de commits por autor" -#: builtin/shortlog.c:268 -msgid "Suppress commit descriptions, only provides commit count" -msgstr "Suprimir descripción de commits, solo proveer cuenta de commits" +#: builtin/shortlog.c:356 +msgid "suppress commit descriptions, only provides commit count" +msgstr "suprimir descripción de commits, solo proveer cuenta de commits" -#: builtin/shortlog.c:270 -msgid "Show the email address of each author" -msgstr "Mostrar la dirección de correo de cada autor" +#: builtin/shortlog.c:358 +msgid "show the email address of each author" +msgstr "mostrar la dirección de correo de cada autor" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 -msgid "Linewrap output" -msgstr "Salida de línea" +#: builtin/shortlog.c:360 +msgid "linewrap output" +msgstr "salida de línea" + +#: builtin/shortlog.c:362 +msgid "field" +msgstr "campo" + +#: builtin/shortlog.c:363 +msgid "group by field" +msgstr "agrupar por campo" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:391 msgid "too many arguments given outside repository" msgstr "demasiados argumentos dados fuera del repositorio" @@ -20797,62 +21777,74 @@ msgstr "mostrar refs de stdin que no están en el repositorio local" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opciones>" -#: builtin/sparse-checkout.c:64 +#: builtin/sparse-checkout.c:45 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:71 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:216 +#: builtin/sparse-checkout.c:223 msgid "failed to create directory for sparse-checkout file" msgstr "falló al crear directorio para el archivo sparse-checkout" -#: builtin/sparse-checkout.c:257 +#: builtin/sparse-checkout.c:264 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" "no es posible actualizar el formato de repositorio para habilitar " "worktreeConfig" -#: builtin/sparse-checkout.c:259 +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "falló al configurar opción extensions.worktreeConfig" -#: builtin/sparse-checkout.c:276 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:295 +#: 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:332 +#: builtin/sparse-checkout.c:339 #, c-format msgid "failed to open '%s'" msgstr "falló al abrir '%s'" -#: builtin/sparse-checkout.c:389 +#: builtin/sparse-checkout.c:396 #, c-format msgid "could not normalize path %s" msgstr "no se pudo normalizar la ruta %s" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:408 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" -#: builtin/sparse-checkout.c:426 +#: builtin/sparse-checkout.c:433 #, 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:480 builtin/sparse-checkout.c:504 +#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 msgid "unable to load existing sparse-checkout patterns" msgstr "no se pudo cargar patrones de sparse-checkout existentes" -#: builtin/sparse-checkout.c:549 +#: builtin/sparse-checkout.c:556 msgid "read patterns from standard in" msgstr "leer patrones de standard in" -#: builtin/sparse-checkout.c:586 +#: builtin/sparse-checkout.c:571 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:590 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:618 msgid "error while refreshing working directory" msgstr "error al refrescar directorio de trabajo" @@ -20942,153 +21934,165 @@ msgid "%s is not a valid reference" msgstr "%s no es una referencia válida" #: builtin/stash.c:225 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear con parámetros no está implementado" +msgid "git stash clear with arguments is unimplemented" +msgstr "git stash clear con argumentos no está implementado" + +#: builtin/stash.c:429 +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" +msgstr "" +"ADVERTENCIA: Archivo sin seguimiento en forma de archivo con seguimiento. " +"Renombrar\n" +" %s ->%s\n" +" Para hacer espacio.\n" -#: builtin/stash.c:404 +#: builtin/stash.c:490 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 +#: builtin/stash.c:501 #, 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." +#: builtin/stash.c:508 +msgid "conflicts in index. Try without --index." msgstr "conflictos en índice. Intente sin --index." -#: builtin/stash.c:428 +#: builtin/stash.c:514 msgid "could not save index tree" msgstr "no se puede guardar el índice del árbol" -#: builtin/stash.c:437 +#: builtin/stash.c:523 msgid "could not restore untracked files from stash" msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" -#: builtin/stash.c:451 +#: builtin/stash.c:537 #, c-format msgid "Merging %s with %s" msgstr "Fusionando %s con %s" -#: builtin/stash.c:461 +#: builtin/stash.c:547 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:589 builtin/stash.c:687 msgid "attempt to recreate the index" msgstr "intento de recrear el index" -#: builtin/stash.c:555 +#: builtin/stash.c:633 #, c-format msgid "Dropped %s (%s)" msgstr "Botado %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:636 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: No se pudo borrar entrada stash" -#: builtin/stash.c:583 +#: builtin/stash.c:649 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' no es una referencia stash" -#: builtin/stash.c:633 +#: builtin/stash.c:699 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 +#: builtin/stash.c:722 msgid "No branch name specified" msgstr "No se especificó el nombre de la rama" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:866 builtin/stash.c:903 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 +#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:828 +#: builtin/stash.c:894 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1046 +#: builtin/stash.c:1109 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1146 +#: builtin/stash.c:1209 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial" -#: builtin/stash.c:1173 +#: builtin/stash.c:1236 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: builtin/stash.c:1182 +#: builtin/stash.c:1245 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1193 builtin/stash.c:1202 +#: builtin/stash.c:1256 builtin/stash.c:1265 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: builtin/stash.c:1230 +#: builtin/stash.c:1293 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: builtin/stash.c:1279 +#: builtin/stash.c:1342 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:1295 +#: builtin/stash.c:1358 msgid "Did you forget to 'git add'?" msgstr "¿Olvidaste 'git add'?" -#: builtin/stash.c:1310 +#: builtin/stash.c:1373 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1317 +#: builtin/stash.c:1380 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1332 +#: builtin/stash.c:1395 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1337 +#: builtin/stash.c:1400 #, c-format msgid "Saved working directory and index state %s" msgstr "Directorio de trabajo guardado y estado de índice %s" -#: builtin/stash.c:1427 +#: builtin/stash.c:1490 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del árbol de trabajo" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1529 builtin/stash.c:1594 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1531 builtin/stash.c:1596 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1532 builtin/stash.c:1597 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1534 builtin/stash.c:1599 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1473 builtin/stash.c:1538 +#: builtin/stash.c:1536 builtin/stash.c:1601 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1573 +#: builtin/stash.c:1636 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21113,7 +22117,7 @@ msgstr "" 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:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" @@ -21127,7 +22131,7 @@ msgstr "subomdule--helper print-default-remote no toma argumentos" msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" @@ -21135,8 +22139,8 @@ msgstr "ancho alternativo para rutas relativas" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, 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" @@ -21167,12 +22171,13 @@ msgstr "" "." #: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" -msgstr "Suprime la salida al inicializar cada comando de submódulo" +msgid "suppress output of entering each submodule command" +msgstr "suprime la salida al inicializar cada comando de submódulo" -#: 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:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 +msgid "recurse into nested submodules" +msgstr "recursar en submódulos anidados" #: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" @@ -21187,105 +22192,158 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, 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:671 +#: builtin/submodule--helper.c:670 #, 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:681 +#: builtin/submodule--helper.c:680 #, 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:688 +#: builtin/submodule--helper.c:687 #, 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:710 -msgid "Suppress output for initializing a submodule" -msgstr "Suprime la salida para inicializar un submódulo" +#: builtin/submodule--helper.c:709 +msgid "suppress output for initializing a submodule" +msgstr "suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, 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:837 +#: builtin/submodule--helper.c:835 #, 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:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: 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:886 builtin/submodule--helper.c:1623 +msgid "suppress submodule status output" +msgstr "suprimir output del estado del submódulo" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:887 msgid "" -"Use commit stored in the index instead of the one stored in the submodule " +"use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -"Usar el commit guardado en el índice en lugar del guardado en el submódulo " +"usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:890 -msgid "recurse into nested submodules" -msgstr "recursar en submódulos anidados" - -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "no se pudo realizar hash del objeto '%s'" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "modo %o inesperado\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" +"usar el commit guardado en el índice en lugar del guardado en el submódulo " +"HEAD" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"usar el commit guardado en el índice para comparar con el guardado en el " +"submódulo HEAD" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "limitar el tamaño de resumen" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "no se puede obtener la revisión para HEAD" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached y --files son mutuamente exclusivos" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:1413 #, 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:1003 +#: builtin/submodule--helper.c:1427 #, 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:1014 +#: builtin/submodule--helper.c:1438 #, 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:1061 -msgid "Suppress output of synchronizing submodule url" -msgstr "Suprime la salida del url del submódulo que se sincroniza" +#: builtin/submodule--helper.c:1485 +msgid "suppress output of synchronizing submodule url" +msgstr "suprime la salida del url del submódulo que se sincroniza" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21294,7 +22352,7 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" "rf' si realmente quieres eliminarlo incluyendo todo en su historia)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21303,46 +22361,46 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1568 #, 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:1155 +#: builtin/submodule--helper.c:1579 #, 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:1171 +#: builtin/submodule--helper.c:1595 #, 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:1200 -msgid "Remove submodule working trees even if they contain local changes" +#: builtin/submodule--helper.c:1624 +msgid "remove submodule working trees even if they contain local changes" msgstr "" -"Remover árboles 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:1201 -msgid "Unregister all submodules" -msgstr "Quitar todos los submódulos" +#: builtin/submodule--helper.c:1625 +msgid "unregister all submodules" +msgstr "quitar todos los submódulos" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1644 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:1289 +#: builtin/submodule--helper.c:1713 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" @@ -21356,46 +22414,46 @@ msgstr "" "con\n" "'--reference-if-able' en lugar de '--reference'." -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "no permitir clonar en directorios no vacíos" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -21405,104 +22463,104 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" "url <url> --path <ruta>" -#: builtin/submodule--helper.c:1449 +#: builtin/submodule--helper.c:1873 #, 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:1460 +#: builtin/submodule--helper.c:1884 #, 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:1464 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "directorio no está vacío: '%s'" -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1900 #, 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:1512 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "¿Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:2330 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:1910 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: 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:2340 +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:1919 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:2345 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:1922 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1933 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21511,85 +22569,85 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " "el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2541 #, 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:2150 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2636 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:2215 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "desconfigura la opción en elarchivo .gitmodules" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:176 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, 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:2257 -msgid "Suppress output for setting url of a submodule" -msgstr "Suprime la salida para inicializar la url de un submódulo" +#: builtin/submodule--helper.c:2681 +msgid "suppress output for setting url of a submodule" +msgstr "suprime la salida para inicializar la url de un submódulo" -#: builtin/submodule--helper.c:2261 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>" -#: builtin/submodule--helper.c:2294 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "configurar la rama de rastreo por defecto a master" -#: builtin/submodule--helper.c:2296 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "configurar la rama de rastreo por defecto" -#: builtin/submodule--helper.c:2300 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>" -#: builtin/submodule--helper.c:2301 +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>" -#: builtin/submodule--helper.c:2308 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "--branch o --default requeridos" -#: builtin/submodule--helper.c:2311 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "--branch y --default son mutuamente exclusivos" -#: builtin/submodule--helper.c:2367 git.c:436 git.c:683 +#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2373 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper válido" @@ -21614,11 +22672,11 @@ msgstr "eliminar referencia simbólica" msgid "shorten ref output" msgstr "salida de referencia más corta" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "razón" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "razón de la actualización" @@ -21638,11 +22696,13 @@ msgstr "git tag -d <nombre-de-tag>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <objeto>]\n" -"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]" +"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] " +"[<patrón>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -21653,12 +22713,12 @@ msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..." msgid "tag '%s' not found." msgstr "tag '%s' no encontrado." -#: builtin/tag.c:105 +#: builtin/tag.c:124 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Etiqueta '%s' eliminada (era %s)\n" -#: builtin/tag.c:135 +#: builtin/tag.c:159 #, c-format msgid "" "\n" @@ -21671,7 +22731,7 @@ msgstr "" " %s\n" "Las líneas que comienzan con '%c' serán ignoradas.\n" -#: builtin/tag.c:139 +#: builtin/tag.c:163 #, c-format msgid "" "\n" @@ -21686,15 +22746,11 @@ msgstr "" "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por " "ti mismo si quieres hacerlo.\n" -#: builtin/tag.c:198 +#: builtin/tag.c:230 msgid "unable to sign the tag" msgstr "incapaz de firmar tag" -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "incapaz de escribir el archivo de tag" - -#: builtin/tag.c:216 +#: builtin/tag.c:248 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -21707,138 +22763,134 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:232 +#: builtin/tag.c:264 msgid "bad object type." msgstr "tipo de objeto erróneo." -#: builtin/tag.c:285 +#: builtin/tag.c:317 msgid "no tag message?" msgstr "¿Sin mensaje de tag?" -#: builtin/tag.c:292 +#: builtin/tag.c:324 #, 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:403 +#: builtin/tag.c:435 msgid "list tag names" msgstr "listar nombres de tags" -#: builtin/tag.c:405 +#: builtin/tag.c:437 msgid "print <n> lines of each tag message" msgstr "imprimir <n> líneas de cada mensaje de tag" -#: builtin/tag.c:407 +#: builtin/tag.c:439 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:408 +#: builtin/tag.c:440 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:410 +#: builtin/tag.c:442 msgid "Tag creation options" msgstr "Opciones de creación de tags" -#: builtin/tag.c:412 +#: builtin/tag.c:444 msgid "annotated tag, needs a message" msgstr "tags anotadas necesitan un mensaje" -#: builtin/tag.c:414 +#: builtin/tag.c:446 msgid "tag message" msgstr "mensaje de tag" -#: builtin/tag.c:416 +#: builtin/tag.c:448 msgid "force edit of tag message" msgstr "forzar la edición del mensaje de tag" -#: builtin/tag.c:417 +#: builtin/tag.c:449 msgid "annotated and GPG-signed tag" msgstr "tag anotado y firmado con GPG" -#: builtin/tag.c:420 +#: builtin/tag.c:452 msgid "use another key to sign the tag" msgstr "usar otra clave para firmar el tag" -#: builtin/tag.c:421 +#: builtin/tag.c:453 msgid "replace the tag if exists" msgstr "remplazar tag si existe" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:454 builtin/update-ref.c:505 msgid "create a reflog" msgstr "crear un reflog" -#: builtin/tag.c:424 +#: builtin/tag.c:456 msgid "Tag listing options" msgstr "Opciones de listado de tag" -#: builtin/tag.c:425 +#: builtin/tag.c:457 msgid "show tag list in columns" msgstr "mostrar lista de tags en columnas" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:458 builtin/tag.c:460 msgid "print only tags that contain the commit" msgstr "mostrar solo tags que contienen el commit" -#: builtin/tag.c:427 builtin/tag.c:429 +#: builtin/tag.c:459 builtin/tag.c:461 msgid "print only tags that don't contain the commit" msgstr "mostrar solo tags que no contienen el commit" -#: builtin/tag.c:430 +#: builtin/tag.c:462 msgid "print only tags that are merged" msgstr "sólo imprimir las tags que están fusionadas" -#: builtin/tag.c:431 +#: builtin/tag.c:463 msgid "print only tags that are not merged" msgstr "sólo imprimir las tags que no están fusionadas" -#: builtin/tag.c:435 +#: builtin/tag.c:467 msgid "print only tags of the object" msgstr "sólo imprimir tags de el objeto" -#: builtin/tag.c:483 +#: builtin/tag.c:515 msgid "--column and -n are incompatible" msgstr "--column y -n son incompatibles" -#: builtin/tag.c:505 +#: builtin/tag.c:537 msgid "-n option is only allowed in list mode" msgstr "opción -n solo es permitida en modo lista" -#: builtin/tag.c:507 +#: builtin/tag.c:539 msgid "--contains option is only allowed in list mode" msgstr "opción --contains solo es permitido en modo lista" -#: builtin/tag.c:509 +#: builtin/tag.c:541 msgid "--no-contains option is only allowed in list mode" msgstr "opción --no-contains solo es permitida en modo lista" -#: builtin/tag.c:511 +#: builtin/tag.c:543 msgid "--points-at option is only allowed in list mode" msgstr "opción --points-at solo es permitida en modo lista" -#: builtin/tag.c:513 +#: builtin/tag.c:545 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:524 +#: builtin/tag.c:556 msgid "only one -F or -m option is allowed." msgstr "sólo se permite una de las opciones, -m ó -F." -#: builtin/tag.c:543 -msgid "too many params" -msgstr "demasiados parámetros" - -#: builtin/tag.c:549 +#: builtin/tag.c:581 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no es un nombre de tag válido." -#: builtin/tag.c:554 +#: builtin/tag.c:586 #, c-format msgid "tag '%s' already exists" msgstr "el tag '%s' ya existe" -#: builtin/tag.c:585 +#: builtin/tag.c:617 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" @@ -22123,19 +23175,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opciones>] --stdin [-z]" -#: builtin/update-ref.c:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "eliminar la referencia" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "actualiza <refname> no a lo que apunta" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "stdin tiene argumentos terminados en NUL" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "lee actualizaciones de stdin" @@ -22179,15 +23231,15 @@ msgstr "imprimir contenido del commit" msgid "print raw gpg status output" msgstr "muestra la salida de status gpg en formato raw" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "verboso" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "solo mostrar estadísticas" @@ -22199,89 +23251,63 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir contenido del tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<opciones>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <worktree> <nueva-ruta>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opciones>] <worktree>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:60 builtin/worktree.c:972 +#: builtin/worktree.c:61 builtin/worktree.c:933 #, c-format msgid "failed to delete '%s'" msgstr "falló al borrar '%s'" -#: builtin/worktree.c:85 -msgid "not a valid directory" -msgstr "no en un directorio válido" - -#: builtin/worktree.c:91 -msgid "gitdir file does not exist" -msgstr "archivo gitdir no existe" - -#: builtin/worktree.c:96 builtin/worktree.c:105 -#, c-format -msgid "unable to read gitdir file (%s)" -msgstr "no es posible leer archivo gitdir (%s)" - -#: builtin/worktree.c:115 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)" - -#: builtin/worktree.c:123 -msgid "invalid gitdir file" -msgstr "archivo gitdir inválido" - -#: builtin/worktree.c:131 -msgid "gitdir file points to non-existent location" -msgstr "archivo gitdir apunta a una ubicación inexistente" - -#: builtin/worktree.c:146 +#: builtin/worktree.c:74 #, c-format msgid "Removing %s/%s: %s" msgstr "Eliminando %s/%s: %s" -#: builtin/worktree.c:221 +#: builtin/worktree.c:149 msgid "report pruned working trees" msgstr "reporta árboles de trabajo recortados" -#: builtin/worktree.c:223 +#: builtin/worktree.c:151 msgid "expire working trees older than <time>" msgstr "expirar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:293 +#: builtin/worktree.c:221 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:302 +#: builtin/worktree.c:230 #, c-format msgid "unusable worktree destination '%s'" msgstr "destino de worktree inutilizable '%s'" -#: builtin/worktree.c:307 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -22291,7 +23317,7 @@ msgstr "" "usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:309 +#: builtin/worktree.c:237 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22300,119 +23326,132 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:360 +#: builtin/worktree.c:288 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:494 builtin/worktree.c:500 +#: builtin/worktree.c:422 builtin/worktree.c:428 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:496 +#: builtin/worktree.c:424 #, 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:505 +#: builtin/worktree.c:433 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:511 +#: builtin/worktree.c:439 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:552 +#: builtin/worktree.c:480 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:555 +#: builtin/worktree.c:483 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:557 +#: builtin/worktree.c:485 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:559 +#: builtin/worktree.c:487 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:560 +#: builtin/worktree.c:488 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:563 +#: builtin/worktree.c:491 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:566 +#: builtin/worktree.c:494 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:574 +#: builtin/worktree.c:502 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:635 +#: builtin/worktree.c:563 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:755 +#: builtin/worktree.c:680 +msgid "show extended annotations and reasons, if available" +msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles" + +#: builtin/worktree.c:682 +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "" +"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>" + +#: builtin/worktree.c:691 +msgid "--verbose and --porcelain are mutually exclusive" +msgstr "--verbose and --porcelain son mutuamente exclusivas" + +#: builtin/worktree.c:718 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:1000 +#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 +#: builtin/worktree.c:961 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:732 builtin/worktree.c:765 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:774 +#: builtin/worktree.c:737 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:776 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:804 +#: builtin/worktree.c:767 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:845 +#: builtin/worktree.c:808 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:853 +#: builtin/worktree.c:816 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:876 builtin/worktree.c:1002 +#: builtin/worktree.c:839 builtin/worktree.c:963 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:881 +#: builtin/worktree.c:844 #, 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:894 +#: builtin/worktree.c:857 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22421,7 +23460,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:896 +#: builtin/worktree.c:859 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22429,37 +23468,37 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:899 +#: builtin/worktree.c:862 #, 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:904 +#: builtin/worktree.c:867 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:952 +#: builtin/worktree.c:913 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:956 +#: builtin/worktree.c:917 #, c-format 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:961 +#: builtin/worktree.c:922 #, 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:984 +#: builtin/worktree.c:945 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:1007 +#: builtin/worktree.c:968 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22468,7 +23507,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:1009 +#: builtin/worktree.c:970 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22476,11 +23515,21 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:1012 +#: builtin/worktree.c:973 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" +#: builtin/worktree.c:997 +#, c-format +msgid "repair: %s: %s" +msgstr "reparar: %s: %s" + +#: builtin/worktree.c:1000 +#, c-format +msgid "error: %s: %s" +msgstr "error: %s: %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]" @@ -22497,164 +23546,37 @@ msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "sólo útil para depurar" -#: bugreport.c:15 -msgid "git version:\n" -msgstr "versión de git:\n" - -#: bugreport.c:21 -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() falló con error '%s' (%d)\n" - -#: bugreport.c:31 -msgid "compiler info: " -msgstr "información del compilador: " - -#: bugreport.c:34 -msgid "libc info: " -msgstr "información de libc: " - -#: bugreport.c:80 -msgid "not run from a git repository - no hooks to show\n" -msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n" - -#: bugreport.c:90 -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "" -"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]" - -#: bugreport.c:97 -msgid "" -"Thank you for filling out a Git bug report!\n" -"Please answer the following questions to help us understand your issue.\n" -"\n" -"What did you do before the bug happened? (Steps to reproduce your issue)\n" -"\n" -"What did you expect to happen? (Expected behavior)\n" -"\n" -"What happened instead? (Actual behavior)\n" -"\n" -"What's different between what you expected and what actually happened?\n" -"\n" -"Anything else you want to add:\n" -"\n" -"Please review the rest of the bug report below.\n" -"You can delete any lines you don't wish to share.\n" -msgstr "" -"¡Gracias por prepara un reporte de bug de Git!\n" -"Por favor responde las siguientes preguntas para ayudarnos a entender el " -"problema.\n" -"\n" -"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el " -"problema)\n" -"\n" -"¿Qué esperabas que sucediera? (Comportamiento esperado)\n" -"\n" -"¿Qué sucedio en lugar de eso? (Comportamiento real)\n" -"\n" -"¿Qué es diferente entre lo que esperabas y lo que pasó?\n" -"\n" -"Cualquier cosa que quieras agregar:\n" -"\n" -"Por favor revisa el resto del reporte abajo.\n" -"Puedes borrar cualquier línea que no desees compartir.\n" - -#: bugreport.c:136 -msgid "specify a destination for the bugreport file" -msgstr "especificar el destino para el archivo de reporte de bug" - -#: bugreport.c:138 -msgid "specify a strftime format suffix for the filename" -msgstr "especificar el sufijo formato strftime para el nombre del archivo." - -#: bugreport.c:162 -#, c-format -msgid "could not create leading directories for '%s'" -msgstr "no se pudo crear directorios principales para '%s'" - -#: bugreport.c:169 -msgid "System Info" -msgstr "Información del sistema" - -#: bugreport.c:172 -msgid "Enabled Hooks" -msgstr "Activar Hooks" - -#: bugreport.c:180 +#: http-fetch.c:118 #, c-format -msgid "couldn't create a new file at '%s'" -msgstr "no se pudo crear un archivo en '%s'" - -#: bugreport.c:184 -#, c-format -msgid "unable to write to %s" -msgstr "no es posible escribir en %s" - -#: bugreport.c:194 -#, c-format -msgid "Created new report at '%s'.\n" -msgstr "Crear un nuevo reporte en '%s'.\n" - -#: fast-import.c:3100 -#, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Faltan marcas from para el submódulo '%s'" - -#: fast-import.c:3102 -#, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Faltan marcas to para el submódulo '%s'" - -#: fast-import.c:3237 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Se esperaba comando 'mark', se obtuvo %s" - -#: fast-import.c:3242 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "Se esperaba comando 'to', se obtuvo %s" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')" -#: fast-import.c:3334 -msgid "Expected format name:filename for submodule rewrite option" -msgstr "" -"Formato esperado de nombre:nombre de archivo para la opción de sobreescribir " -"submódulo" +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "no es un repositorio git" -#: fast-import.c:3388 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "característica '%s' prohibida en input sin --allow-unsafe-features" +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile requiere --index-pack-args" -#: http-fetch.c:111 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')" +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args solo se puede usar con --packfile" -#: credential-cache--daemon.c:223 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" -"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" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "opciones no manejadas" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "mostrar mensajes de debug en stderr" +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "error al preparar revisiones" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "commit %s no está marcado como alcanzable" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "demasiados commits marcados como alcanzables" @@ -22673,16 +23595,19 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n" -" [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +" [--exec-path [= <path>]] [--html-path] [--man-path] [--info-" +"path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" -" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" -" <comando> [<args>]" +" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" +" [--super-prefix=<ruta>] [--config-env=<nombre>=<envvar>]\n" +" <comando> [<args>]" -#: git.c:35 +#: git.c:36 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" @@ -22694,47 +23619,47 @@ msgstr "" "para leer sobre un subcomando o concepto específico.\n" "Mira 'git help git' para una vista general del sistema." -#: git.c:187 +#: git.c:188 #, c-format msgid "no directory given for --git-dir\n" msgstr "no se entregó directorio para --git-dir\n" -#: git.c:201 +#: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "no se entregó namespace para --namespace\n" -#: git.c:215 +#: git.c:216 #, c-format msgid "no directory given for --work-tree\n" msgstr "no se entregó directorio para --work-tree\n" -#: git.c:229 +#: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "no se entregó prefijo para --super-prefix\n" -#: git.c:251 +#: git.c:252 #, c-format msgid "-c expects a configuration string\n" msgstr "-c espera un string de configuración\n" -#: git.c:289 +#: git.c:292 #, c-format msgid "no directory given for -C\n" msgstr "no se entregó directorio para -C\n" -#: git.c:315 +#: git.c:318 #, c-format msgid "unknown option: %s\n" msgstr "opción %s desconocida\n" -#: git.c:362 +#: git.c:367 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "al expandir el alias '%s':'%s'" -#: git.c:371 +#: git.c:376 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -22743,39 +23668,39 @@ msgstr "" "alias '%s' cambia las variables de entorno.\n" "Puedes usar '!git' en el alias para hacer esto" -#: git.c:378 +#: git.c:383 #, c-format msgid "empty alias for %s" msgstr "alias vacío para %s" -#: git.c:381 +#: git.c:386 #, c-format msgid "recursive alias: %s" msgstr "alias recursivo: %s" -#: git.c:463 +#: git.c:468 msgid "write failure on standard output" msgstr "error de escritura en standard output" -#: git.c:465 +#: git.c:470 msgid "unknown write failure on standard output" msgstr "error desconocido de escritura en standard output" -#: git.c:467 +#: git.c:472 msgid "close failed on standard output" msgstr "cierre falló en standard output" -#: git.c:792 +#: git.c:823 #, 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:842 +#: git.c:873 #, c-format msgid "cannot handle %s as a builtin" msgstr "no se puede manejar %s como un builtin" -#: git.c:855 +#: git.c:886 #, c-format msgid "" "usage: %s\n" @@ -22786,12 +23711,12 @@ msgstr "" "\n" "\n" -#: git.c:875 +#: git.c:906 #, 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:887 +#: git.c:918 #, c-format msgid "failed to run command '%s': %s\n" msgstr "falló al ejecutar comando '%s': %s\n" @@ -22845,137 +23770,137 @@ msgstr "" " preguntaba por: %s\n" " redireccionamiento: %s" -#: remote-curl.c:168 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "quoting inválido en valor de push-option: '%s'" -#: remote-curl.c:295 +#: remote-curl.c:307 #, 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:396 +#: remote-curl.c:408 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:427 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "respuesta de servidor inválida; se obtuvo '%s'" -#: remote-curl.c:487 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "repositorio '%s' no encontrado" -#: remote-curl.c:491 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticación falló para '%s'" -#: remote-curl.c:495 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "no es posible acceder '%s':%s" -#: remote-curl.c:501 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: remote-curl.c:630 +#: remote-curl.c:642 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:642 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "el servidor remoto envió un separador sin estado (stateless)" -#: remote-curl.c:712 +#: remote-curl.c:724 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:742 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: mal caracter de largo de línea: %.4s" -#: remote-curl.c:744 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: packet de respuesta final inesperado" -#: remote-curl.c:820 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "RPC falló; %s" -#: remote-curl.c:860 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "no se puede manejar pushes tan grandes" -#: remote-curl.c:975 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "no se puede desinflar el request; zlib deflate error %d" -#: remote-curl.c:979 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "no se puede desinflar el request; zlib end error %d" -#: remote-curl.c:1029 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "%d bytes de header de longitud fueron recibidos" -#: remote-curl.c:1031 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "%d bytes de cuerpo se siguen esperando" -#: remote-curl.c:1120 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "dump http transport no soporta capacidades superficiales" -#: remote-curl.c:1135 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "fetch falló." -#: remote-curl.c:1183 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "no se puede hacer fetch por sha1 sobre smart http" -#: remote-curl.c:1227 remote-curl.c:1233 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" -#: remote-curl.c:1245 remote-curl.c:1360 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "http transport no soporta %s" -#: remote-curl.c:1281 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "git-http-push falló" -#: remote-curl.c:1466 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" -#: remote-curl.c:1498 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: error leyendo command stream de git" -#: remote-curl.c:1505 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fetch intentado sin un repositorio local" -#: remote-curl.c:1546 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" @@ -22988,11 +23913,11 @@ msgstr "no hay información disponible del compilador\n" msgid "no libc information available\n" msgstr "no hay información disponible de libc\n" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:91 msgid "args" msgstr "args" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "filtrado de objeto" @@ -23013,8 +23938,8 @@ msgid "be more quiet" msgstr "ser más discreto" #: parse-options.h:317 -msgid "use <n> digits to display SHA-1s" -msgstr "usa <n> dígitos para mostrar SHA-1s" +msgid "use <n> digits to display object names" +msgstr "use <n> dígitos para mostrar los nombres de los objetos" #: parse-options.h:336 msgid "how to strip spaces and #comments from message" @@ -23031,11 +23956,11 @@ msgstr "" "con --pathspec-from-file, elementos de pathspec son separados con caracter " "NUL" -#: ref-filter.h:101 +#: ref-filter.h:99 msgid "key" msgstr "clave" -#: ref-filter.h:101 +#: ref-filter.h:99 msgid "field name to sort on" msgstr "nombre del campo por el cuál ordenar" @@ -23045,14 +23970,6 @@ msgstr "" "actualizar el índice con la resolución de conflictos reutilizada si es " "posible" -#: wt-status.h:80 -msgid "HEAD detached at " -msgstr "HEAD desacoplada en " - -#: wt-status.h:81 -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" @@ -23256,533 +24173,505 @@ msgid "Output information on each ref" msgstr "Información de output en cada ref" #: command-list.h:99 +msgid "Run a Git command on a list of repositories" +msgstr "Ejecute un comando de Git en una lista de repositorios" + +#: command-list.h:100 msgid "Prepare patches for e-mail submission" msgstr "Prepara parches para ser enviados por e-mail" -#: command-list.h:100 +#: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Verifica la conectividad y disponibilidad de los objetos en la base de datos" -#: command-list.h:101 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Limpia archivos innecesarios y optimiza el repositorio local" -#: command-list.h:102 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "Extrae el ID de commit de un archivo creado usando git-archive" -#: command-list.h:103 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "Imprime las líneas que concuerdan con el patron" -#: command-list.h:104 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "Una interfaz gráfica portátil para Git" -#: command-list.h:105 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo" -#: command-list.h:106 +#: command-list.h:107 msgid "Display help information about Git" msgstr "Mostrar información sobre Git" -#: command-list.h:107 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "Implementación de lado de servidor de Git por HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Download from a remote Git repository via HTTP" msgstr "Descarga de un repositorio Git remoto vía HTTP" -#: command-list.h:109 +#: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" msgstr "Empuja objetos por HTTP/DAV a otro repositorio" -#: command-list.h:110 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Enviar una colección de parches de stdin a una carpeta IMAP" -#: command-list.h:111 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "Constuye un archivo de índice para un archivo empaquetado existente" -#: command-list.h:112 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe" -#: command-list.h:113 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb" -#: command-list.h:114 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "Agregar o analizar información estructurada en mensajes de commit" -#: command-list.h:115 +#: command-list.h:116 msgid "The Git repository browser" msgstr "El navegador de repositorio Git" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "Muestra los logs de los commits" -#: command-list.h:117 +#: command-list.h:118 msgid "Show information about files in the index and the working tree" msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo" -#: command-list.h:118 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "Lista referencias en un repositorio remoto" -#: command-list.h:119 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "Lista los contenidos de un objeto árbol" -#: command-list.h:120 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Extraer parche y autoría de un único mensaje de e-mail" -#: command-list.h:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "Programa divisor de mbox simple de UNIX" -#: command-list.h:122 +#: command-list.h:123 +msgid "Run tasks to optimize Git repository data" +msgstr "Ejecute tareas para optimizar los datos del repositorio de Git" + +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Junta dos o más historiales de desarrollo juntos" -#: command-list.h:123 +#: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" msgstr "Encuentra un ancestro común bueno para una posible fusión" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Ejecuta una fusión de tres vías en un archivo" -#: command-list.h:125 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "Ejecuta una fusión para archivos que la necesitan" -#: command-list.h:126 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "El programa de ayuda estándar para usar con git-merge-index" -#: command-list.h:127 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Ejecuta las herramientas de fusión de resolución de conflictos para resolver " "conflictos de fusión" -#: command-list.h:128 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "Mostrar fusión de tres vías sin tocar el índice" -#: command-list.h:129 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "Escribe y verifica archivos multi-pack-index" -#: command-list.h:130 -msgid "Creates a tag object" -msgstr "Crea un objeto tag" +#: command-list.h:132 +msgid "Creates a tag object with extra validation" +msgstr "Crea un objeto de etiqueta con validación adicional" -#: command-list.h:131 +#: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" msgstr "Construir un objeto árbol de un texto en formato ls-tree" -#: command-list.h:132 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos" -#: command-list.h:133 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Encontrar nombres simbólicos para revs dados" -#: command-list.h:134 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Agrega o inspecciona objetos nota" -#: command-list.h:135 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "Importar desde y enviar a repositorios Perforce" -#: command-list.h:136 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Crea un archivo de objetos empaquetados" -#: command-list.h:137 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Encuentra archivos empaquetados de manera redundante" -#: command-list.h:138 +#: command-list.h:140 msgid "Pack heads and tags for efficient repository access" msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio" -#: command-list.h:139 -msgid "Routines to help parsing remote repository access parameters" -msgstr "" -"Rutinas para ayudar a analizar los parámetros de acceso del repositorio " -"remoto" - -#: command-list.h:140 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Calcular ID único para un parche" -#: command-list.h:141 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos" -#: command-list.h:142 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Remover objetos extra que ya están en archivos empaquetados" -#: command-list.h:143 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Realiza un fetch e integra con otro repositorio o rama local" -#: command-list.h:144 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Actualiza referencias remotas junto con sus objetos asociados" -#: command-list.h:145 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Aplica un parche quilt en la rama actual" -#: command-list.h:146 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)" -#: command-list.h:147 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Lee información del ábol en el índice" -#: command-list.h:148 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Vuelve a aplicar commits en la punta de otra rama" -#: command-list.h:149 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Recibir lo que es empujado en el respositorio" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Gestionar información de reflog" -#: command-list.h:151 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Gestiona un conjunto de repositorios rastreados" -#: command-list.h:152 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Empaquetar objetos no empaquetados en un repositorio" -#: command-list.h:153 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Crea, lista, borra referencias para reemplazar objetos" -#: command-list.h:154 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Genera un resumen de cambios pendientes" -#: command-list.h:155 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Reutilizar la resolución registrada de fusiones conflictivas" -#: command-list.h:156 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Reinicia el HEAD actual a un estado especifico" -#: command-list.h:157 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Restaurar archivos de árboles de trabajo" -#: command-list.h:158 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Revierte algunos commits existentes" -#: command-list.h:159 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Lista objetos commit en orden cronológico inverso" -#: command-list.h:160 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Seleccionar y masajear los parámetros" -#: command-list.h:161 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Borra archivos del árbol de trabajo y del índice" -#: command-list.h:162 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Envía una colección de parches como e-mails" -#: command-list.h:163 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Empujar objetos por protocolo Git a otro repositorio" -#: command-list.h:164 +#: command-list.h:165 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:165 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Resumir la salida 'git log'" -#: command-list.h:166 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Muestra varios tipos de objetos" -#: command-list.h:167 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Mostrar ramas y sus commits" -#: command-list.h:168 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Mostrar el índice de archivo empaquetado" -#: command-list.h:169 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Listar referencias en el repositorio local" -#: command-list.h:170 +#: command-list.h:171 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:171 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Código de configuración de script de shell común de Git" -#: command-list.h:172 +#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "Inicializa y modifica el sparse-checkout" -#: command-list.h:173 +#: command-list.h:174 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:174 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Agrega contenidos de un archivo al área de staging" -#: command-list.h:175 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Muestra el estado del árbol de trabajo" -#: command-list.h:176 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Eliminar el espacio en blanco innecesario" -#: command-list.h:177 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Inicializa, actualiza o inspecciona submódulos" -#: command-list.h:178 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operación bidireccional entre un repositorio Subversion y Git" -#: command-list.h:179 +#: command-list.h:180 msgid "Switch branches" msgstr "Cambiar branches" -#: command-list.h:180 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Lee, modifica y borra referencias simbólicas" -#: command-list.h:181 +#: command-list.h:182 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:182 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un archivo temporal con contenidos de un blob" -#: command-list.h:183 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objetos de un archivo empaquetado" -#: command-list.h:184 +#: command-list.h:185 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:185 +#: command-list.h:186 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:186 +#: command-list.h:187 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:187 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Enviar archivo a git-archive" -#: command-list.h:188 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Enviar objetos empaquetados a git-fetch-pack" -#: command-list.h:189 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Mostrar una variable lógica de Git" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Verificar firma GPG de commits" -#: command-list.h:191 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Valida archivos Git empaquetados" -#: command-list.h:192 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG de etiquetas" -#: command-list.h:193 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaz web Git (interfaz web para repositorios Git)" -#: command-list.h:194 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Muestra logs con las diferencias que cada commit introduce" -#: command-list.h:195 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Gestiona múltiples árboles de trabajo" -#: command-list.h:196 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Crea un objeto árbol del índice actual" -#: command-list.h:197 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Definiendo atributos por ruta" -#: command-list.h:198 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Interfaz y convenciones de línea de comandos de Git" -#: command-list.h:199 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Un tutorial básico de Git para desarrolladores" -#: command-list.h:200 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Proporcionar nombres de usuario y contraseñas a Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git para usuarios CVS" -#: command-list.h:201 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Afinar la salida de diff" -#: command-list.h:202 +#: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunto mínimo útil de comandos diarios de Git" -#: command-list.h:203 +#: command-list.h:205 msgid "Frequently asked questions about using Git" msgstr "Preguntas frecuentes sobre el uso de Git" -#: command-list.h:204 +#: command-list.h:206 msgid "A Git Glossary" msgstr "Un Glosario de Git" -#: command-list.h:205 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Hooks utilizados por Git" -#: command-list.h:206 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" -#: command-list.h:207 +#: command-list.h:209 +msgid "Map author/committer names and/or E-Mail addresses" +msgstr "" +"Mapear nombres de autor/ nombre de commiter y/o direcciones de correo " +"electrónico" + +#: command-list.h:210 msgid "Defining submodule properties" msgstr "Definiendo las propiedades del submódulo" -#: command-list.h:208 +#: command-list.h:211 msgid "Git namespaces" msgstr "Namespaces de Git" -#: command-list.h:209 +#: command-list.h:212 +msgid "Helper programs to interact with remote repositories" +msgstr "Programas de ayuda para interactuar con repositorios remotos" + +#: command-list.h:213 msgid "Git Repository Layout" msgstr "Disposición del repositorio Git" -#: command-list.h:210 +#: command-list.h:214 msgid "Specifying revisions and ranges for Git" msgstr "Especificando revisiones y rangos para Git" -#: command-list.h:211 +#: command-list.h:215 msgid "Mounting one repository inside another" msgstr "Montando un repositorio dentro de otro" -#: command-list.h:212 +#: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial de introducción a Git: parte dos" -#: command-list.h:213 +#: command-list.h:217 msgid "A tutorial introduction to Git" msgstr "Un tutorial de introducción para Git" -#: command-list.h:214 +#: command-list.h:218 msgid "An overview of recommended workflows with Git" msgstr "Una visión general de flujos de trabajo recomendados con Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Debes iniciar con \"git bisect start\"" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "¿Quieres que lo haga por ti [Y/n]? " - -#: git-bisect.sh:101 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "Mala entrada rev: $arg" - -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Mala entrada rev: $bisected_head" - -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Mala entrada rev: $rev" - -#: 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:209 -msgid "No logfile given" -msgstr "Ningún logfile proporcionado" - -#: git-bisect.sh:210 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "no se puede leer $file para reproducir" - -#: git-bisect.sh:233 -msgid "?? what are you talking about?" -msgstr "?? ¿De qué estás hablando?" - -#: git-bisect.sh:243 +#: git-bisect.sh:68 msgid "bisect run failed: no command provided." msgstr "bisect falló: no se proveyó comando." -#: git-bisect.sh:248 +#: git-bisect.sh:73 #, sh-format msgid "running $command" msgstr "ejecutando $command" -#: git-bisect.sh:255 +#: git-bisect.sh:80 #, sh-format msgid "" "bisect run failed:\n" @@ -23791,27 +24680,23 @@ msgstr "" "bisect falló:\n" "código de salida $res de '$command' es <0 o >=128" -#: git-bisect.sh:281 +#: git-bisect.sh:105 msgid "bisect run cannot continue any more" msgstr "bisect no puede seguir continuando" -#: git-bisect.sh:287 +#: git-bisect.sh:111 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" -"bisect falló:\n" -"'bisect_state $state' salió con código de error $res" +"bisect run falló:\n" +"'bisect-state $state' salió con el código de error $res" -#: git-bisect.sh:294 +#: git-bisect.sh:118 msgid "bisect run success" msgstr "bisect exitoso" -#: git-bisect.sh:302 -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 " @@ -23852,50 +24737,50 @@ 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-submodule.sh:205 +#: git-submodule.sh:179 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:215 +#: git-submodule.sh:189 #, 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:234 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ya existe en el índice" -#: git-submodule.sh:237 +#: git-submodule.sh:211 #, 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:244 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' no tiene un commit checked out" -#: git-submodule.sh:275 +#: git-submodule.sh:249 #, 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:277 +#: git-submodule.sh:251 #, 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:285 +#: git-submodule.sh:259 #, 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:287 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23912,39 +24797,39 @@ msgstr "" "o no estás seguro de lo que esto significa, escoge otro nombre con la opción " "'--name'." -#: git-submodule.sh:293 +#: git-submodule.sh:267 #, 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:305 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No es posible hacer checkout al submódulo '$sm_path'" -#: git-submodule.sh:310 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falló al agregar el submódulo '$sm_path'" -#: git-submodule.sh:319 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falló al registrar el submódulo '$sm_path'" -#: git-submodule.sh:592 +#: git-submodule.sh:568 #, 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:602 +#: git-submodule.sh:578 #, 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:607 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23953,7 +24838,7 @@ msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " "de submódulo '$sm_path'" -#: git-submodule.sh:625 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23962,7 +24847,7 @@ msgstr "" "No es posible realizar fetch en la ruta de submódulo '$displaypath'; " "intentando hacer un fetch directo $sha1:" -#: git-submodule.sh:631 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23971,85 +24856,55 @@ msgstr "" "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " "Fetch directo del commit falló." -#: git-submodule.sh:638 +#: git-submodule.sh:614 #, 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:639 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:643 +#: git-submodule.sh:619 #, 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:644 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:649 +#: git-submodule.sh:625 #, 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:650 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:655 +#: git-submodule.sh:631 #, 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:656 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:687 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:852 -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:904 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "modo $mod_dst inesperado" - -#: git-submodule.sh:924 -#, 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:927 -#, 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:930 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" - -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Véase git-${cmd}(1) para más detalles." - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "Autostash aplicado." @@ -24075,7 +24930,7 @@ msgstr "" msgid "Rebasing ($new_count/$total)" msgstr "Rebasando ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -24115,7 +24970,7 @@ msgstr "" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -24134,83 +24989,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, 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:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nombre de commit inválido: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "No se puede escribir el remplazo sha1 del commit actual" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "No se puede realizar avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "No se puede mover HEAD a $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Rehusando a ejecutar squash en fusión: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Error rehaciendo fusión $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "No se pudo coger $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Este es el mensaje del commit #${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "El mensaje del commit #${n} será ignorado:" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, 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:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No se puede escribir $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Esto es una combinación de 2 commits." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No se puede aplicar $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -24227,31 +25082,31 @@ msgstr "" "problema antes\n" "de que sea capaz de reformular el commit." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Detenido en $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, 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:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Ejecutando: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Ejecución fallida: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 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:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -24262,7 +25117,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -24277,25 +25132,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Comando desconocido: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebasado y actualizado satisfactoriamente." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No se pudo eliminar CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -24326,12 +25181,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 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:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -24339,44 +25194,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:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 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:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "No se pudo ejecutar el editor" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, 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:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "¿Sin HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No se pudo crear $state_dir temporalmente" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "No se pudo marcar como interactivo" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, 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:955 +#: git-rebase--preserve-merges.sh:945 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 +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" @@ -24455,14 +25310,14 @@ msgstr "Incapaz de determinar la ruta absoluta del directorio git" msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, 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:1055 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24470,7 +25325,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el área de stage." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24478,7 +25333,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24486,8 +25341,8 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del área de stage." -#: git-add--interactive.perl:1064 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24495,8 +25350,8 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:1067 git-add--interactive.perl:1070 -#: git-add--interactive.perl:1076 +#: git-add--interactive.perl:1068 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 discarding." @@ -24504,12 +25359,12 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1113 +#: git-add--interactive.perl:1114 #, 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:1120 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -24522,12 +25377,12 @@ msgstr "" "Para eliminar '%s' líneas, bórrelas.\n" "Lineas comenzando con %s serán eliminadas.\n" -#: git-add--interactive.perl:1142 +#: git-add--interactive.perl:1143 #, 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" -#: git-add--interactive.perl:1250 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24542,7 +25397,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1256 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24556,7 +25411,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:1262 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24571,7 +25426,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1268 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24585,7 +25440,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:1274 git-add--interactive.perl:1292 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24599,7 +25454,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:1280 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24613,7 +25468,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:1286 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24627,7 +25482,7 @@ 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:1298 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24641,7 +25496,7 @@ 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:1313 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24663,90 +25518,90 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: git-add--interactive.perl:1344 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "¡Los hunks seleccionados no aplican al índice!\n" -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1478 +#: git-add--interactive.perl:1479 #, perl-format 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:1479 +#: git-add--interactive.perl:1480 #, perl-format 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:1480 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1482 #, perl-format 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:1587 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "No hay más pedazos para el ir\n" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero inválido: '%s'\n" -#: git-add--interactive.perl:1610 +#: git-add--interactive.perl:1622 #, 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:1636 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "No hay más pedazos para buscar\n" -#: git-add--interactive.perl:1653 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp para la búsqueda mal formado %s: %s\n" -#: git-add--interactive.perl:1663 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patrón entregado.\n" -#: git-add--interactive.perl:1675 git-add--interactive.perl:1697 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1684 git-add--interactive.perl:1703 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1709 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "Perdón, no se puede dividir este pedazo\n" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1736 #, 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:1725 +#: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" msgstr "Perdón, no se puede editar este pedazo\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1790 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24766,19 +25621,19 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: git-add--interactive.perl:1807 git-add--interactive.perl:1812 -#: git-add--interactive.perl:1815 git-add--interactive.perl:1822 -#: git-add--interactive.perl:1825 git-add--interactive.perl:1832 -#: git-add--interactive.perl:1836 git-add--interactive.perl:1842 +#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 +#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 +#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1838 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1844 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, se esperaba --" @@ -24795,27 +25650,39 @@ msgstr "el offset del tiempo local es mayor o igual a 24 horas\n" msgid "the editor exited uncleanly, aborting everything" msgstr "el editor se cerro inapropiadamente, abortando todo" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, 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:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contiene el email generado.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases no es compatible con otras opciones.\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"fatal: opciones de configuración encontradas para 'sendmail'\n" +"git-send-email está configurado con las opciones sendemail. * - tenga en " +"cuenta la 'e'.\n" +"Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta " +"verificación.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 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:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -24823,37 +25690,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:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo --suppress-cc desconocido: '%s'\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Configuración --confirm desconocida: '%s'\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, 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:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "peligro: `:include:` no soportado: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, 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:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "advertencia: línea sendmail no reconocida: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -24868,12 +25735,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:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Falló al abrir directorio %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -24882,7 +25749,7 @@ msgstr "" "fatal: %s: %s\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -24892,17 +25759,17 @@ msgstr "" "No se especificaron parches!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "¿No hay línea de subject en %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Falló al abrir para escritura %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -24916,27 +25783,27 @@ msgstr "" "\n" "Limpiar el contenido de body si no deseas mandar un resumen.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Falló al abrir %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Falló al abrir %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 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:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "¿Estás seguro de que deseas usar <%s> [y/N]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -24944,11 +25811,11 @@ msgstr "" "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "¿Que codificación de 8bit debería declarar [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -24961,22 +25828,22 @@ msgstr "" "tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo " "deseas mandar.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "¿A quien se deben mandar los correos (si existe)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' se expande a si mismo\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 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 " "existe alguno)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "error: no es posible extraer una dirección válida de %s\n" @@ -24984,16 +25851,16 @@ 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:1045 +#: git-send-email.perl:1053 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): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Ruta CA \"%s\" no existe" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25021,134 +25888,397 @@ 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:1460 +#: git-send-email.perl:1468 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): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Necesitas mandar esta respuesta de email" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP no esta definido adecuadamente." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "¡El servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "¡Falló STARTTLS! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 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:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Falló al enviar %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Resultado: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, 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:1665 +#: git-send-email.perl:1673 #, 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:1722 +#: git-send-email.perl:1730 #, 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:1757 +#: git-send-email.perl:1765 #, 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:1868 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1875 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1879 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falló al cerrar el pipe para '%s'" -#: git-send-email.perl:1909 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1917 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "codificación de transferencia inválida" -#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1961 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el parche contiene una línea con más de 998 caracteres" -#: git-send-email.perl:1978 +#: git-send-email.perl:1986 #, 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:1982 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "¿Realmente deseas mandar %s?[y|N]: " +#~ msgid "store only" +#~ msgstr "solo guardar" + +#~ msgid "compress faster" +#~ msgstr "comprimir más rápido" + +#~ msgid "compress better" +#~ msgstr "comprimir mejor" + +#~ msgid "unknown hash algorithm length" +#~ msgstr "largo del algoritmo hash desconocido" + +#~ msgid "rev-list died" +#~ msgstr "rev-list murió" + +#~ 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" + +#, c-format +#~ msgid "commit-graph improper chunk offset %08x%08x" +#~ msgstr "offset del chunk de commit-graph inapropiado %08x%08x" + +#, c-format +#~ msgid "commit-graph chunk id %08x appears multiple times" +#~ msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "Escribiendo cambios de ruta del índice de filtros Bloom" + +#~ msgid "Counting distinct commits in commit graph" +#~ msgstr "Contando commits distintos en commit graph" + +#, c-format +#~ msgid "unexpected duplicate commit id %s" +#~ msgstr "id de commit duplicado inesperado %s" + +#, c-format +#~ msgid "the commit graph format cannot write %d commits" +#~ msgstr "el formato de gráficos de commit no pudede escribir %d commits" + +#, c-format +#~ msgid "hash version %u does not match" +#~ msgstr "versión de hash %u no concuerda" + +#~ msgid "invalid chunk offset (too large)" +#~ msgstr "offset inválido del conjunto (muy grande)" + +#~ msgid "error preparing packfile from multi-pack-index" +#~ msgstr "error preparando packfile de multi-pack-index" + +#~ msgid "Writing chunks to multi-pack-index" +#~ msgstr "Escribiendo chunks a multi-pack-index" + +#~ msgid "Remote with no URL" +#~ msgstr "Remoto sin URL" + +#, c-format +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) no toma ningún argumento" + +#, c-format +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "valor positivo esperado objectname:short=%s" + +#, c-format +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "argumento: %s no reconocido %%(objectname)" + +#, c-format +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "opción `%s' es incompatible con --merged" + +#, c-format +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "opción `%s' es incompatible con --no-merged" + +#, c-format +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "no se pudo abrir '%s' para escritura: %s" + +#, c-format +#~ msgid "could not read ref '%s'" +#~ msgstr "no se pudo leer la referencia '%s'" + +#, c-format +#~ msgid "ref '%s' already exists" +#~ msgstr "ref '%s' ya existe" + +#, c-format +#~ msgid "unexpected object ID when writing '%s'" +#~ msgstr "ID de objecto inesperado al escribir '%s'" + +#, c-format +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "ID de objecto inesperado al borrar '%s'" + +#, c-format +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "El algoritmo hash %s no está soportado en este build." + +#, c-format +#~ msgid "%s: not a valid OID" +#~ msgstr "%s no es OID válido" + +#~ msgid "git bisect--helper --next-all [--no-checkout]" +#~ msgstr "git bisect--helper --next-all [--no-checkout]" + +#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>" +#~ msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" + +#~ 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>" + +#~ 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>" + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "no se pudo abrir el archivo BISECT_TERMS" + +#~ msgid "perform 'git bisect next'" +#~ msgstr "realiza 'git bisect next'" + +#~ msgid "write the terms to .git/BISECT_TERMS" +#~ msgstr "escribe los términos a .git/BISECT_TERMS" + +#~ msgid "cleanup the bisection state" +#~ msgstr "limpiar el estado de bisección" + +#~ msgid "check for expected revs" +#~ msgstr "revisar por revs esperados" + +#~ msgid "write out the bisection state in BISECT_LOG" +#~ msgstr "escribir el estado de bisect en BISECT_LOG" + +#~ msgid "check and set terms in a bisection state" +#~ msgstr "revisar y configurar los terms en el estado de bisect" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" + +#~ msgid "--write-terms requires two arguments" +#~ msgstr "--write-terms requiere dos argumentos" + +#~ msgid "--bisect-clean-state requires no arguments" +#~ msgstr "--bisect-clean-state no requiere argumentos" + +#~ msgid "--bisect-write requires either 4 or 5 arguments" +#~ msgstr "--bisect-write requiere entre 4 o 5 argumentos" + +#~ msgid "--check-and-set-terms requires 3 arguments" +#~ msgstr "--bisect-clean-state no requiere argumentos" + +#~ msgid "Force progress reporting" +#~ msgstr "Forzar el reporte de progreso" + +#~ msgid "n,m" +#~ msgstr "n,m" + +#, c-format +#~ msgid "Error deleting remote-tracking branch '%s'" +#~ msgstr "Error al eliminar la rama de rastreo remota '%s'" + +#, c-format +#~ msgid "Error deleting branch '%s'" +#~ msgstr "Error al eliminar la rama '%s'" + +#~ msgid "show parse tree for grep expression" +#~ msgstr "mostrar árbol analizado para la expresión grep" + +#~ msgid "Process line range n,m in file, counting from 1" +#~ msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" + +#~ msgid "name of output directory is too long" +#~ msgstr "nombre del directorio de salida es muy largo" + +#~ msgid "standard output, or directory, which one?" +#~ msgstr "¿salida standard, o directorio, cual?" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "imprimir sólo nombres (sin SHA-1)" + +#~ msgid "too many parameters" +#~ msgstr "demasiados parámetros" + +#~ msgid "too few parameters" +#~ msgstr "muy pocos parámetros" + +#~ msgid "passed to 'git am'" +#~ msgstr "pasado a 'git am'" + +#, 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" + +#, c-format +#~ msgid "failed to remove '%s'" +#~ msgstr "falló al eliminar'%s'" + +#~ msgid "Recurse into nested submodules" +#~ msgstr "Recursar en submódulos anidados" + +#~ msgid "too many params" +#~ msgstr "demasiados parámetros" + +#~ msgid "Routines to help parsing remote repository access parameters" +#~ msgstr "" +#~ "Rutinas para ayudar a analizar los parámetros de acceso del repositorio " +#~ "remoto" + +#, sh-format +#~ msgid "Bad rev input: $bisected_head" +#~ msgstr "Mala entrada rev: $bisected_head" + +#, sh-format +#~ msgid "Bad rev input: $rev" +#~ msgstr "Mala entrada rev: $rev" + +#~ 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" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_src" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" + +#, sh-format +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr "" +#~ " Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" + +#, sh-format +#~ msgid "See git-${cmd}(1) for details." +#~ msgstr "Véase git-${cmd}(1) para más detalles." + #, c-format #~ msgid "Finding commits for commit graph from %d ref" #~ msgid_plural "Finding commits for commit graph from %d refs" @@ -25346,9 +26476,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ 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'" @@ -25386,18 +26513,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ 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" @@ -25414,10 +26529,6 @@ msgstr "¿Realmente deseas mandar %s?[y|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" @@ -25489,12 +26600,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ 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" @@ -25522,9 +26627,6 @@ msgstr "¿Realmente deseas mandar %s?[y|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" |