diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2020-03-12 18:41:56 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2020-03-12 18:41:56 +0800 |
| commit | 25f7d68ba929e91ee892b65ca08399fc69d1ab6a (patch) | |
| tree | b1449891deed45dae430bcc5e14d7600dc8d1ab2 /po | |
| parent | l10n: it.po: update the Italian translation for Git 2.26.0 round 2 (diff) | |
| parent | l10n: es: 2.26.0 round#2 (diff) | |
| download | tgif-25f7d68ba929e91ee892b65ca08399fc69d1ab6a.tar.xz | |
Merge branch of github.com:ChrisADR/git-po into master
* 'next' of github.com:ChrisADR/git-po:
l10n: es: 2.26.0 round#2
Diffstat (limited to 'po')
| -rw-r--r-- | po/es.po | 5529 |
1 files changed, 2979 insertions, 2550 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: 2019-12-30 08:48+0800\n" -"PO-Revision-Date: 2020-01-06 09:12-0500\n" +"POT-Creation-Date: 2020-03-11 15:26+0800\n" +"PO-Revision-Date: 2020-03-11 23:18-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,253 +16,521 @@ 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.2.4\n" +"X-Generator: Poedit 2.3\n" -#: add-interactive.c:347 +#: add-interactive.c:368 #, c-format msgid "Huh (%s)?" msgstr "¿Ahh (%s)?" -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 -#: builtin/rebase.c:2019 builtin/rebase.c:2063 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 +#: builtin/rebase.c:2086 builtin/rebase.c:2130 msgid "could not read index" msgstr "no se pudo leer índice" -#: add-interactive.c:555 git-add--interactive.perl:269 +#: add-interactive.c:576 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binario" -#: add-interactive.c:613 git-add--interactive.perl:278 +#: add-interactive.c:634 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "nada" -#: add-interactive.c:614 git-add--interactive.perl:314 +#: add-interactive.c:635 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "sin cambios" -#: add-interactive.c:651 git-add--interactive.perl:643 +#: add-interactive.c:672 git-add--interactive.perl:643 msgid "Update" msgstr "Actualizar" -#: add-interactive.c:668 add-interactive.c:856 +#: add-interactive.c:689 add-interactive.c:877 #, c-format msgid "could not stage '%s'" msgstr "no se pudo poner en stage '%s'" -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 -#: builtin/rebase.c:895 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 +#: builtin/rebase.c:899 msgid "could not write index" msgstr "no se pudo escribir índice" -#: add-interactive.c:677 git-add--interactive.perl:628 +#: add-interactive.c:698 git-add--interactive.perl:628 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualizada %d ruta\n" msgstr[1] "actualizadas %d rutas\n" -#: add-interactive.c:695 git-add--interactive.perl:678 +#: add-interactive.c:716 git-add--interactive.perl:678 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s no es rastreado ahora.\n" -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 #: builtin/reset.c:144 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry falló para la ruta '%s'" -#: add-interactive.c:730 git-add--interactive.perl:655 +#: add-interactive.c:751 git-add--interactive.perl:655 msgid "Revert" msgstr "Revertir" -#: add-interactive.c:746 +#: add-interactive.c:767 msgid "Could not parse HEAD^{tree}" msgstr "no se pudo analizar HEAD^{tree}" -#: add-interactive.c:784 git-add--interactive.perl:631 +#: add-interactive.c:805 git-add--interactive.perl:631 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertida %d ruta\n" msgstr[1] "revertidas %d rutas\n" -#: add-interactive.c:835 git-add--interactive.perl:695 +#: add-interactive.c:856 git-add--interactive.perl:695 #, c-format msgid "No untracked files.\n" msgstr "No hay archivos sin rastrear.\n" -#: add-interactive.c:839 git-add--interactive.perl:689 +#: add-interactive.c:860 git-add--interactive.perl:689 msgid "Add untracked" msgstr "Agregar no rastreados" -#: add-interactive.c:866 git-add--interactive.perl:625 +#: add-interactive.c:887 git-add--interactive.perl:625 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "agregada %d ruta\n" msgstr[1] "agregadas %d rutas\n" -#: add-interactive.c:896 +#: add-interactive.c:917 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorando lo no fusionado: %s" -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 #, c-format msgid "Only binary files changed.\n" msgstr "Solo cambiaron archivos binarios.\n" -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 #, c-format msgid "No changes.\n" msgstr "Sin cambios.\n" -#: add-interactive.c:914 git-add--interactive.perl:1376 +#: add-interactive.c:935 git-add--interactive.perl:1376 msgid "Patch update" msgstr "Actualización del parche" -#: add-interactive.c:953 git-add--interactive.perl:1754 +#: add-interactive.c:974 git-add--interactive.perl:1754 msgid "Review diff" msgstr "Revisión de diff" -#: add-interactive.c:981 +#: add-interactive.c:1002 msgid "show paths with changes" msgstr "mostrar rutas con cambios" -#: add-interactive.c:983 +#: add-interactive.c:1004 msgid "add working tree state to the staged set of changes" msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage" -#: add-interactive.c:985 +#: add-interactive.c:1006 msgid "revert staged set of changes back to the HEAD version" msgstr "revertir conjunto de cambios en stage a la versión de HEAD" -#: add-interactive.c:987 +#: add-interactive.c:1008 msgid "pick hunks and update selectively" msgstr "elegir hunks y actualizar de forma selectiva" -#: add-interactive.c:989 +#: add-interactive.c:1010 msgid "view diff between HEAD and index" msgstr "ver diff entre HEAD e index" -#: add-interactive.c:991 +#: add-interactive.c:1012 msgid "add contents of untracked files to the staged set of changes" msgstr "" "agregar contenidos de archivos sin rastrear al conjunto de cambios de stage" -#: add-interactive.c:999 add-interactive.c:1048 +#: add-interactive.c:1020 add-interactive.c:1069 msgid "Prompt help:" msgstr "Mostrar ayuda:" -#: add-interactive.c:1001 +#: add-interactive.c:1022 msgid "select a single item" msgstr "selecciona un único objeto" -#: add-interactive.c:1003 +#: add-interactive.c:1024 msgid "select a range of items" msgstr "selecciona un rango de objetos" -#: add-interactive.c:1005 +#: add-interactive.c:1026 msgid "select multiple ranges" msgstr "selecciona multiples rangos" -#: add-interactive.c:1007 add-interactive.c:1052 +#: add-interactive.c:1028 add-interactive.c:1073 msgid "select item based on unique prefix" msgstr "seleccionar objeto basado en prefijo único" -#: add-interactive.c:1009 +#: add-interactive.c:1030 msgid "unselect specified items" msgstr "quitar objetos especificados" -#: add-interactive.c:1011 +#: add-interactive.c:1032 msgid "choose all items" msgstr "escoger todos los objetos" -#: add-interactive.c:1013 +#: add-interactive.c:1034 msgid "(empty) finish selecting" msgstr "(vacío) finalizar selección" -#: add-interactive.c:1050 +#: add-interactive.c:1071 msgid "select a numbered item" msgstr "selecciona un objeto numerado" -#: add-interactive.c:1054 +#: add-interactive.c:1075 msgid "(empty) select nothing" msgstr "(vacío) selecciona nada" -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 msgid "What now" msgstr "Ahora que" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "staged" msgstr "rastreado" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "unstaged" msgstr "no rastreado" -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 msgid "path" msgstr "ruta" -#: add-interactive.c:1122 +#: add-interactive.c:1143 msgid "could not refresh index" msgstr "no se pudo refrescar el index" -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" -#: add-patch.c:15 -#, c-format -msgid "Stage mode change [y,n,a,q,d%s,?]? " -msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? " +#: add-patch.c:33 git-add--interactive.perl:1428 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? " -#: add-patch.c:16 -#, c-format -msgid "Stage deletion [y,n,a,q,d%s,?]? " -msgstr "¿Aplicar stage al borrado [y,n,a,q,d%s,?]? " +#: add-patch.c:34 git-add--interactive.perl:1429 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? " -#: add-patch.c:17 -#, c-format -msgid "Stage this hunk [y,n,a,q,d%s,?]? " -msgstr "¿Aplicar stage a este hunk [y,n,a,q,d%s,?]? " +#: add-patch.c:35 git-add--interactive.perl:1430 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " +"para el área de stage." + +#: add-patch.c:40 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar stage a este hunk\n" +"n - no aplicar stage a este hunk\n" +"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" +"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" +"d - no aplicar stage a este hunk o a ninguno de los posteriores en este " +"archivo\n" + +#: add-patch.c:54 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " + +#: add-patch.c:55 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? " + +#: add-patch.c:56 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " +"para aplicar stash." + +#: add-patch.c:61 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar stash a este hunk\n" +"n - no aplicar stash a este hunk\n" +"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n" +"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" +"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n" + +#: add-patch.c:77 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:78 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:79 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " +"para sacar del área de stage." + +#: add-patch.c:84 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - sacar desde hunk del área de stage\n" +"n - no sacar este hunk del area de stage\n" +"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n" +"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" +"d - no sacar del area de stage este hunk o ninguno de los posteriores en el " +"archivo\n" + +#: add-patch.c:99 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " + +#: add-patch.c:100 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? " + +#: add-patch.c:101 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? " + +#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Si el parche aplica de forma limpia, el hunk editado sera marcado " +"inmediatamente para aplicar." + +#: add-patch.c:106 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar este hunk al índice\n" +"n - no aplicar este hunk al índice\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunko ninguno de los posteriores en el archivo\n" + +#: add-patch.c:121 git-add--interactive.perl:1448 +#: git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:122 git-add--interactive.perl:1449 +#: git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:123 git-add--interactive.perl:1450 +#: git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Si el parche aplica de forma limpia, el hunk editado sera marcado " +"inmediatamente para descarte." + +#: add-patch.c:128 add-patch.c:193 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - descartar este hunk del árbol de trabajo\n" +"n - no descartar este hunk del árbol de trabajo\n" +"q - quit; no descartar este hunk o ninguno de los que restantes\n" +"a - descartar este hunk y todos los posteriores en este archivo\n" +"d - no descartar este hunk o ninguno de los posteriores en el archivo\n" + +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:150 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - descartar este hunk del índice y el árbol de trabajo\n" +"n - no descartar este hunk del índice ni el árbol de trabajo\n" +"q - quit; no descartar este hunk o ninguno de los que quedan\n" +"a - descartar este hunk y todos los posteriores en este archivo\n" +"d - no descartar este hunk o ninguno posterior en el archivo\n" + +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d" +"%s,?]? " + +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " + +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: add-patch.c:171 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar este hunk al índice y al árbol de trabajo\n" +"n - no aplicar este hunk al índice y al árbol de trabajo\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n" + +#: add-patch.c:214 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aplicar este hunk al índice y al árbol de trabajo\n" +"n - no aplicar este hunk al índice y al árbol de trabajo\n" +"q - quit; no aplicar este hunk o ninguno de los restantes\n" +"a - aplicar este hunk y todos los posteriores en el archivo\n" +"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n" -#: add-patch.c:111 +#: add-patch.c:318 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:130 add-patch.c:134 +#: add-patch.c:337 add-patch.c:341 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:176 +#: add-patch.c:395 msgid "could not parse diff" msgstr "no se puede analizar diff" -#: add-patch.c:194 +#: add-patch.c:414 msgid "could not parse colored diff" msgstr "no se pudo analizar diff a colores" -#: add-patch.c:508 +#: add-patch.c:428 +#, c-format +msgid "failed to run '%s'" +msgstr "falló al ejecutar '%s'" + +#: add-patch.c:587 +msgid "mismatched output from interactive.diffFilter" +msgstr "output de interactive.diffFilter no concuerda" + +#: add-patch.c:588 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" +"Tu filtro tiene que mantener correspondencia de uno a uno\n" +"entre las líneas de entrada y salida." + +#: add-patch.c:761 #, c-format msgid "" "expected context line #%d in\n" @@ -271,7 +539,7 @@ msgstr "" "se esperaba línea de contexto #%d en\n" "%.*s" -#: add-patch.c:523 +#: add-patch.c:776 #, c-format msgid "" "hunks do not overlap:\n" @@ -284,11 +552,11 @@ msgstr "" "\tno acaba con:\n" "%.*s" -#: add-patch.c:799 git-add--interactive.perl:1112 +#: add-patch.c:1052 git-add--interactive.perl:1112 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" -#: add-patch.c:803 +#: add-patch.c:1056 #, c-format msgid "" "---\n" @@ -301,16 +569,8 @@ msgstr "" "Para eliminar '%c' líneas, bórrelas.\n" "Lineas comenzando con %c serán eliminadas.\n" -#: add-patch.c:810 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging.\n" -msgstr "" -"Si el parche aplica limpiamente, el hunk editado sera marcado\n" -"inmediatamente para el área de stage.\n" - #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:818 git-add--interactive.perl:1126 +#: add-patch.c:1070 git-add--interactive.perl:1126 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -320,11 +580,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:851 +#: add-patch.c:1103 msgid "could not parse hunk header" msgstr "no se puede analizar hunk header" -#: add-patch.c:895 add-patch.c:1294 +#: add-patch.c:1148 msgid "'git apply --cached' failed" msgstr "falló 'git apply --cached'" @@ -340,29 +600,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:952 git-add--interactive.perl:1239 +#: add-patch.c:1218 git-add--interactive.perl:1239 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/" "n]? " -#: add-patch.c:1009 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this and all the remaining hunks\n" -"d - do not stage this hunk nor any of the remaining hunks\n" -msgstr "" -"y - aplicar stage a este hunk\n" -"n - no aplicar stage a este hunk\n" -"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" -"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" -"d - no aplicar stage a este hunk o a ninguno de los posteriores en este " -"archivo\n" +#: add-patch.c:1261 +msgid "The selected hunks do not apply to the index!" +msgstr "¡Los hunks seleccionados no aplican al índice!" + +#: add-patch.c:1262 git-add--interactive.perl:1343 +msgid "Apply them to the worktree anyway? " +msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? " + +#: add-patch.c:1269 git-add--interactive.perl:1346 +msgid "Nothing was applied.\n" +msgstr "Nada fue aplicado.\n" -#: add-patch.c:1016 +#: add-patch.c:1326 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -384,100 +641,104 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: add-patch.c:1137 add-patch.c:1147 +#: add-patch.c:1447 add-patch.c:1457 msgid "No previous hunk" msgstr "No el anterior hunk" -#: add-patch.c:1142 add-patch.c:1152 +#: add-patch.c:1452 add-patch.c:1462 msgid "No next hunk" msgstr "No el siguiente hunk" -#: add-patch.c:1158 +#: add-patch.c:1468 msgid "No other hunks to goto" msgstr "No hay más pedazos para el ir" -#: add-patch.c:1169 git-add--interactive.perl:1577 +#: add-patch.c:1479 git-add--interactive.perl:1577 msgid "go to which hunk (<ret> to see more)? " msgstr "¿a que hunk ir (<enter> para ver más)? " -#: add-patch.c:1170 git-add--interactive.perl:1579 +#: add-patch.c:1480 git-add--interactive.perl:1579 msgid "go to which hunk? " msgstr "¿a que hunk ir? " -#: add-patch.c:1181 +#: add-patch.c:1491 #, c-format msgid "Invalid number: '%s'" msgstr "Numero inválido: '%s'" -#: add-patch.c:1186 +#: add-patch.c:1496 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Lo siento, solo %d hunk disponible." msgstr[1] "Lo siento, solo %d hunks disponibles." -#: add-patch.c:1195 +#: add-patch.c:1505 msgid "No other hunks to search" msgstr "No hay más pedazos para buscar" -#: add-patch.c:1201 git-add--interactive.perl:1623 +#: add-patch.c:1511 git-add--interactive.perl:1623 msgid "search for regex? " msgstr "¿buscar para regexp? " -#: add-patch.c:1216 +#: add-patch.c:1526 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regexp para la búsqueda mal formado %s: %s" -#: add-patch.c:1233 +#: add-patch.c:1543 msgid "No hunk matches the given pattern" msgstr "No hay hunks que concuerden con el patrón entregado." -#: add-patch.c:1240 +#: add-patch.c:1550 msgid "Sorry, cannot split this hunk" msgstr "Perdón, no se puede dividir este pedazo" -#: add-patch.c:1244 +#: add-patch.c:1554 #, c-format msgid "Split into %d hunks." msgstr "Cortar en %d hunk." -#: add-patch.c:1248 +#: add-patch.c:1558 msgid "Sorry, cannot edit this hunk" msgstr "Perdón, no se puede editar este pedazo" -#: advice.c:111 +#: add-patch.c:1609 +msgid "'git apply' failed" +msgstr "falló 'git apply'" + +#: advice.c:115 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:164 +#: advice.c:168 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." -#: advice.c:166 +#: advice.c:170 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:168 +#: advice.c:172 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:170 +#: advice.c:174 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:172 +#: advice.c:176 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:174 +#: advice.c:178 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No es posible %s porque tienes archivos sin fusionar." -#: advice.c:182 +#: advice.c:186 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -485,23 +746,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:190 +#: advice.c:194 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:195 builtin/merge.c:1332 +#: advice.c:199 builtin/merge.c:1335 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:197 +#: advice.c:201 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:198 +#: advice.c:202 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:204 +#: advice.c:208 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -653,7 +914,8 @@ msgstr[1] "" #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -"la cabecera de git diff carece de información del nombre del archivo (línea %d)" +"la cabecera de git diff carece de información del nombre del archivo (línea " +"%d)" #: apply.c:1481 #, c-format @@ -760,7 +1022,7 @@ msgstr "" msgid "cannot apply binary patch to '%s' without full index line" msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo" -#: apply.c:3162 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -768,284 +1030,284 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3170 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el parche aplica a un '%s' vacío, pero este no lo esta" -#: apply.c:3188 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "la postimagen necesaria %s para '%s' no se puede leer" -#: apply.c:3201 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3207 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " "obtuvo %s)" -#: apply.c:3228 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche falló: %s:%ld" -#: apply.c:3351 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3411 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simbólico" -#: apply.c:3440 apply.c:3683 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3526 apply.c:3698 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el índice" -#: apply.c:3535 apply.c:3706 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el índice" -#: apply.c:3570 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "el repositorio carece del blob necesario para regresar en un merge de tres-" "vías." -#: apply.c:3573 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-vías...\n" -#: apply.c:3589 apply.c:3593 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3605 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Falló el merge en retroceso de tres-vías...\n" -#: apply.c:3619 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3624 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3650 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "parche de eliminación deja contenidos en el archivo" -#: apply.c:3723 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1320 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" -#: apply.c:3934 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el índice" -#: apply.c:3937 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3957 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" -#: apply.c:3962 +#: apply.c:3964 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" -#: apply.c:3982 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' está tras un enlace simbólico" -#: apply.c:3986 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4001 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4093 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta información del sha1 o es inútil para el submódulo %s" -#: apply.c:4100 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" -#: apply.c:4103 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4112 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo añadir %s al índice temporal" -#: apply.c:4122 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4260 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del índice" -#: apply.c:4294 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submódulo %s" -#: apply.c:4300 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4308 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no es posible crear una copia de seguridad para el archivo recién creado %s" -#: apply.c:4314 apply.c:4459 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4357 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir para '%s'" -#: apply.c:4361 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4431 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4529 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4537 +#: apply.c:4539 msgid "internal error" msgstr "error interno" -#: apply.c:4540 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicando parche %%s con %d rechazo..." msgstr[1] "Aplicando parche %%s con %d rechazos..." -#: apply.c:4551 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4573 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4577 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4696 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4704 +#: apply.c:4706 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4724 +#: apply.c:4726 msgid "unable to read index file" msgstr "no es posible leer el archivo índice" -#: apply.c:4881 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4908 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco aplastado" msgstr[1] "%d errores de espacios en blanco aplastados" -#: apply.c:4914 apply.c:4929 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línea agrega errores de espacios en blanco." msgstr[1] "%d líneas agregan errores de espacios en blanco." -#: apply.c:4922 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1054,137 +1316,137 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4966 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4969 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4971 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2260 msgid "num" msgstr "num" -#: apply.c:4972 +#: apply.c:4974 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4975 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4977 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" -#: apply.c:4981 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" -#: apply.c:4983 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" -#: apply.c:4985 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" -#: apply.c:4987 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4989 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4991 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4993 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4996 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4998 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vías si el parche no aplica" -#: apply.c:5000 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información del índice incrustado" -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL" -#: apply.c:5005 +#: apply.c:5007 msgid "ensure at least <n> lines of context match" msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden" -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 msgid "action" msgstr "acción" -#: apply.c:5007 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detectar líneas nuevas o modificadas que contienen errores de espacios en " "blanco" -#: apply.c:5010 apply.c:5013 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5016 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5018 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:5020 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5022 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5025 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar nuevas líneas faltantes detectadas incorrectamente al final del " "archivo" -#: apply.c:5028 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:5030 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2248 msgid "root" msgstr "raíz" -#: apply.c:5031 +#: apply.c:5033 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -1207,7 +1469,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concordó con ninguna carpeta" @@ -1248,8 +1510,8 @@ msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 #: parse-options.h:190 @@ -1285,7 +1547,7 @@ msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "repo" @@ -1324,17 +1586,17 @@ msgstr "Formato de carpeta desconocido '%s'" msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" -#: archive-tar.c:125 archive-zip.c:350 +#: archive-tar.c:125 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "no se puede transmitir el blob %s" -#: archive-tar.c:266 archive-zip.c:368 +#: archive-tar.c:266 archive-zip.c:369 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo de archivo no soportado: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:358 +#: archive-tar.c:293 archive-zip.c:359 #, c-format msgid "cannot read %s" msgstr "no se puede leer %s" @@ -1363,12 +1625,12 @@ msgstr "ruta no válida UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta muy larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: archive-zip.c:614 +#: archive-zip.c:615 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" @@ -1401,12 +1663,12 @@ msgstr "Revisa las comillas en el archivo '%s': %s" msgid "We cannot bisect more!\n" msgstr "¡No podemos biseccionar más!\n" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit válido %s" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1415,7 +1677,7 @@ msgstr "" "La base de fisión %s está mal.\n" "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -1424,7 +1686,7 @@ msgstr "" "La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1433,7 +1695,7 @@ msgstr "" "La base de fisión %s es %s.\n" "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n" -#: bisect.c:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1444,7 +1706,7 @@ msgstr "" "git bisect no puede trabajar bien en este caso.\n" "¿Tal vez confundiste la revisión %s y %s?\n" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1455,36 +1717,36 @@ msgstr "" "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n" "Vamos a continuar de todas maneras." -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Biseccionando: una base de fisión debe ser probada\n" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:149 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "falló leer las refs de bisect" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1493,7 +1755,7 @@ msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1503,7 +1765,7 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1523,10 +1785,10 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "falló la configuración del camino de revisión" @@ -1707,8 +1969,8 @@ msgstr "'%s' no se ve como un archivo bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 -#: builtin/commit.c:811 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 +#: builtin/commit.c:815 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" @@ -1778,13 +2040,13 @@ msgstr "no se puede crear '%s'" msgid "index-pack died" msgstr "index-pack murió" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" @@ -1814,27 +2076,27 @@ msgstr "" "Apapa este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1152 +#: commit.c:1153 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." -#: commit.c:1155 +#: commit.c:1157 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." -#: commit.c:1158 +#: commit.c:1160 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1161 +#: commit.c:1163 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "El Commit %s tiene una buena firma GPG por %s\n" -#: commit.c:1415 +#: commit.c:1417 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1845,261 +2107,261 @@ msgstr "" "variable de configuración i18n.commitencoding para la codificación que usa " "tu proyecto.\n" -#: commit-graph.c:130 +#: commit-graph.c:122 msgid "commit-graph file is too small" msgstr "archivo commit-graph es muy pequeño" -#: commit-graph.c:195 +#: commit-graph.c:189 #, 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:202 +#: commit-graph.c:196 #, 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:209 +#: commit-graph.c:203 #, 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:232 +#: commit-graph.c:226 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "falta tabla de lookup del chunk en commit-graph; el archivo puede estar " "incompleto" -#: commit-graph.c:243 +#: commit-graph.c:237 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset del chunk de commit-graph inapropiado %08x%08x" -#: commit-graph.c:286 +#: commit-graph.c:280 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" -#: commit-graph.c:350 +#: commit-graph.c:343 msgid "commit-graph has no base graphs chunk" msgstr "commit-graph no tiene una chunk base de graphs" -#: commit-graph.c:360 +#: commit-graph.c:353 msgid "commit-graph chain does not match" msgstr "cadena commit-graph no concuerda" -#: commit-graph.c:407 +#: commit-graph.c:401 #, 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:433 +#: commit-graph.c:425 msgid "unable to find all commit-graph files" msgstr "no es posible encontrar los archivos commit-graph" -#: commit-graph.c:564 commit-graph.c:624 +#: commit-graph.c:558 commit-graph.c:618 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "posición de commit inválida. commit-graph está probablemente corrupto" -#: commit-graph.c:585 +#: commit-graph.c:579 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:858 builtin/am.c:1287 +#: commit-graph.c:852 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: commit-graph.c:1017 builtin/pack-objects.c:2641 +#: commit-graph.c:1011 builtin/pack-objects.c:2782 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:1049 +#: commit-graph.c:1043 msgid "Loading known commits in commit graph" msgstr "Cargando commits conocidos en commit graph" -#: commit-graph.c:1066 +#: commit-graph.c:1060 msgid "Expanding reachable commits in commit graph" msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:1085 +#: commit-graph.c:1079 msgid "Clearing commit marks in commit graph" msgstr "Limpiando marcas de commits en commit graph" -#: commit-graph.c:1104 +#: commit-graph.c:1098 msgid "Computing commit graph generation numbers" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1179 +#: commit-graph.c:1173 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Encontrando commits para commit graph en %d pack" msgstr[1] "Encontrando commits para commit graph en %d packs" -#: commit-graph.c:1192 +#: commit-graph.c:1186 #, c-format msgid "error adding pack %s" msgstr "error agregando pack %s" -#: commit-graph.c:1196 +#: commit-graph.c:1190 #, c-format msgid "error opening index for %s" msgstr "error abriendo index para %s" -#: commit-graph.c:1220 +#: commit-graph.c:1214 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Encontrando commits para commit graph de %d ref" msgstr[1] "Encontrando commits para commit graph de %d refs" -#: commit-graph.c:1240 +#: commit-graph.c:1234 #, c-format msgid "invalid commit object id: %s" msgstr "id de objeto commit: %s inválido" -#: commit-graph.c:1255 +#: commit-graph.c:1249 msgid "Finding commits for commit graph among packed objects" msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:1270 +#: commit-graph.c:1264 msgid "Counting distinct commits in commit graph" msgstr "Contando commits distintos en commit graph" -#: commit-graph.c:1300 +#: commit-graph.c:1294 msgid "Finding extra edges in commit graph" msgstr "Encontrando esquinas extra en commit graph" -#: commit-graph.c:1346 +#: commit-graph.c:1340 msgid "failed to write correct number of base graph ids" msgstr "falló al escribir el número correcto de ids de base graph" -#: commit-graph.c:1379 midx.c:814 +#: commit-graph.c:1373 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "no se puede crear '%s'" -#: commit-graph.c:1451 +#: commit-graph.c:1445 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Escribiendo commit graph en %d paso" msgstr[1] "Escribiendo commit graph en %d pasos" -#: commit-graph.c:1492 +#: commit-graph.c:1486 msgid "unable to open commit-graph chain file" msgstr "no se pudo abrir la cadena de archivos commit-graph" -#: commit-graph.c:1504 +#: commit-graph.c:1498 msgid "failed to rename base commit-graph file" msgstr "no se pudo renombrar el archivo base commit-graph" -#: commit-graph.c:1524 +#: commit-graph.c:1518 msgid "failed to rename temporary commit-graph file" msgstr "falló al renombrar el archivo temporal commit-graph" -#: commit-graph.c:1635 +#: commit-graph.c:1631 msgid "Scanning merged commits" msgstr "Escaneando commits fusionados" -#: commit-graph.c:1646 +#: commit-graph.c:1642 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit duplicado inesperado %s" -#: commit-graph.c:1670 +#: commit-graph.c:1665 msgid "Merging commit-graph" msgstr "Fusionando commit-graph" -#: commit-graph.c:1860 +#: commit-graph.c:1844 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "el formato de gráficos de commit no pudede escribir %d commits" -#: commit-graph.c:1871 +#: commit-graph.c:1855 msgid "too many commits to write graph" msgstr "demasiados commits para escribir el gráfico" -#: commit-graph.c:1961 +#: commit-graph.c:1944 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el archivo de commit-graph tiene checksums incorrectos y probablemente está " "corrupto" -#: commit-graph.c:1971 +#: commit-graph.c:1954 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s" -#: commit-graph.c:1981 commit-graph.c:1996 +#: commit-graph.c:1964 commit-graph.c:1979 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u" -#: commit-graph.c:1988 +#: commit-graph.c:1971 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "falló al analizar commit %s para commit-graph" -#: commit-graph.c:2006 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:2020 +#: commit-graph.c:2003 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "falló al analizar el commit %s de la base de datos de objetos para commit-" "graph" -#: commit-graph.c:2027 +#: commit-graph.c:2010 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s" -#: commit-graph.c:2037 +#: commit-graph.c:2020 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "lista padre de commit-graph para commit %s es muy larga" -#: commit-graph.c:2046 +#: commit-graph.c:2029 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:2059 +#: commit-graph.c:2042 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "lista padre de commit-graph para commit %s termina antes" -#: commit-graph.c:2064 +#: commit-graph.c:2047 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" "commit-graph ha generado número cero para %s, pero no-cero para los demás" -#: commit-graph.c:2068 +#: commit-graph.c:2051 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" "commit-graph tiene generación no-cero para %s, pero cero para los demás" -#: commit-graph.c:2083 +#: commit-graph.c:2066 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "generación commit-graph para commit %s es %u != %u" -#: commit-graph.c:2089 +#: commit-graph.c:2072 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2148,7 +2410,7 @@ msgstr "llave no contiene una sección: %s" msgid "key does not contain variable name: %s" msgstr "llave no contiene el nombre de variable: %s" -#: config.c:406 sequencer.c:2530 +#: config.c:406 sequencer.c:2444 #, c-format msgid "invalid key: %s" msgstr "llave inválida: %s" @@ -2286,7 +2548,7 @@ msgstr "valor malformado para %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1518 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3541 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" @@ -2311,106 +2573,106 @@ msgstr "no se posible resolver configuración de blob '%s'" msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1745 +#: config.c:1743 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2096 +#: config.c:2097 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2266 +#: config.c:2267 #, c-format msgid "Invalid %s: '%s'" msgstr "Inválido %s: '%s'" -#: config.c:2311 +#: config.c:2312 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" -#: config.c:2357 +#: config.c:2358 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2359 +#: config.c:2360 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" -#: config.c:2440 +#: config.c:2441 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2472 +#: config.c:2473 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2501 +#: config.c:2502 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2753 config.c:3077 +#: config.c:2754 config.c:3078 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2764 +#: config.c:2765 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2799 builtin/config.c:328 +#: config.c:2800 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:2824 +#: config.c:2825 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:2837 config.c:3090 +#: config.c:2838 config.c:3091 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:2848 +#: config.c:2849 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2857 config.c:3095 +#: config.c:2858 config.c:3096 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:2942 config.c:3192 +#: config.c:2943 config.c:3193 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:2976 +#: config.c:2977 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2978 builtin/remote.c:781 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3068 +#: config.c:3069 #, c-format msgid "invalid section name: %s" msgstr "sección de nombre inválida: %s" -#: config.c:3235 +#: config.c:3236 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2575,19 +2837,19 @@ msgstr "ruta extraña '%s' bloqueada" msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:101 +#: connected.c:110 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:121 +#: connected.c:130 msgid "failed write to rev-list" msgstr "falló escribir a rev-list" -#: connected.c:128 +#: connected.c:137 msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" @@ -2905,7 +3167,7 @@ msgid "invalid --stat value: %s" msgstr "valor --stat inválido: %s" #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:199 parse-options.c:203 +#: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numérico" @@ -3437,61 +3699,61 @@ msgstr "" "tal vez quieras configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:554 +#: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git" -#: dir.c:664 +#: dir.c:695 dir.c:724 dir.c:737 #, c-format msgid "unrecognized pattern: '%s'" msgstr "patrón desconocido: '%s'" -#: dir.c:682 dir.c:696 +#: dir.c:754 dir.c:768 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "patrón negativo no reconocido: '%s'" -#: dir.c:714 +#: dir.c:786 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido" -#: dir.c:724 +#: dir.c:796 msgid "disabling cone pattern matching" msgstr "deshabilitar coincidencia de patrónes cono" -#: dir.c:1101 +#: dir.c:1173 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusión" -#: dir.c:2078 +#: dir.c:2144 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2415 +#: dir.c:2479 msgid "failed to get kernel name and information" msgstr "falló al conseguir la información y nombre del kernel" -#: dir.c:2539 +#: dir.c:2603 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache está desactivado en este sistema o ubicación" -#: dir.c:3343 +#: dir.c:3407 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo índice corrompido en repositorio %s" -#: dir.c:3388 dir.c:3393 +#: dir.c:3452 dir.c:3457 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3422 +#: dir.c:3486 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -3737,7 +3999,7 @@ msgstr "error procesando refs deseadas: %d" msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1785 builtin/clone.c:688 +#: fetch-pack.c:1785 builtin/clone.c:689 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" @@ -3751,19 +4013,19 @@ msgstr "no existe ref remota %s" msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" -#: gpg-interface.c:223 +#: gpg-interface.c:408 +msgid "gpg failed to sign the data" +msgstr "gpg falló al firmar la data" + +#: gpg-interface.c:434 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:226 +#: gpg-interface.c:437 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falló al escribir la firma separada para '%s'" -#: gpg-interface.c:390 -msgid "gpg failed to sign the data" -msgstr "gpg falló al firmar la data" - #: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" @@ -3777,18 +4039,18 @@ msgstr "" "el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es " "soportado con -P bajo PCRE v2" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falló al marcar '%s'" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -4003,7 +4265,7 @@ msgstr "no se puede tener un nombre vacío (para <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:436 builtin/commit.c:631 +#: ident.c:436 builtin/commit.c:635 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inválido: %s" @@ -4088,111 +4350,111 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 -#: builtin/stash.c:264 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit erróneo)\n" -#: merge-recursive.c:390 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión." -#: merge-recursive.c:399 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión." -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "falló al crear la ruta '%s'%s" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": ¿tal vez un conflicto D/F?" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "rehusando perder el archivo rastreado en '%s'" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "falló al abrir '%s': %s" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "falló al crear el enlace simbólico '%s': %s" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se que hacer con %06o %s '%s'" -#: merge-recursive.c:1199 +#: 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:1206 +#: 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:1213 +#: 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:1221 merge-recursive.c:1233 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:" -#: merge-recursive.c:1224 merge-recursive.c:1236 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rápido en submódulo %s" -#: merge-recursive.c:1259 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)" -#: merge-recursive.c:1263 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)" -#: merge-recursive.c:1264 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" -#: merge-recursive.c:1267 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4209,33 +4471,33 @@ msgstr "" "\n" "el cual aceptará esta sugerencia.\n" -#: merge-recursive.c:1276 +#: 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:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Falló al ejecutar la fusión interna" -#: merge-recursive.c:1354 +#: 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:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1410 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en " "cambio." -#: merge-recursive.c:1482 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4244,7 +4506,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s " "en el árbol." -#: merge-recursive.c:1487 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4253,7 +4515,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol." -#: merge-recursive.c:1494 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4262,7 +4524,7 @@ msgstr "" "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " "dejada en el árbol, en %s." -#: merge-recursive.c:1499 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4271,44 +4533,44 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol en %s." -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" -#: merge-recursive.c:1624 +#: merge-recursive.c:1587 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Rehusando perder el archivo no rastreado en %s, incluso aunque se está " "interponiendo." -#: merge-recursive.c:1682 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s es un directorio en %s agregando como %s más bien" -#: merge-recursive.c:1718 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio" -#: merge-recursive.c:1737 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4317,18 +4579,18 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1742 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1851 +#: merge-recursive.c:1793 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:2114 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4339,7 +4601,7 @@ msgstr "" "colocar %s porque el directorio %s fue renombrado a otros múltiples " "directorios, sin ningún que contenga la mayoría de archivos." -#: merge-recursive.c:2146 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4349,7 +4611,7 @@ msgstr "" "existente en %s se interpone con el cambio de nombres implícito, poniendo " "la(s) siguiente(s) ruta(s) aquí: %s." -#: merge-recursive.c:2156 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4358,7 +4620,7 @@ msgstr "" "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta " "para %s; cambio de nombre implícito intentó poner estas rutas: %s" -#: merge-recursive.c:2248 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4367,7 +4629,7 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2493 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4376,52 +4638,52 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-recursive.c:3019 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-recursive.c:3022 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-recursive.c:3086 +#: merge-recursive.c:3028 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3086 +#: merge-recursive.c:3028 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3098 +#: merge-recursive.c:3040 msgid "content" msgstr "contenido" -#: merge-recursive.c:3102 +#: merge-recursive.c:3044 msgid "add/add" msgstr "agregar/agregar" -#: merge-recursive.c:3125 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3147 git-submodule.sh:993 +#: merge-recursive.c:3089 git-submodule.sh:1003 msgid "submodule" msgstr "submódulo" -#: merge-recursive.c:3148 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusión en %s" -#: merge-recursive.c:3178 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:3261 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4430,7 +4692,7 @@ msgstr "" "Path actualizado: %s agregado en %s dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-recursive.c:3264 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4439,7 +4701,7 @@ 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:3268 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4448,7 +4710,7 @@ 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:3271 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4458,61 +4720,61 @@ msgstr "" "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " "movido a %s." -#: merge-recursive.c:3385 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3408 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3413 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3420 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " "%s" -#: merge-recursive.c:3429 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3438 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3482 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "¡Ya está actualizado!" -#: merge-recursive.c:3491 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:3595 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3608 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "se encontró %u ancestro común:" msgstr[1] "se encontraron %u ancestros comunes:" -#: merge-recursive.c:3658 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3717 +#: merge-recursive.c:3659 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4522,12 +4784,12 @@ msgstr "" "merge:\n" " %s" -#: merge-recursive.c:3814 +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -4764,27 +5026,32 @@ msgstr "el objeto %s tiene un id de tipo desconocido %d" msgid "unable to parse object: %s" msgstr "incapaz de analizar objeto: %s" -#: object.c:266 object.c:277 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1888 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)" -#: packfile.c:1892 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset más allá del índice de fin de paquete para %s (¿índice truncado?)" +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#, c-format +msgid "unable to get size of %s" +msgstr "no se pudo obtener el tamaño de %s" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4800,7 +5067,7 @@ msgstr "%s es incompatible con %s" msgid "%s : incompatible with something else" msgstr "%s : incompatible con otra cosa" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s no toma valores" @@ -4810,41 +5077,41 @@ msgstr "%s no toma valores" msgid "%s isn't available" msgstr "%s no está disponible" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" +msgid "did you mean `--%s` (with two dashes)?" msgstr "¿quisiste decir `--%s` (con dos guiones)?" -#: parse-options.c:860 +#: parse-options.c:857 #, c-format msgid "unknown option `%s'" msgstr "opción `%s' desconocida" -#: parse-options.c:862 +#: parse-options.c:859 #, c-format msgid "unknown switch `%c'" msgstr "switch desconocido `%c'" -#: parse-options.c:864 +#: parse-options.c:861 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opción desconocida en string no ascii: `%s'" -#: parse-options.c:888 +#: parse-options.c:885 msgid "..." msgstr "..." -#: parse-options.c:907 +#: parse-options.c:904 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -4852,21 +5119,21 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:910 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:916 +#: parse-options.c:913 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:955 +#: parse-options.c:952 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:969 +#: parse-options.c:966 #, c-format msgid "alias of --%s" msgstr "alias de --%s" @@ -4953,25 +5220,25 @@ msgstr "%s: 'literal' y 'glob' son incompatibles" #: pathspec.c:442 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' está fuera del repositorio" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: '%s' está fuera del repositorio en '%s'" -#: pathspec.c:516 +#: pathspec.c:517 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (nemotécnico: '%c')" -#: pathspec.c:526 +#: pathspec.c:527 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec no soportado por este comando: %s" -#: pathspec.c:593 +#: pathspec.c:594 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" -#: pathspec.c:638 +#: pathspec.c:639 #, c-format msgid "line is badly quoted: %s" msgstr "la línea está mál citada: %s" @@ -5057,7 +5324,7 @@ msgstr "no se pudo comenzar `log`" msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:96 sequencer.c:5163 +#: range-diff.c:96 sequencer.c:5020 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" @@ -5111,16 +5378,16 @@ msgstr "no es posible agregar '%s' al index" msgid "unable to stat '%s'" msgstr "incapaz de correr stat en '%s'" -#: read-cache.c:1325 +#: read-cache.c:1330 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' parece ser un directorio y un archivo a la vez" -#: read-cache.c:1531 +#: read-cache.c:1536 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1646 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5129,7 +5396,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1656 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5138,150 +5405,161 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1712 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1715 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "mala versión del índice %d" -#: read-cache.c:1724 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1754 +#: read-cache.c:1759 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index usa %.4s extensiones, cosa que no entendemos" -#: read-cache.c:1756 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensión %.4s" -#: read-cache.c:1793 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de index desconocido 0x%08x" -#: read-cache.c:1809 +#: read-cache.c:1814 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nombre malformado en el index, cerca a ruta '%s'" -#: read-cache.c:1866 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1869 +#: read-cache.c:1874 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "múltiples entradas extrañas para archivo fusionado '%s'" -#: read-cache.c:1872 +#: read-cache.c:1877 #, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "archivo índice corrompido" -#: read-cache.c:2119 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2132 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entires: %s" -#: read-cache.c:2165 +#: read-cache.c:2170 #, c-format msgid "%s: index file open failed" msgstr "%s: falló al abrir el archivo index" -#: read-cache.c:2169 +#: read-cache.c:2174 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: no se puede hacer stat del index abierto" -#: read-cache.c:2173 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index más pequeño de lo esperado" -#: read-cache.c:2177 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "%s: no se pudo mapear el archivo index" -#: read-cache.c:2219 +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2246 +#: read-cache.c:2251 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2278 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "no se pudo refrescar el index compartido '%s'" -#: read-cache.c:2325 +#: read-cache.c:2330 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index roto, se esperaba %s en %s, se obtuvo %s" -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:3137 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3149 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3174 +#: read-cache.c:3179 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3323 +#: read-cache.c:3328 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: no se puede eliminar a stage #0" -#: rebase-interactive.c:26 +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git " +"rebase --continue'.\n" +"O se puede abortar el rebase con 'git rebase --abort'.\n" + +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -5323,14 +5601,14 @@ msgstr "" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase %s en %s (%d comando)" msgstr[1] "Rebase %s en %s (%d comandos)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5338,7 +5616,7 @@ msgstr "" "\n" "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5346,7 +5624,7 @@ msgstr "" "\n" "Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5360,7 +5638,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5370,22 +5648,19 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Tenga en cuenta que los commits vacíos están comentados" - -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 +#: builtin/rebase.c:234 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "no se pudo copiar '%s' a '%s'." +msgid "could not write '%s'." +msgstr "no se pudo escribir '%s'." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5394,7 +5669,7 @@ msgstr "" "Peligro: algunos commits pueden haber sido botados de forma accidental.\n" "Commits botados (empezando con el más nuevo):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5412,6 +5687,13 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 +#: builtin/rebase.c:246 +#, c-format +msgid "could not read '%s'." +msgstr "no se puede leer '%s'." + #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5447,15 +5729,15 @@ msgstr "ref '%s' ya existe" msgid "unexpected object ID when writing '%s'" msgstr "ID de objecto inesperado al escribir '%s'" -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 #: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "no se pudo escribir en '%s'" -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1031 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:1029 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" @@ -5509,18 +5791,18 @@ msgstr "'%s' existe; no se puede crear '%s'" 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:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "no se pudo eliminar la referencia %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" @@ -5785,45 +6067,45 @@ msgstr "opción '%s' debe apuntar a un commit" msgid "config remote shorthand cannot begin with '/': %s" msgstr "config remote shorthand no puede comenzar con '/': %s" -#: remote.c:413 +#: remote.c:414 msgid "more than one receivepack given, using the first" msgstr "más de un receivepack dado, usando el primero" -#: remote.c:421 +#: remote.c:422 msgid "more than one uploadpack given, using the first" msgstr "más de un uploadpack dado, usando el primero" -#: remote.c:611 +#: remote.c:612 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:615 +#: remote.c:616 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:619 +#: remote.c:620 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:687 +#: remote.c:688 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "llave '%s' de patrón no tuvo '*'" -#: remote.c:697 +#: remote.c:698 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "valor '%s' del patrón no tiene '*'" -#: remote.c:1003 +#: remote.c:1004 #, c-format msgid "src refspec %s does not match any" msgstr "src refsoec %s: no concuerda con ninguno" -#: remote.c:1008 +#: remote.c:1009 #, c-format msgid "src refspec %s matches more than one" msgstr "src refspec %s concuerda con más de uno" @@ -5832,7 +6114,7 @@ msgstr "src refspec %s concuerda con más de uno" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1023 +#: remote.c:1024 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5856,7 +6138,7 @@ msgstr "" "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el " "full ref." -#: remote.c:1043 +#: remote.c:1044 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5867,7 +6149,7 @@ msgstr "" "¿Quisiste crear un branch nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1048 +#: remote.c:1049 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5878,7 +6160,7 @@ msgstr "" "Did you mean to create a new tag by pushing to\n" "'%s:refs/tags/%s'?" -#: remote.c:1053 +#: remote.c:1054 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5889,7 +6171,7 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1058 +#: remote.c:1059 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5900,115 +6182,115 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1094 +#: remote.c:1095 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s no puede ser resolver a un branch" -#: remote.c:1105 +#: remote.c:1106 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no es posible borrar '%s': ref remoto no existe" -#: remote.c:1117 +#: remote.c:1118 #, c-format msgid "dst refspec %s matches more than one" msgstr "dst refspec %s concuerda con más de uno" -#: remote.c:1124 +#: remote.c:1125 #, c-format msgid "dst ref %s receives from more than one src" msgstr "dst ref %s recibe de más de un src" -#: remote.c:1627 remote.c:1728 +#: remote.c:1628 remote.c:1729 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1636 +#: remote.c:1637 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1639 +#: remote.c:1640 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1645 +#: remote.c:1646 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" -#: remote.c:1660 +#: remote.c:1661 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" -#: remote.c:1672 +#: remote.c:1673 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1682 +#: remote.c:1683 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1695 +#: remote.c:1696 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1717 +#: remote.c:1718 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino único" -#: remote.c:1843 +#: remote.c:1844 #, c-format msgid "couldn't find remote ref %s" msgstr "no se puedo encontrar ref remota %s" -#: remote.c:1856 +#: remote.c:1857 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorando ref graciosa '%s' localmente" -#: remote.c:2019 +#: remote.c:2020 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n" -#: remote.c:2023 +#: remote.c:2024 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2026 +#: remote.c:2027 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:2030 +#: remote.c:2031 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Tu rama y '%s' refieren a commits diferentes.\n" -#: remote.c:2033 +#: remote.c:2034 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" para detalles)\n" -#: remote.c:2037 +#: remote.c:2038 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n" msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" -#: remote.c:2043 +#: remote.c:2044 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2046 +#: remote.c:2047 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6018,11 +6300,11 @@ msgstr[0] "" msgstr[1] "" "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:2054 +#: remote.c:2055 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2057 +#: remote.c:2058 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6037,11 +6319,11 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2067 +#: remote.c:2068 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" -#: remote.c:2250 +#: remote.c:2251 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no se puede leer el nombre de objeto '%s'" @@ -6056,7 +6338,7 @@ msgstr "mal nombre de ref de reemplazo: %s" msgid "duplicate replace ref: %s" msgstr "duplicar ref de reemplazo: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "remplazar profundiad muy elevada para objeto %s" @@ -6119,8 +6401,8 @@ msgstr "no se puede desvincular stray '%s'" msgid "Recorded preimage for '%s'" msgstr "Resolución precargada para '%s'" -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -6171,16 +6453,16 @@ msgstr "--first-parent es incompatible con --bisect" 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:762 +#: run-command.c:763 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" -#: run-command.c:1268 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" -#: run-command.c:1332 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6229,39 +6511,39 @@ msgstr "el destino no soporta push atómicos (--atomic)" msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:189 +#: sequencer.c:191 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit inválido, modo cleanup '%s'" -#: sequencer.c:294 +#: sequencer.c:296 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "no se pudo eliminar'%s'" -#: sequencer.c:323 +#: sequencer.c:325 msgid "revert" msgstr "revertir" -#: sequencer.c:325 +#: sequencer.c:327 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:327 -msgid "rebase -i" -msgstr "rebase -i" - #: sequencer.c:329 +msgid "rebase" +msgstr "rebase" + +#: sequencer.c:331 #, c-format msgid "unknown action: %d" msgstr "acción desconocida: %d" -#: sequencer.c:387 +#: sequencer.c:389 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6269,7 +6551,7 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:390 +#: sequencer.c:392 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6279,114 +6561,110 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:403 sequencer.c:2993 +#: sequencer.c:405 sequencer.c:2901 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:410 +#: sequencer.c:412 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 -#: sequencer.c:3277 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 +#: sequencer.c:3185 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 -#: builtin/rebase.c:589 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 +#: builtin/rebase.c:593 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: sequencer.c:464 +#: sequencer.c:466 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:468 +#: sequencer.c:470 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:500 +#: sequencer.c:502 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" -#: sequencer.c:539 builtin/tag.c:565 +#: sequencer.c:541 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:633 +#: sequencer.c:635 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:650 +#: sequencer.c:652 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de la caché" -#: sequencer.c:664 +#: sequencer.c:666 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:744 +#: sequencer.c:746 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:755 +#: sequencer.c:757 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:802 +#: sequencer.c:804 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:807 +#: sequencer.c:809 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:812 +#: sequencer.c:814 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:816 +#: sequencer.c:818 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:825 +#: sequencer.c:827 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:902 sequencer.c:1427 -msgid "malformed ident line" -msgstr "línea de entrada mal formada" - -#: sequencer.c:925 +#: sequencer.c:876 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6416,11 +6694,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1218 +#: sequencer.c:1148 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' falló" -#: sequencer.c:1224 +#: sequencer.c:1154 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6447,7 +6725,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1237 +#: sequencer.c:1167 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6471,329 +6749,324 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1279 +#: sequencer.c:1209 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: sequencer.c:1281 +#: sequencer.c:1211 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: sequencer.c:1327 +#: sequencer.c:1257 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1329 +#: sequencer.c:1259 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1333 +#: sequencer.c:1263 msgid " (root-commit)" msgstr " (commit-raíz)" -#: sequencer.c:1354 +#: sequencer.c:1284 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1356 +#: sequencer.c:1286 #, c-format msgid "HEAD %s is not a commit!" msgstr "¡HEAD %s no es un commit!" -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1411 sequencer.c:2055 +#: sequencer.c:1342 sequencer.c:1968 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1431 -msgid "corrupted author without date information" -msgstr "autor corrupto sin información de fecha" - -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: sequencer.c:1480 sequencer.c:1550 +#: sequencer.c:1386 sequencer.c:1447 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 +#: builtin/merge.c:911 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1577 +#: sequencer.c:1474 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1582 +#: sequencer.c:1479 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1656 sequencer.c:1767 +#: sequencer.c:1562 sequencer.c:1673 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1714 sequencer.c:1739 +#: sequencer.c:1620 sequencer.c:1645 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:1724 +#: sequencer.c:1630 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1726 sequencer.c:3304 +#: sequencer.c:1632 sequencer.c:3212 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1728 +#: sequencer.c:1634 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1734 +#: sequencer.c:1640 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1749 +#: sequencer.c:1655 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1756 +#: sequencer.c:1662 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1762 +#: sequencer.c:1668 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:1850 +#: sequencer.c:1756 msgid "your index file is unmerged." msgstr "tu archivo índice no está fusionado." -#: sequencer.c:1857 +#: sequencer.c:1763 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raíz" -#: sequencer.c:1876 +#: sequencer.c:1782 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "el commit %s es una fusión pero no se proporcionó la opción -m." -#: sequencer.c:1884 sequencer.c:1892 +#: sequencer.c:1790 sequencer.c:1798 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1898 +#: sequencer.c:1804 #, c-format msgid "cannot get commit message for %s" msgstr "no se puede obtener el mensaje de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1917 +#: sequencer.c:1823 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1982 +#: sequencer.c:1888 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:2037 +#: sequencer.c:1943 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:2038 +#: sequencer.c:1944 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:2105 +#: sequencer.c:1961 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n" + +#: sequencer.c:2018 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falló al leer el índice" -#: sequencer.c:2112 +#: sequencer.c:2025 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falló al refrescar el índice" -#: sequencer.c:2189 +#: sequencer.c:2102 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2198 +#: sequencer.c:2111 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2235 +#: sequencer.c:2142 #, c-format -msgid "could not parse '%.*s'" -msgstr "no se puede analizar '%.*s'" +msgid "could not parse '%s'" +msgstr "no se puede analizar '%s'" -#: sequencer.c:2289 +#: sequencer.c:2203 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:2300 +#: sequencer.c:2214 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 -#: builtin/rebase.c:223 builtin/rebase.c:248 -#, c-format -msgid "could not read '%s'." -msgstr "no se puede leer '%s'." - -#: sequencer.c:2384 +#: sequencer.c:2298 msgid "cancelling a cherry picking in progress" msgstr "cancelando cherry-pick en progreso" -#: sequencer.c:2391 +#: sequencer.c:2305 msgid "cancelling a revert in progress" msgstr "cancelando revert en progreso" -#: sequencer.c:2435 +#: sequencer.c:2349 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2437 +#: sequencer.c:2351 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2442 +#: sequencer.c:2356 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:2453 +#: sequencer.c:2367 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2455 +#: sequencer.c:2369 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2533 +#: sequencer.c:2447 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido para %s: %s" -#: sequencer.c:2630 +#: sequencer.c:2540 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2646 +#: sequencer.c:2556 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2736 sequencer.c:4463 +#: sequencer.c:2644 sequencer.c:4361 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:2752 +#: sequencer.c:2660 msgid "revert is already in progress" msgstr "revert ya está en progreso" -#: sequencer.c:2754 +#: sequencer.c:2662 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" -#: sequencer.c:2757 +#: sequencer.c:2665 msgid "cherry-pick is already in progress" msgstr "cherry-pick ya está en progreso" -#: sequencer.c:2759 +#: sequencer.c:2667 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2773 +#: sequencer.c:2681 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2788 +#: sequencer.c:2696 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2848 sequencer.c:4209 +#: sequencer.c:2756 sequencer.c:4099 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:2850 sequencer.c:2861 +#: sequencer.c:2758 sequencer.c:2769 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2852 sequencer.c:2896 +#: sequencer.c:2760 sequencer.c:2804 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2882 builtin/grep.c:736 +#: sequencer.c:2790 builtin/grep.c:724 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2884 +#: sequencer.c:2792 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2885 +#: sequencer.c:2793 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2891 +#: sequencer.c:2799 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto" -#: sequencer.c:2902 +#: sequencer.c:2810 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!" -#: sequencer.c:2943 +#: sequencer.c:2851 msgid "no revert in progress" msgstr "no hay revert en progreso" -#: sequencer.c:2951 +#: sequencer.c:2859 msgid "no cherry-pick in progress" msgstr "ningún cherry-pick en progreso" -#: sequencer.c:2961 +#: sequencer.c:2869 msgid "failed to skip the commit" msgstr "falló al escribir el commit" -#: sequencer.c:2968 +#: sequencer.c:2876 msgid "there is nothing to skip" msgstr "no hay nada que saltar" -#: sequencer.c:2971 +#: sequencer.c:2879 #, c-format msgid "" "have you committed already?\n" @@ -6802,21 +7075,21 @@ msgstr "" "¿ya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:3095 sequencer.c:4121 +#: sequencer.c:3003 sequencer.c:4011 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:3134 sequencer.c:4101 +#: sequencer.c:3042 sequencer.c:3991 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:3151 +#: sequencer.c:3059 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3159 +#: sequencer.c:3067 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6835,22 +7108,22 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3169 +#: sequencer.c:3077 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:3176 +#: sequencer.c:3084 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3221 +#: sequencer.c:3129 #, c-format msgid "" "execution failed: %s\n" @@ -6865,11 +7138,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3227 +#: sequencer.c:3135 msgid "and made changes to the index and/or the working tree\n" msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" -#: sequencer.c:3233 +#: sequencer.c:3141 #, c-format msgid "" "execution succeeded: %s\n" @@ -6886,72 +7159,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3294 +#: sequencer.c:3202 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3348 +#: sequencer.c:3256 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:3353 +#: sequencer.c:3261 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: sequencer.c:3436 +#: sequencer.c:3344 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3467 +#: sequencer.c:3375 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3489 +#: sequencer.c:3397 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3498 +#: sequencer.c:3406 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3510 +#: sequencer.c:3418 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]" -#: sequencer.c:3526 +#: sequencer.c:3434 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3688 +#: sequencer.c:3594 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3704 +#: sequencer.c:3610 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:3773 builtin/rebase.c:733 +#: sequencer.c:3679 builtin/rebase.c:737 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3785 +#: sequencer.c:3691 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6963,31 +7236,26 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3849 -#, c-format -msgid "could not checkout %s" -msgstr "no se puede hacer checkout a %s" - -#: sequencer.c:3863 +#: sequencer.c:3755 #, c-format msgid "%s: not a valid OID" msgstr "%s no es OID válido" -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3883 +#: sequencer.c:3775 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3885 +#: sequencer.c:3777 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3893 +#: sequencer.c:3785 #, c-format msgid "" "Could not execute the todo command\n" @@ -7008,48 +7276,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3979 +#: sequencer.c:3869 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:4050 +#: sequencer.c:3940 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:4109 +#: sequencer.c:3999 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:4114 +#: sequencer.c:4004 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:4128 +#: sequencer.c:4018 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:4221 +#: sequencer.c:4111 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:4230 +#: sequencer.c:4120 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4232 +#: sequencer.c:4122 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:4234 +#: sequencer.c:4124 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:4237 +#: sequencer.c:4127 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7060,69 +7328,59 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4273 sequencer.c:4312 +#: sequencer.c:4163 sequencer.c:4202 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4327 +#: sequencer.c:4217 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4334 +#: sequencer.c:4224 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:4440 +#: sequencer.c:4338 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4444 +#: sequencer.c:4342 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4479 +#: sequencer.c:4377 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4952 +#: sequencer.c:4846 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4955 +#: sequencer.c:4849 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:5113 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git " -"rebase --continue'.\n" -"O se puede abortar el rebase con 'git rebase --abort'.\n" - -#: sequencer.c:5226 sequencer.c:5243 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5257 +#: sequencer.c:5119 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5351 +#: sequencer.c:5213 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." #: setup.c:124 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' está fuera del repositorio" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' está fuera del repositorio en '%s'" -#: setup.c:174 +#: setup.c:175 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7132,7 +7390,7 @@ msgstr "" "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " "localmente." -#: setup.c:187 +#: setup.c:188 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7144,12 +7402,12 @@ msgstr "" "Use '--' para separar las rutas de las revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:236 +#: setup.c:254 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "opción '%s' debe venir antes de argumentos no opcionales" -#: setup.c:255 +#: setup.c:273 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7160,95 +7418,95 @@ msgstr "" "Use '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:391 +#: setup.c:409 msgid "unable to set up work tree using invalid config" msgstr "" "no es posible configurar el directorio de trabajo usando una configuración " "inválida" -#: setup.c:395 +#: setup.c:413 msgid "this operation must be run in a work tree" msgstr "esta operación debe ser realizada en un árbol de trabajo" -#: setup.c:541 +#: setup.c:559 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:549 +#: setup.c:567 msgid "unknown repository extensions found:" msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:568 +#: setup.c:586 #, c-format msgid "error opening '%s'" msgstr "error abriendo '%s'" -#: setup.c:570 +#: setup.c:588 #, c-format msgid "too large to be a .git file: '%s'" msgstr "muy grande para ser un archivo .git: '%s'" -#: setup.c:572 +#: setup.c:590 #, c-format msgid "error reading %s" msgstr "error leyendo %s" -#: setup.c:574 +#: setup.c:592 #, c-format msgid "invalid gitfile format: %s" msgstr "formato gitfile inválido: %s" -#: setup.c:576 +#: setup.c:594 #, c-format msgid "no path in gitfile: %s" msgstr "no hay ruta en gitfile: %s" -#: setup.c:578 +#: setup.c:596 #, c-format msgid "not a git repository: %s" msgstr "no es un repositorio git: %s" -#: setup.c:677 +#: setup.c:695 #, c-format msgid "'$%s' too big" msgstr "'$%s' muy grande" -#: setup.c:691 +#: setup.c:709 #, c-format msgid "not a git repository: '%s'" msgstr "no es un repositorio git: '%s'" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:738 setup.c:740 setup.c:771 #, c-format msgid "cannot chdir to '%s'" msgstr "no se puede aplicar chdir a '%s'" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 msgid "cannot come back to cwd" msgstr "no se puede volver a cwd" -#: setup.c:852 +#: setup.c:870 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "falló al determinar '%*s%s%s'" -#: setup.c:1090 +#: setup.c:1108 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1099 setup.c:1105 +#: setup.c:1117 setup.c:1123 #, c-format msgid "cannot change to '%s'" msgstr "no se puede cambiar a '%s'" -#: setup.c:1110 +#: setup.c:1128 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" "no es un repositorio git (ni ninguno de los directorios superiores): %s" -#: setup.c:1116 +#: setup.c:1134 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7258,7 +7516,7 @@ msgstr "" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1227 +#: setup.c:1245 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7267,15 +7525,15 @@ 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:1271 +#: setup.c:1289 msgid "open /dev/null or dup failed" msgstr "falló al abrir /dev/null o dup" -#: setup.c:1286 +#: setup.c:1304 msgid "fork failed" msgstr "falló fork" -#: setup.c:1291 +#: setup.c:1309 msgid "setsid failed" msgstr "falló setsid" @@ -7357,196 +7615,196 @@ msgstr "mmap falló" msgid "object file %s is empty" msgstr "archivo de objeto %s está vacío" -#: sha1-file.c:1252 sha1-file.c:2392 +#: sha1-file.c:1263 sha1-file.c:2443 #, c-format msgid "corrupt loose object '%s'" msgstr "objeto perdido corrupto '%s'" -#: sha1-file.c:1254 sha1-file.c:2396 +#: sha1-file.c:1265 sha1-file.c:2447 #, c-format msgid "garbage at end of loose object '%s'" msgstr "basura al final del objeto perdido '%s'" -#: sha1-file.c:1296 +#: sha1-file.c:1307 msgid "invalid object type" msgstr "tipo de objeto inválido" -#: sha1-file.c:1380 +#: sha1-file.c:1391 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "no es posible desempacar header %s con --allow-unknown-type" -#: sha1-file.c:1383 +#: sha1-file.c:1394 #, c-format msgid "unable to unpack %s header" msgstr "incapaz de desempaquetar header %s" -#: sha1-file.c:1389 +#: sha1-file.c:1400 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "no es posible analizar header %s con --allow-unknown-type" -#: sha1-file.c:1392 +#: sha1-file.c:1403 #, c-format msgid "unable to parse %s header" msgstr "incapaz de analizar header %s" -#: sha1-file.c:1584 +#: sha1-file.c:1629 #, c-format msgid "failed to read object %s" msgstr "falló al leer objeto %s" -#: sha1-file.c:1588 +#: sha1-file.c:1633 #, c-format msgid "replacement %s not found for %s" msgstr "reemplazo %s no encontrado para %s" -#: sha1-file.c:1592 +#: sha1-file.c:1637 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "objeto perdido %s (guardado en %s) está corrompido" -#: sha1-file.c:1596 +#: sha1-file.c:1641 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paquete de objeto %s (guardado en %s) está corrompido" -#: sha1-file.c:1699 +#: sha1-file.c:1746 #, c-format msgid "unable to write file %s" msgstr "no es posible escribir archivo %s" -#: sha1-file.c:1706 +#: sha1-file.c:1753 #, c-format msgid "unable to set permission to '%s'" msgstr "no se pudo poner permisos a '%s'" -#: sha1-file.c:1713 +#: sha1-file.c:1760 msgid "file write error" msgstr "falló de escritura" -#: sha1-file.c:1732 +#: sha1-file.c:1780 msgid "error when closing loose object file" msgstr "error cerrando el archivo de objeto suelto" -#: sha1-file.c:1797 +#: sha1-file.c:1845 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permisos insuficientes para agregar un objeto a la base de datos del " "repositorio %s" -#: sha1-file.c:1799 +#: sha1-file.c:1847 msgid "unable to create temporary file" msgstr "no es posible crear un archivo temporal" -#: sha1-file.c:1823 +#: sha1-file.c:1871 msgid "unable to write loose object file" msgstr "no es posible escribir el archivo de objeto suelto" -#: sha1-file.c:1829 +#: sha1-file.c:1877 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no es posible desinflar el objeto nuevo %s (%d)" -#: sha1-file.c:1833 +#: sha1-file.c:1881 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd en objeto %s falló (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1885 #, c-format msgid "confused by unstable object source data for %s" msgstr "confundido por fuente de data de objetos inestable para %s" -#: sha1-file.c:1847 builtin/pack-objects.c:925 +#: sha1-file.c:1895 builtin/pack-objects.c:1054 #, c-format msgid "failed utime() on %s" msgstr "falló utime() en %s" -#: sha1-file.c:1922 +#: sha1-file.c:1972 #, c-format msgid "cannot read object for %s" msgstr "no se pudo leer el objeto para %s" -#: sha1-file.c:1962 +#: sha1-file.c:2011 msgid "corrupt commit" msgstr "commit corrupto" -#: sha1-file.c:1970 +#: sha1-file.c:2019 msgid "corrupt tag" msgstr "tag corrupto" -#: sha1-file.c:2069 +#: sha1-file.c:2119 #, c-format msgid "read error while indexing %s" msgstr "error leyendo al indexar %s" -#: sha1-file.c:2072 +#: sha1-file.c:2122 #, c-format msgid "short read while indexing %s" msgstr "lectura corta al indexar %s" -#: sha1-file.c:2145 sha1-file.c:2154 +#: sha1-file.c:2195 sha1-file.c:2205 #, c-format msgid "%s: failed to insert into database" msgstr "%s: falló al insertar en la base de datos" -#: sha1-file.c:2160 +#: sha1-file.c:2211 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo de archivo no soportado" -#: sha1-file.c:2184 +#: sha1-file.c:2235 #, c-format msgid "%s is not a valid object" msgstr "%s no es objeto válido" -#: sha1-file.c:2186 +#: sha1-file.c:2237 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no es un objeto '%s' válido" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2264 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: sha1-file.c:2403 sha1-file.c:2455 +#: sha1-file.c:2454 sha1-file.c:2507 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash no concuerda para %s (se esperaba %s)" -#: sha1-file.c:2427 +#: sha1-file.c:2478 #, c-format msgid "unable to mmap %s" msgstr "no es posible hacer mmap a %s" -#: sha1-file.c:2432 +#: sha1-file.c:2483 #, c-format msgid "unable to unpack header of %s" msgstr "incapaz de desempaquetar header de %s" -#: sha1-file.c:2438 +#: sha1-file.c:2489 #, c-format msgid "unable to parse header of %s" msgstr "incapaz de analizar header de %s" -#: sha1-file.c:2449 +#: sha1-file.c:2500 #, c-format msgid "unable to unpack contents of %s" msgstr "no es posible desempaquetar contenidos de %s" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "SHA1 %s corto es ambiguo" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Los candidatos son:" -#: sha1-name.c:797 +#: 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" @@ -7569,44 +7827,111 @@ msgstr "" "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:822 +#: strbuf.c:837 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:824 +#: strbuf.c:839 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:832 +#: strbuf.c:847 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:834 +#: strbuf.c:849 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:841 +#: strbuf.c:856 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:843 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:849 +#: strbuf.c:864 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7614,14 +7939,14 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:851 +#: strbuf.c:866 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1149 +#: strbuf.c:1164 #, c-format msgid "could not edit '%s'" msgstr "no se pudo editar '%s'" @@ -7655,56 +7980,127 @@ 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 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "mal argumento --ignore-submodules: %s" + +#: submodule.c:815 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado " +"igual. Saltandolo." + #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 +#: submodule.c:995 +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" +"no se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " +"el submódulo %s" + +#: submodule.c:1118 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "proceso para submódulo '%s' falló" + +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falló al resolver HEAD como un ref válido." -#: submodule.c:1481 +#: submodule.c:1158 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "Empujando submódulo '%s'\n" + +#: submodule.c:1161 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "No es posible hacer push al submódulo '%s'\n" + +#: submodule.c:1453 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Haciendo fetch al submódulo %s%s\n" + +#: submodule.c:1483 #, c-format -msgid "Could not access submodule '%s'" -msgstr "No pudo acceder al submódulo '%s'" +msgid "Could not access submodule '%s'\n" +msgstr "No pudo acceder al submódulo '%s'\n" -#: submodule.c:1651 +#: submodule.c:1637 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Errores durante el fetch del submódulo:\n" +"%s" + +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1789 +#: submodule.c:1679 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "No se pudo ejecutar 'git status --procelain=2' en el submódulo %s" + +#: submodule.c:1720 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "'git status --procelain=2' falló en el submódulo %s" + +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" -#: submodule.c:1817 +#: submodule.c:1828 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'" -#: submodule.c:1907 +#: submodule.c:1855 submodule.c:2165 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "no pudo recursar en el submódulo '%s'" + +#: submodule.c:1876 +msgid "could not reset submodule index" +msgstr "no se pudo reiniciar el index del submódulo" + +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1959 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:2027 +#: submodule.c:2038 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'" -#: submodule.c:2048 +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7712,17 +8108,17 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:2060 submodule.c:2119 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:2064 +#: submodule.c:2075 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "rechazando mover '%s' dentro de un directorio git existente" -#: submodule.c:2071 +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7733,16 +8129,11 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2154 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "no pudo recursar en el submódulo '%s'" - -#: submodule.c:2198 +#: submodule.c:2209 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2237 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" @@ -7768,7 +8159,7 @@ msgstr "" msgid "invalid value for %s" msgstr "valor inválido para %s" -#: submodule-config.c:769 +#: submodule-config.c:765 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No se pudo actualizar la entrada %s de .gitmodules" @@ -7784,7 +8175,7 @@ msgstr "ejecución del comando de remolque '%s' falló" msgid "unknown value '%s' for key '%s'" msgstr "valor '%s' desconocido para la clave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "más de un %s" @@ -7916,7 +8307,7 @@ msgstr "Abortando." msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" -#: transport.c:1345 transport-helper.c:656 +#: transport.c:1345 transport-helper.c:657 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" @@ -7929,7 +8320,7 @@ msgstr "escritura total al helper remoto falló" msgid "unable to find remote helper for '%s'" msgstr "no es posible encontrar helper remoto para '%s'" -#: transport-helper.c:160 transport-helper.c:570 +#: transport-helper.c:160 transport-helper.c:571 msgid "can't dup helper output fd" msgstr "no se puede duplicar output de fd del helper" @@ -7946,100 +8337,100 @@ msgstr "" msgid "this remote helper should implement refspec capability" msgstr "este helper remoto debería implementar capacidad refspec" -#: transport-helper.c:284 transport-helper.c:424 +#: transport-helper.c:284 transport-helper.c:425 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s dijo inesperadamente: '%s'" -#: transport-helper.c:413 +#: transport-helper.c:414 #, c-format msgid "%s also locked %s" msgstr "%s también bloqueó %s" -#: transport-helper.c:492 +#: transport-helper.c:493 msgid "couldn't run fast-import" msgstr "no se pudo ejecutar fast-import" -#: transport-helper.c:515 +#: transport-helper.c:516 msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:544 transport-helper.c:1133 +#: transport-helper.c:545 transport-helper.c:1134 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" -#: transport-helper.c:589 +#: transport-helper.c:590 #, c-format msgid "unknown response to connect: %s" msgstr "respuesta para conectar desconocida: %s" -#: transport-helper.c:611 +#: transport-helper.c:612 msgid "setting remote service path not supported by protocol" msgstr "configurando servicio de ruta remota no soportado por el protocolo" -#: transport-helper.c:613 +#: transport-helper.c:614 msgid "invalid remote service path" msgstr "ruta de servicio remoto inválida" -#: transport-helper.c:659 +#: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:735 +#: transport-helper.c:736 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:788 +#: transport-helper.c:789 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper reportó estado inesperado de %s" -#: transport-helper.c:849 +#: transport-helper.c:850 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:852 +#: transport-helper.c:853 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:855 +#: transport-helper.c:856 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:860 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support --atomic" msgstr "helper %s no soporta --atomic" -#: transport-helper.c:866 +#: transport-helper.c:867 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:964 +#: transport-helper.c:965 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:969 +#: transport-helper.c:970 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:1016 +#: transport-helper.c:1017 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:1021 +#: transport-helper.c:1022 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1046 +#: transport-helper.c:1047 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8048,68 +8439,63 @@ msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" "Tal vez deberías especificar un branch como 'master'.\n" -#: transport-helper.c:1119 +#: transport-helper.c:1120 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1271 +#: transport-helper.c:1272 #, c-format msgid "read(%s) failed" msgstr "leer(%s) falló" -#: transport-helper.c:1298 +#: transport-helper.c:1299 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) falló" -#: transport-helper.c:1347 +#: transport-helper.c:1348 #, c-format msgid "%s thread failed" msgstr "hilo %s falló" -#: transport-helper.c:1351 +#: transport-helper.c:1352 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s falló al unirse: %s" -#: transport-helper.c:1370 transport-helper.c:1374 +#: transport-helper.c:1371 transport-helper.c:1375 #, c-format msgid "can't start thread for copying data: %s" msgstr "no se puede iniciar el hilo para copiar data: %s" -#: transport-helper.c:1411 +#: transport-helper.c:1412 #, c-format msgid "%s process failed to wait" msgstr "proceso %s falló al esperar" -#: transport-helper.c:1415 +#: transport-helper.c:1416 #, c-format msgid "%s process failed" msgstr "proceso %s falló" -#: transport-helper.c:1433 transport-helper.c:1442 +#: transport-helper.c:1434 transport-helper.c:1443 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "objeto de árbol muy corto" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "modo mal formado en la entrada de árbol" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nombre de archivo vacío en la entrada de árbol" -#: tree-walk.c:48 -#, c-format -msgid "filename in tree entry contains backslash: '%s'" -msgstr "nombre de archivo en el árbol contiene un backslash: '%s'" - -#: tree-walk.c:124 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "archivo de árbol muy corto" @@ -8369,7 +8755,7 @@ msgstr "" "en un filesystem case-insensitive) y solo una del grupo\n" "colisionando está en el árbol de trabajo:\n" -#: unpack-trees.c:1441 +#: unpack-trees.c:1445 msgid "Updating index flags" msgstr "Actualizando flags del index" @@ -8402,35 +8788,39 @@ msgstr "numero de puerto inválido" msgid "invalid '..' path segment" msgstr "segmento de ruta '..' inválido" -#: worktree.c:258 builtin/am.c:2084 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Haciendo fetch a objetos" + +#: worktree.c:259 builtin/am.c:2099 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#: worktree.c:304 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' en el árbol de trabajo principal no es el directorio del repositorio" -#: worktree.c:315 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " "trabajo" -#: worktree.c:327 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:333 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' no es un archivo .git, código de error %d" -#: worktree.c:341 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" @@ -8990,124 +9380,128 @@ msgstr "falló al desvincular '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opción>] [--] <especificación-de-ruta>..." -#: builtin/add.c:87 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:92 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:288 msgid "updating files failed" msgstr "falló la actualización de carpetas" -#: builtin/add.c:102 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:177 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:252 builtin/rev-parse.c:899 +#: builtin/add.c:266 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "No se pudo leer el índice" -#: builtin/add.c:263 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:267 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:270 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "falló la edición del parche" -#: builtin/add.c:273 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:275 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "Parche vacío. Abortado." -#: builtin/add.c:280 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:288 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" -#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 -#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "dry run ( ejecución en seco)" -#: builtin/add.c:311 +#: builtin/add.c:325 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 +#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:313 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:314 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:315 +#: builtin/add.c:329 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:316 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:317 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "grabar solo el hecho de que la ruta será agregada después" -#: builtin/add.c:318 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:321 +#: builtin/add.c:335 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:323 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el índice" -#: builtin/add.c:324 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" -#: builtin/add.c:325 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" -#: builtin/add.c:327 builtin/update-index.c:1004 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "sobrescribir el bit ejecutable de los archivos listados" -#: builtin/add.c:329 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:347 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "backend para `git stash -p`" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9138,166 +9532,176 @@ msgstr "" "\n" "Vea \"git help submodule\" para más información." -#: builtin/add.c:375 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:393 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Usa -f si realmente quieres agregarlos.\n" +#: builtin/add.c:410 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"Usa -f si realmente quieres agregarlos.\n" +"Desactiva este mensaje ejecutando\n" +"\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:400 +#: builtin/add.c:419 msgid "adding files failed" msgstr "falló al agregar archivos" -#: builtin/add.c:428 builtin/commit.c:348 +#: builtin/add.c:447 builtin/commit.c:348 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file es incompatible con --interactive/--patch" -#: builtin/add.c:434 +#: builtin/add.c:464 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file es incompatible con --edit" -#: builtin/add.c:446 +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:449 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" -#: builtin/add.c:453 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" -#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 -#: builtin/reset.c:327 +#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file es incompatible con argumentos de pathspec" -#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 -#: builtin/reset.c:333 +#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul requiere --pathspec-from-file" -#: builtin/add.c:482 +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:483 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "¿Tal vez quiso decir 'git add .'?\n" +#: builtin/add.c:514 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"¿Tal vez quisiste decir 'git add.'?\n" +"Desactiva este mensage ejecutando\n" +"\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:347 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "no se pudo analizar el script del autor" -#: builtin/am.c:431 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' fue borrado por el hook de applypatch-msg" -#: builtin/am.c:473 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Línea mal formada: '%s'." -#: builtin/am.c:511 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falló al copiar notas de '%s' a '%s'" -#: builtin/am.c:537 +#: builtin/am.c:542 msgid "fseek failed" msgstr "fall de fseek" -#: builtin/am.c:725 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:790 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "Solo un parche StGIT puede ser aplicado de una vez" -#: builtin/am.c:838 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "timestamp inválido" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "línea Date inválida" -#: builtin/am.c:850 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "offset de zona horaria inválido" -#: builtin/am.c:943 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:948 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" -#: builtin/am.c:953 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Falló al dividir parches." -#: builtin/am.c:1084 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." -#: builtin/am.c:1085 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." -#: builtin/am.c:1086 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" "\"." -#: builtin/am.c:1169 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Parche mandado con formato=flowed; espacios al final de las líneas tal vez " "desaparezcan." -#: builtin/am.c:1197 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "El parche está vacío." -#: builtin/am.c:1262 +#: builtin/am.c:1267 #, c-format msgid "missing author line in commit %s" msgstr "falta línea autor en commit %s" -#: builtin/am.c:1265 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "sangría no válida: %.*s" -#: builtin/am.c:1484 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositorio carece de los blobs necesarios para retroceder en una fusión de " "3-vías." -#: builtin/am.c:1486 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1505 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9305,24 +9709,24 @@ msgstr "" "¿Editaste el parche a mano?\n" "No aplica a blobs guardados en su índice." -#: builtin/am.c:1511 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediendo para parchar base y fusión de 3-vías..." -#: builtin/am.c:1537 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Falló al fusionar en los cambios." -#: builtin/am.c:1569 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1638 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -9330,39 +9734,39 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1653 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1695 builtin/commit.c:394 +#: builtin/am.c:1700 builtin/commit.c:398 msgid "unable to write index file" msgstr "no es posible escribir en el archivo índice" -#: builtin/am.c:1699 +#: builtin/am.c:1704 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1744 builtin/am.c:1812 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1756 +#: builtin/am.c:1761 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1762 +#: builtin/am.c:1767 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1766 -msgid "Use 'git am --show-current-patch' to see the failed patch" -msgstr "Use 'git am --show-current-patch' para ver el parche fallido" +#: builtin/am.c:1771 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido" -#: builtin/am.c:1810 +#: builtin/am.c:1815 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9372,7 +9776,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:1817 +#: builtin/am.c:1822 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9385,17 +9789,17 @@ msgstr "" "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " "en él." -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 #: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:1976 +#: builtin/am.c:1981 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2020 +#: builtin/am.c:2025 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9403,144 +9807,154 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2117 +#: builtin/am.c:2132 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2153 +#: builtin/am.c:2172 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valor inválido para --show-current-patch: %s" + +#: builtin/am.c:2176 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s" + +#: builtin/am.c:2207 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2154 +#: builtin/am.c:2208 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2160 +#: builtin/am.c:2214 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2162 +#: builtin/am.c:2216 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2164 +#: builtin/am.c:2218 msgid "allow fall back on 3way merging if needed" msgstr "permitir retroceso en fusión de 3-vías si es necesario" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:811 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:812 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2167 +#: builtin/am.c:2221 msgid "add a Signed-off-by line to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2170 +#: builtin/am.c:2224 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2172 +#: builtin/am.c:2226 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2174 +#: builtin/am.c:2228 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2176 +#: builtin/am.c:2230 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2178 +#: builtin/am.c:2232 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2181 +#: builtin/am.c:2235 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2184 +#: builtin/am.c:2238 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 +#: builtin/am.c:2267 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 -#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 +#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 #: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2210 +#: builtin/am.c:2264 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2216 +#: builtin/am.c:2270 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2218 +#: builtin/am.c:2272 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2221 +#: builtin/am.c:2275 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2224 +#: builtin/am.c:2278 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2227 +#: builtin/am.c:2281 msgid "restore the original branch and abort the patching operation." msgstr "restaurar la rama original y abortar la operación de parchado." -#: builtin/am.c:2230 +#: builtin/am.c:2284 msgid "abort the patching operation but keep HEAD where it is." msgstr "abortar la operación de parchado pero mantener HEAD donde está." -#: builtin/am.c:2233 -msgid "show the patch being applied." -msgstr "muestra el parche siendo aplicado." +#: builtin/am.c:2288 +msgid "show the patch being applied" +msgstr "muestra el parche siendo aplicado" -#: builtin/am.c:2237 +#: builtin/am.c:2293 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2239 +#: builtin/am.c:2295 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 -#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 +#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 +#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 msgid "GPG-sign commits" msgstr "Commits con firma GPG" -#: builtin/am.c:2245 +#: builtin/am.c:2301 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2263 +#: builtin/am.c:2319 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9548,16 +9962,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:2270 +#: builtin/am.c:2326 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2285 +#: builtin/am.c:2341 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe en el mbox dado." -#: builtin/am.c:2309 +#: builtin/am.c:2365 #, c-format msgid "" "Stray %s directory found.\n" @@ -9566,11 +9980,11 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2315 +#: builtin/am.c:2371 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." -#: builtin/am.c:2325 +#: builtin/am.c:2381 msgid "interactive mode requires patches on the command line" msgstr "modo interactivo requiere parches en la línea de comando" @@ -9741,7 +10155,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:322 +#: builtin/bisect--helper.c:310 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -9750,15 +10164,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:330 +#: builtin/bisect--helper.c:318 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]? " -#: builtin/bisect--helper.c:377 +#: builtin/bisect--helper.c:379 msgid "no terms defined" msgstr "no hay términos definidos" -#: builtin/bisect--helper.c:380 +#: builtin/bisect--helper.c:382 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9767,7 +10181,7 @@ msgstr "" "Tus términos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:390 +#: builtin/bisect--helper.c:392 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9776,112 +10190,112 @@ 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:476 +#: builtin/bisect--helper.c:478 #, c-format msgid "unrecognized option: '%s'" msgstr "opción desconocida: '%s'" -#: builtin/bisect--helper.c:480 +#: builtin/bisect--helper.c:482 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' no parece ser una revisión válida" -#: builtin/bisect--helper.c:512 +#: builtin/bisect--helper.c:514 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:527 +#: builtin/bisect--helper.c:529 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'." -#: builtin/bisect--helper.c:548 +#: builtin/bisect--helper.c:550 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecará en un árbol con cg-seek" -#: builtin/bisect--helper.c:551 +#: builtin/bisect--helper.c:553 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbólico extraño" -#: builtin/bisect--helper.c:575 +#: builtin/bisect--helper.c:577 #, c-format msgid "invalid ref: '%s'" msgstr "ref inválido: '%s'" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "escribe los términos a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "limpiar el estado de bisección" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "revisar por revs esperados" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:641 msgid "reset the bisection state" msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:643 msgid "write out the bisection state in BISECT_LOG" msgstr "escribir el estado de bisect en BISECT_LOG" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:645 msgid "check and set terms in a bisection state" msgstr "revisar y configurar los terms en el estado de bisect" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:647 msgid "check whether bad or good terms exist" msgstr "revisar si existen términos malos o buenos" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:649 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:651 msgid "start the bisect session" msgstr "comenzar la sesión de bisect" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:655 msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "--write-terms requiere dos argumentos" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:684 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset requiere un commit o ningún argumento" -#: builtin/bisect--helper.c:685 +#: builtin/bisect--helper.c:688 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write requiere entre 4 o 5 argumentos" -#: builtin/bisect--helper.c:691 +#: builtin/bisect--helper.c:694 msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:700 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:703 +#: builtin/bisect--helper.c:706 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" @@ -10268,7 +10682,7 @@ msgstr "configurando modo tracking (mirar git-pull(1))" msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:505 +#: builtin/branch.c:626 builtin/rebase.c:513 msgid "upstream" msgstr "upstream" @@ -10379,7 +10793,7 @@ msgstr "ordenamiento y filtrado son case-insensitive" msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:684 builtin/clone.c:784 +#: builtin/branch.c:684 builtin/clone.c:785 msgid "HEAD not found below refs/heads!" msgstr "¡HEAD no encontrado abajo de refs/heads!" @@ -10486,19 +10900,19 @@ 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:3228 +#: builtin/bundle.c:66 builtin/pack-objects.c:3375 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +#: builtin/bundle.c:68 builtin/pack-objects.c:3377 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +#: builtin/bundle.c:70 builtin/pack-objects.c:3379 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +#: builtin/bundle.c:73 builtin/pack-objects.c:3382 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress cuando medidor de progreso es mostrado" @@ -10519,11 +10933,11 @@ msgstr "%s está bien\n" msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/bundle.c:168 builtin/remote.c:1609 +#: builtin/bundle.c:168 builtin/remote.c:1686 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; tiene que ser agregado antes de un subcomando" -#: builtin/bundle.c:190 builtin/remote.c:1640 +#: builtin/bundle.c:190 builtin/remote.c:1717 #, c-format msgid "Unknown subcommand: %s" msgstr "Sub-comando desconocido: %s" @@ -10576,7 +10990,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:645 git-submodule.sh:992 +#: builtin/cat-file.c:645 git-submodule.sh:1002 msgid "blob" msgstr "blob" @@ -10637,8 +11051,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:1435 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -10650,27 +11064,27 @@ msgstr "mostrar rutas de entrada que no concuerdan" msgid "ignore index when checking" msgstr "ignorar el índice cuando se revise" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "no se puede especificar los nombres de rutas con --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z sólo tiene sentido con --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "ruta no especificada" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet solo es válido con un nombre de ruta único" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "no se puede tener ambos --quiet y --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching sólo es válida con --verbose" @@ -10730,9 +11144,9 @@ 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:1385 builtin/submodule--helper.c:1388 -#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:672 msgid "string" msgstr "string" @@ -10847,11 +11261,11 @@ msgstr "'%s' o '%s' no puede ser usado con %s" msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 +#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:732 +#: builtin/checkout.c:734 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10860,50 +11274,50 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:835 +#: builtin/checkout.c:837 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:877 +#: builtin/checkout.c:879 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:881 builtin/clone.c:716 +#: builtin/checkout.c:883 builtin/clone.c:717 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:885 +#: builtin/checkout.c:887 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:888 +#: builtin/checkout.c:890 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:892 +#: builtin/checkout.c:894 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:894 builtin/checkout.c:1291 +#: builtin/checkout.c:896 builtin/checkout.c:1320 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:896 +#: builtin/checkout.c:898 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:949 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:953 +#: builtin/checkout.c:955 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10926,7 +11340,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:972 +#: builtin/checkout.c:974 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10953,28 +11367,19 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1009 msgid "internal error in revision walk" msgstr "error interno en camino de revisión" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1013 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:1051 builtin/checkout.c:1286 +#: builtin/checkout.c:1053 builtin/checkout.c:1315 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1178 -msgid "only one reference expected" -msgstr "solo una referencia esperada" - -#: builtin/checkout.c:1195 -#, c-format -msgid "only one reference expected, %d given." -msgstr "solo una referencia esperada, %d entregadas." - -#: builtin/checkout.c:1232 +#: builtin/checkout.c:1128 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10983,37 +11388,72 @@ 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:1245 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1135 +msgid "" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n" +"puedes hacerlo proporcionando el nombre completo con la opción --track:\n" +"\n" +" git checkout --track origin/<nombre>\n" +"\n" +"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una " +"rama\n" +"de nombre <nombre> remota, como 'origin', considera configurar\n" +"checkout.defaultRemote=origin en tu configuración." + +#: builtin/checkout.c:1145 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto" + +#: builtin/checkout.c:1211 +msgid "only one reference expected" +msgstr "solo una referencia esperada" + +#: builtin/checkout.c:1228 +#, c-format +msgid "only one reference expected, %d given." +msgstr "solo una referencia esperada, %d entregadas." + +#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1258 builtin/checkout.c:1622 +#: builtin/checkout.c:1287 builtin/checkout.c:1649 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1334 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1307 +#: builtin/checkout.c:1336 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "se espera una rama, se obtuvo una rama remota '%s'" -#: builtin/checkout.c:1308 builtin/checkout.c:1316 +#: builtin/checkout.c:1337 builtin/checkout.c:1345 #, c-format msgid "a branch is expected, got '%s'" msgstr "se esperaba branch, se obuto '%s'" -#: builtin/checkout.c:1311 +#: builtin/checkout.c:1340 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1327 +#: builtin/checkout.c:1356 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11021,7 +11461,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1331 +#: builtin/checkout.c:1360 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11029,7 +11469,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:1335 +#: builtin/checkout.c:1364 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11037,7 +11477,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1339 +#: builtin/checkout.c:1368 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11045,7 +11485,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:1343 +#: builtin/checkout.c:1372 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11053,142 +11493,142 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1347 +#: builtin/checkout.c:1376 msgid "you are switching branch while bisecting" msgstr "estás cambiando ramas durante un bisect" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1383 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 +#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 -#: builtin/checkout.c:1380 builtin/checkout.c:1385 +#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 +#: builtin/checkout.c:1409 builtin/checkout.c:1414 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1411 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1419 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No se puede cambiar rama a un '%s' sin commits" -#: builtin/checkout.c:1397 +#: builtin/checkout.c:1426 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 -#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 -#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 +#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 +#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 +#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1469 msgid "perform a 3-way merge with the new branch" msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1471 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1454 builtin/worktree.c:503 +#: builtin/checkout.c:1483 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1484 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1486 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1488 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1488 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1461 builtin/merge.c:288 +#: builtin/checkout.c:1490 builtin/merge.c:289 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1464 +#: builtin/checkout.c:1493 msgid "do not check if another worktree is holding the given ref" msgstr "no revise si otro árbol de trabajo contiene la ref entregada" -#: builtin/checkout.c:1477 +#: builtin/checkout.c:1506 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1480 +#: builtin/checkout.c:1509 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1513 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1568 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1577 +#: builtin/checkout.c:1605 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1582 +#: builtin/checkout.c:1610 msgid "missing branch name; try -b" msgstr "falta nombre de rama; prueba -b" -#: builtin/checkout.c:1615 +#: builtin/checkout.c:1642 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1658 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1665 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1669 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1651 +#: builtin/checkout.c:1678 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file es incompatible con --detach" -#: builtin/checkout.c:1654 builtin/reset.c:324 +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file es incompatible con --patch" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1692 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11196,99 +11636,69 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1697 msgid "you must specify path(s) to restore" msgstr "debes especificar path(s) para restaurar" -#: builtin/checkout.c:1689 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"'%s' acertó más de una rama remota rastreada.\n" -"Encontramos %d remotos con una referencia que concuerda. Así que volvemos\n" -"a intentar resolver el argumento como una ruta, ¡pero eso también falló!\n" -"\n" -"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n" -"puedes hacerlo proporcionando el nombre completo con la opción --track:\n" -"\n" -" git checkout --track origin/<nombre>\n" -"\n" -"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una " -"rama\n" -"de nombre <nombre> remota, como 'origin', considera configurar\n" -"checkout.defaultRemote=origin en tu configuración." - -#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 -#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 +#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1715 +#: builtin/checkout.c:1724 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1726 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1727 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1720 +#: builtin/checkout.c:1729 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1730 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1775 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1777 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1779 msgid "second guess 'git switch <no-such-branch>'" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1804 +#: builtin/checkout.c:1813 msgid "which tree-ish to checkout from" msgstr "de qué árbol hacer el checkout" -#: builtin/checkout.c:1806 +#: builtin/checkout.c:1815 msgid "restore the index" msgstr "restaurar el index" -#: builtin/checkout.c:1808 +#: builtin/checkout.c:1817 msgid "restore the working tree (default)" msgstr "restaurar el árbol de trabajo (default)" -#: builtin/checkout.c:1810 +#: builtin/checkout.c:1819 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1811 +#: builtin/checkout.c:1820 msgid "use overlay mode" msgstr "usar modo overlay" @@ -11432,9 +11842,9 @@ msgstr "limpieza interactiva" msgid "remove whole directories" msgstr "borrar directorios completos" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 +#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 +#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" @@ -11519,18 +11929,18 @@ msgstr "directorio-template" 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:1392 -#: builtin/submodule--helper.c:1885 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:118 builtin/submodule--helper.c:1394 -#: builtin/submodule--helper.c:1887 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "usa--reference solamente si estás clonado" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:327 +#: builtin/pack-objects.c:3441 builtin/repack.c:327 msgid "name" msgstr "nombre" @@ -11546,8 +11956,8 @@ msgstr "checkout <rama> en lugar de HEAD remota" 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:168 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 +#: builtin/pull.c:207 msgid "depth" msgstr "profundidad" @@ -11555,7 +11965,7 @@ msgstr "profundidad" msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 msgid "time" msgstr "tiempo" @@ -11564,7 +11974,7 @@ 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:172 builtin/fetch.c:195 -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1480 msgid "revision" msgstr "revision" @@ -11572,7 +11982,8 @@ msgstr "revision" msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" @@ -11610,12 +12021,12 @@ msgstr "especifico-de-servidor" msgid "option to transmit" msgstr "opción para trasmitir" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 #: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 #: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" @@ -11687,95 +12098,95 @@ msgstr "" msgid "Could not find remote branch %s to clone." msgstr "No se pudo encontrar la rama remota %s para clonar." -#: builtin/clone.c:704 +#: builtin/clone.c:705 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:752 +#: builtin/clone.c:753 msgid "failed to initialize sparse-checkout" msgstr "falló al inicializar sparse-checkout" -#: builtin/clone.c:775 +#: builtin/clone.c:776 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" -#: builtin/clone.c:806 +#: builtin/clone.c:807 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:856 +#: builtin/clone.c:862 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:919 +#: builtin/clone.c:925 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:921 +#: builtin/clone.c:927 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:959 builtin/receive-pack.c:1948 +#: builtin/clone.c:965 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:963 +#: builtin/clone.c:969 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:976 +#: builtin/clone.c:982 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:979 +#: builtin/clone.c:985 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:992 +#: builtin/clone.c:998 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:998 builtin/fetch.c:1787 +#: builtin/clone.c:1004 builtin/fetch.c:1796 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:1008 +#: builtin/clone.c:1014 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." -#: builtin/clone.c:1018 +#: builtin/clone.c:1024 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:1038 +#: builtin/clone.c:1044 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:1058 +#: builtin/clone.c:1064 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:1060 +#: builtin/clone.c:1066 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1084 +#: builtin/clone.c:1090 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11783,36 +12194,36 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1148 +#: builtin/clone.c:1154 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." -#: builtin/clone.c:1150 +#: builtin/clone.c:1156 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since es ignorado en el clon local; use file:// ." -#: builtin/clone.c:1152 +#: builtin/clone.c:1158 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1154 +#: builtin/clone.c:1160 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." -#: builtin/clone.c:1157 +#: builtin/clone.c:1163 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1162 +#: builtin/clone.c:1168 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1237 builtin/clone.c:1245 +#: builtin/clone.c:1243 builtin/clone.c:1251 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1248 +#: builtin/clone.c:1254 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -11889,13 +12300,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 +#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 #: builtin/tag.c:412 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1496 +#: builtin/commit-tree.c:115 builtin/commit.c:1501 msgid "commit message" msgstr "mensaje del commit" @@ -11903,8 +12314,8 @@ 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:1508 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 +#: builtin/pull.c:175 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -11991,53 +12402,53 @@ msgstr "No hay rutas con --include/--only no tiene sentido." msgid "unable to create temporary index" msgstr "no es posible crear un índice temporal" -#: builtin/commit.c:382 +#: builtin/commit.c:385 msgid "interactive add failed" msgstr "adición interactiva fallida" -#: builtin/commit.c:396 +#: builtin/commit.c:400 msgid "unable to update temporary index" msgstr "no es posible actualizar el índice temporal" -#: builtin/commit.c:398 +#: builtin/commit.c:402 msgid "Failed to update main cache tree" msgstr "Falló al actualizar el cache principal del árbol" -#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 +#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:475 +#: builtin/commit.c:479 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusión." -#: builtin/commit.c:477 +#: builtin/commit.c:481 msgid "cannot do a partial commit during a cherry-pick." msgstr "no se puede realizar un commit parcial durante un cherry-pick." -#: builtin/commit.c:485 +#: builtin/commit.c:489 msgid "cannot read the index" msgstr "no se puede leer el índice" -#: builtin/commit.c:504 +#: builtin/commit.c:508 msgid "unable to write temporary index file" msgstr "no es posible escribir el índice temporal" -#: builtin/commit.c:602 +#: builtin/commit.c:606 #, c-format msgid "commit '%s' lacks author header" msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:604 +#: builtin/commit.c:608 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una línea de autor mal formada" -#: builtin/commit.c:623 +#: builtin/commit.c:627 msgid "malformed --author parameter" msgstr "parámetro --author mal formado" -#: builtin/commit.c:676 +#: builtin/commit.c:680 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12045,38 +12456,38 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 +#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:726 builtin/shortlog.c:319 +#: builtin/commit.c:730 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" -#: builtin/commit.c:728 +#: builtin/commit.c:732 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:732 +#: builtin/commit.c:736 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:763 builtin/commit.c:779 +#: builtin/commit.c:767 builtin/commit.c:783 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:770 +#: builtin/commit.c:774 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:830 +#: builtin/commit.c:834 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:849 +#: builtin/commit.c:853 #, c-format msgid "" "\n" @@ -12091,7 +12502,7 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:854 +#: builtin/commit.c:858 #, c-format msgid "" "\n" @@ -12106,7 +12517,7 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:867 +#: builtin/commit.c:871 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12116,7 +12527,7 @@ msgstr "" " líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" " vacío aborta el commit.\n" -#: builtin/commit.c:875 +#: builtin/commit.c:879 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12128,143 +12539,143 @@ msgstr "" " usted mismo si lo desea.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:892 +#: builtin/commit.c:896 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:900 +#: builtin/commit.c:904 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:907 +#: builtin/commit.c:911 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:925 +#: builtin/commit.c:929 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:992 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:1006 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" -#: builtin/commit.c:1050 +#: 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:1064 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inválido '%s'" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1087 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1166 +#: 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:1175 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1178 +#: 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:1180 +#: 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:1183 +#: builtin/commit.c:1188 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1193 +#: builtin/commit.c:1198 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." -#: builtin/commit.c:1195 +#: builtin/commit.c:1200 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "La opción -m no puede ser combinada con -c/-C/-F." -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1220 +#: builtin/commit.c:1225 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1357 builtin/commit.c:1519 +#: builtin/commit.c:1362 builtin/commit.c:1524 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1359 builtin/commit.c:1521 +#: builtin/commit.c:1364 builtin/commit.c:1526 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1361 +#: builtin/commit.c:1366 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1363 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1528 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1365 +#: builtin/commit.c:1370 msgid "version" msgstr "version" -#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 -#: builtin/worktree.c:650 +#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1368 builtin/commit.c:1527 +#: builtin/commit.c:1373 builtin/commit.c:1532 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1371 builtin/commit.c:1530 +#: builtin/commit.c:1376 builtin/commit.c:1535 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 +#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 +#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1379 builtin/commit.c:1538 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " "(Predeterminado: all)" -#: builtin/commit.c:1378 +#: builtin/commit.c:1383 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12272,11 +12683,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1380 parse-options.h:192 +#: builtin/commit.c:1385 parse-options.h:192 msgid "when" msgstr "cuando" -#: builtin/commit.c:1381 +#: builtin/commit.c:1386 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12284,173 +12695,173 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1388 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1384 +#: builtin/commit.c:1389 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1386 +#: builtin/commit.c:1391 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1406 +#: builtin/commit.c:1411 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinación de argumentos de archivos ignorados y no rastreados no soportada" -#: builtin/commit.c:1489 +#: builtin/commit.c:1494 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "author" msgstr "autor" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1495 builtin/gc.c:538 +#: builtin/commit.c:1500 builtin/gc.c:538 msgid "date" msgstr "fecha" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 -#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 +#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1498 +#: builtin/commit.c:1503 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1500 +#: builtin/commit.c:1505 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar el mensaje de formato autosquash para realizar squash al commit " "especificado" -#: builtin/commit.c:1501 +#: builtin/commit.c:1506 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" -#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 +#: builtin/pull.c:144 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1503 +#: builtin/commit.c:1508 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1504 +#: builtin/commit.c:1509 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1506 +#: builtin/commit.c:1511 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1512 +#: builtin/commit.c:1517 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1513 +#: builtin/commit.c:1518 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1514 +#: builtin/commit.c:1519 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1515 +#: builtin/commit.c:1520 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1517 +#: builtin/commit.c:1522 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1531 +#: builtin/commit.c:1536 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1532 +#: builtin/commit.c:1537 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1539 +#: builtin/commit.c:1544 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacío" -#: builtin/commit.c:1541 +#: builtin/commit.c:1546 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1614 +#: builtin/commit.c:1619 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1621 +#: builtin/commit.c:1626 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1640 +#: builtin/commit.c:1645 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1647 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1652 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abortando commit; no se ha editado el mensaje\n" -#: builtin/commit.c:1686 +#: builtin/commit.c:1691 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12475,54 +12886,59 @@ msgstr "" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de " "split>" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 -#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:52 +#, c-format +msgid "could not find object directory matching %s" +msgstr "no se pudo entoncrar el objeto directorio concordante con %s" + +#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 +#: builtin/commit-graph.c:211 msgid "The object directory to store the graph" msgstr "El directorio de objetos para guardar el gráfico" -#: builtin/commit-graph.c:51 +#: builtin/commit-graph.c:71 msgid "if the commit-graph is split, only verify the tip file" msgstr "si el commit-graph está cortado, solo verifica la punta del archivo" -#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "No se pudo abrir commit-graph '%s'" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:128 msgid "start walk at all refs" msgstr "comenzar caminata en todas las refs" -#: builtin/commit-graph.c:108 +#: builtin/commit-graph.c:130 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de índices por stdin por commits" -#: builtin/commit-graph.c:110 +#: builtin/commit-graph.c:132 msgid "start walk at commits listed by stdin" msgstr "comenzar a caminar a los commits listados por stdin" -#: builtin/commit-graph.c:112 +#: builtin/commit-graph.c:134 msgid "include all commits already in the commit-graph file" msgstr "inclye todos los commits que ya están en el archivo commit-graph" -#: builtin/commit-graph.c:115 +#: builtin/commit-graph.c:137 msgid "allow writing an incremental commit-graph file" msgstr "permitir escribir un archivo commit-graph incremental" -#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 +#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 msgid "maximum number of commits in a non-base split commit-graph" msgstr "máximo número de commits en un commit-graph sin base cortada" -#: builtin/commit-graph.c:119 +#: builtin/commit-graph.c:141 msgid "maximum ratio between two levels of a split commit-graph" msgstr "radio máximo entre dos niveles de corte de commit-graph" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:159 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" @@ -12530,206 +12946,212 @@ msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argumento --type no reconocido, %s" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "solo un tipo a la vez" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "Ubicación del archivo configuración" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "usar un archivo de config por árbol de trabajo" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "Acción" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "obtener valor: nombre [valor-regex]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "obtener todos los valores: llave [valores-regex]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "obtener valor especifico para el URL: sección[.var] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplazar todas las variables que concuerden: nombre valor [valor_regex]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "borrar una variable. nombre [valor-regex]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "borrar todas las concurrencias: nombre [valor-regex]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "renombrar sección: nombre-viejo nombre-nuevo" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "borrar una sección: nombre" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "listar todo" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "Tipo" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "al valor se ha dado este tipo" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "valor es una fecha de expiración" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "Otro" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "terminar valores con un byte NULL" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "respetar directivas include en la búsqueda" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:159 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"mostrar el scope de la configuración (worktree, local, global, system, " +"command)" + +#: builtin/config.c:160 builtin/env--helper.c:40 msgid "value" msgstr "valor" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "con --get, usa el valor por defecto cuando falta una entrada" -#: builtin/config.c:172 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "número de argumentos inválidos, deberían ser %d" -#: builtin/config.c:174 +#: builtin/config.c:176 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "número de argumentos inválidos, deberían ser de %d a %d" -#: builtin/config.c:308 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "patrón de llave inválido: %s" -#: builtin/config.c:344 +#: builtin/config.c:360 #, c-format msgid "failed to format default config value: %s" msgstr "falló al formatear el valor por defecto de configuración: %s" -#: builtin/config.c:401 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "no se analizar color '%s'" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "no es posible analizar el valor por defecto de color" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "no en un directorio git" -#: builtin/config.c:499 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "escribir en stdin no está soportado" -#: builtin/config.c:502 +#: builtin/config.c:518 msgid "writing config blobs is not supported" msgstr "escribir blobs de configuración no está soportado" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12744,23 +13166,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "solo un archivo de configuración a la vez" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:619 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "--blob solo puede ser usado dentro de un repositorio" -#: builtin/config.c:638 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "$HOME no está configurado" -#: builtin/config.c:658 +#: builtin/config.c:679 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12772,52 +13194,52 @@ msgstr "" "\"\n" "en \"git help worktree\" para más detalles" -#: builtin/config.c:688 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "--get-color y tipo de variable incoherente" -#: builtin/config.c:693 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "solo una acción a la vez" -#: builtin/config.c:706 +#: builtin/config.c:732 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only solo es aplicable para --list o --get-regexp" -#: builtin/config.c:712 +#: builtin/config.c:738 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list" -#: builtin/config.c:718 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "--default solo es aplicable para --get" -#: builtin/config.c:731 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "no se puede leer el archivo de configuración '%s'" -#: builtin/config.c:734 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "error al procesar archivo(s) de configuración" -#: builtin/config.c:744 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "editar stdin no está soportado" -#: builtin/config.c:746 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "editar blobs no está soportado" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuración %s" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12826,7 +13248,7 @@ msgstr "" "no se puede sobrescribir múltiples valores con un único valor\n" "\tUse una regexp, --add o --replace-all para cambiar %s." -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "no existe la sección: %s" @@ -12884,12 +13306,12 @@ msgstr "no hay tag que concuerde exactamente con '%s'" msgid "No exact match on refs or tags, searching to describe\n" msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n" -#: builtin/describe.c:381 +#: builtin/describe.c:394 #, c-format msgid "finished search at %s\n" msgstr "búsqueda finalizada a las %s\n" -#: builtin/describe.c:407 +#: builtin/describe.c:421 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12898,7 +13320,7 @@ msgstr "" "No hay tags anotados que puedan describir '%s'.\n" "Sin embargo, hubieron tags no anotados: intente --tags." -#: builtin/describe.c:411 +#: builtin/describe.c:425 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12907,12 +13329,12 @@ msgstr "" "Ningún tag puede describit '%s'.\n" "Intente --always, o cree algunos tags." -#: builtin/describe.c:441 +#: builtin/describe.c:455 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits cruzados\n" -#: builtin/describe.c:444 +#: builtin/describe.c:458 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12921,90 +13343,90 @@ msgstr "" "se encontró más de %i tags; se mostró %i más reciente\n" "fin de la búsqueda en %s\n" -#: builtin/describe.c:512 +#: builtin/describe.c:526 #, c-format msgid "describe %s\n" msgstr "describe %s\n" -#: builtin/describe.c:515 +#: builtin/describe.c:529 #, c-format msgid "Not a valid object name %s" msgstr "Nombre de objeto %s no válido" -#: builtin/describe.c:523 +#: builtin/describe.c:537 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no es un commit ni un blob" -#: builtin/describe.c:537 +#: builtin/describe.c:551 msgid "find the tag that comes after the commit" msgstr "encontrar el tag que viene después del commit" -#: builtin/describe.c:538 +#: builtin/describe.c:552 msgid "debug search strategy on stderr" msgstr "hacer debug a la estrategia de búsqueda en stderr" -#: builtin/describe.c:539 +#: builtin/describe.c:553 msgid "use any ref" msgstr "use cualquier ref" -#: builtin/describe.c:540 +#: builtin/describe.c:554 msgid "use any tag, even unannotated" msgstr "use cualquier tag, incluso los no anotados" -#: builtin/describe.c:541 +#: builtin/describe.c:555 msgid "always use long format" msgstr "siempre usar formato largo" -#: builtin/describe.c:542 +#: builtin/describe.c:556 msgid "only follow first parent" msgstr "solo seguir el primer patrón" -#: builtin/describe.c:545 +#: builtin/describe.c:559 msgid "only output exact matches" msgstr "solo mostrar concordancias exactas" -#: builtin/describe.c:547 +#: builtin/describe.c:561 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar <n> tags más recientes (default:10)" -#: builtin/describe.c:549 +#: builtin/describe.c:563 msgid "only consider tags matching <pattern>" msgstr "solo considerar tags que concuerden con <patrón>" -#: builtin/describe.c:551 +#: builtin/describe.c:565 msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrón>" -#: builtin/describe.c:553 builtin/name-rev.c:473 +#: builtin/describe.c:567 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:568 builtin/describe.c:571 msgid "mark" msgstr "marca" -#: builtin/describe.c:555 +#: builtin/describe.c:569 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" -#: builtin/describe.c:558 +#: builtin/describe.c:572 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")" -#: builtin/describe.c:576 +#: builtin/describe.c:590 msgid "--long is incompatible with --abbrev=0" msgstr "--long es incompatible con --abbrev=0" -#: builtin/describe.c:605 +#: builtin/describe.c:619 msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#: builtin/describe.c:656 +#: builtin/describe.c:670 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty es incompatible con commit-ismos" -#: builtin/describe.c:658 +#: builtin/describe.c:672 msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" @@ -13185,7 +13607,7 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:852 +#: builtin/fast-export.c:853 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" "Error: No se puede exportar los tags anidados a menos que --mark-tags sea " @@ -13284,19 +13706,19 @@ msgstr "git fetch --all [<opciones>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel no puede ser negativo" -#: builtin/fetch.c:139 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:184 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:141 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:228 msgid "set upstream for git pull/fetch" msgstr "configurar upstream para git pulll/fetch" -#: builtin/fetch.c:143 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:187 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:145 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:190 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" @@ -13308,7 +13730,7 @@ msgstr "forzar sobrescritura de referencia local" msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:150 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:194 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" @@ -13320,7 +13742,7 @@ msgstr "no extraer todos los tags (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:156 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:197 msgid "prune remote-tracking branches no longer on remote" msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" @@ -13330,7 +13752,7 @@ msgstr "" "limpiar tags locales que no se encuentran en el remoto y eliminar tags " "cambiados" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 msgid "on-demand" msgstr "en demanda" @@ -13338,7 +13760,7 @@ msgstr "en demanda" msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:164 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:205 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" @@ -13346,7 +13768,7 @@ msgstr "mantener el paquete descargado" msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" @@ -13354,7 +13776,7 @@ msgstr "historia profunda de un clon superficial" msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:177 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:211 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" @@ -13370,15 +13792,15 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:187 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:214 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:216 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:189 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:217 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" @@ -13390,7 +13812,7 @@ msgstr "reporta que solo tenemos objetos alcanzables de este objeto" msgid "run 'gc --auto' after fetching" msgstr "ejecutar 'gc --auto' tras el fetch" -#: builtin/fetch.c:201 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:226 msgid "check for forced-updates on all updated branches" msgstr "verificar updates forzados en todos los branch actualizados" @@ -13481,22 +13903,22 @@ msgstr "" "false'\n" "para evitar esta validación.\n" -#: builtin/fetch.c:911 +#: builtin/fetch.c:920 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:932 +#: builtin/fetch.c:941 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:1017 builtin/fetch.c:1155 +#: builtin/fetch.c:1026 builtin/fetch.c:1164 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:1028 +#: builtin/fetch.c:1037 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13505,56 +13927,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:1125 +#: builtin/fetch.c:1134 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:1126 +#: builtin/fetch.c:1135 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1167 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1159 builtin/remote.c:1035 +#: builtin/fetch.c:1168 builtin/remote.c:1112 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1191 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" -#: builtin/fetch.c:1201 +#: builtin/fetch.c:1210 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1213 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1412 +#: builtin/fetch.c:1421 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "múltiples ramas detectadas, incompatible con --set-upstream" -#: builtin/fetch.c:1427 +#: builtin/fetch.c:1436 msgid "not setting upstream for a remote remote-tracking branch" msgstr "no configurar upstream para una rama de rastreo remoto" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1438 msgid "not setting upstream for a remote tag" msgstr "no configurar upstream para un tag remoto" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1440 msgid "unknown branch type" msgstr "tipo de branch desconocido" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1442 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -13562,22 +13984,22 @@ msgstr "" "no se encontró rama fuente.\n" "tienes que especificar exactamente una rama con la opción --set-upstream." -#: builtin/fetch.c:1559 builtin/fetch.c:1622 +#: builtin/fetch.c:1568 builtin/fetch.c:1631 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 +#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1581 +#: builtin/fetch.c:1590 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n" -#: builtin/fetch.c:1684 +#: builtin/fetch.c:1693 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13585,44 +14007,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:1721 +#: builtin/fetch.c:1730 msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1771 +#: builtin/fetch.c:1780 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1773 +#: builtin/fetch.c:1782 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1787 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1789 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1796 +#: builtin/fetch.c:1805 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1798 +#: builtin/fetch.c:1807 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1816 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1814 +#: builtin/fetch.c:1823 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:1841 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13636,23 +14058,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "poblar el log con máximo <n> entradas del shorlog" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "alias para --log (deprecado)" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:681 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "use <text> como comienzo de mensaje" -#: builtin/fmt-merge-msg.c:682 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "archivo del cual leer" @@ -13860,7 +14282,7 @@ msgstr "Revisando objetos directorios" msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:695 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "%s inválido" @@ -14060,7 +14482,7 @@ msgstr "" "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para " "eliminarlos." -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" @@ -14078,262 +14500,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:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 +#: builtin/pack-objects.c:2854 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:650 +#: builtin/grep.c:633 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:716 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:815 +#: builtin/grep.c:803 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:817 +#: builtin/grep.c:805 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:819 +#: builtin/grep.c:807 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:821 +#: builtin/grep.c:809 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:823 +#: builtin/grep.c:811 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:826 +#: builtin/grep.c:814 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:828 +#: builtin/grep.c:816 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:830 +#: builtin/grep.c:818 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:832 +#: builtin/grep.c:820 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:834 +#: builtin/grep.c:822 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:837 +#: builtin/grep.c:825 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:839 +#: builtin/grep.c:827 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:841 +#: builtin/grep.c:829 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:845 +#: builtin/grep.c:833 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:848 +#: builtin/grep.c:836 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:851 +#: builtin/grep.c:839 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:854 +#: builtin/grep.c:842 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:857 +#: builtin/grep.c:845 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:858 +#: builtin/grep.c:846 msgid "show column number of first match" msgstr "mostrar el número de columna de la primer coincidencia" -#: builtin/grep.c:859 +#: builtin/grep.c:847 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:860 +#: builtin/grep.c:848 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:862 +#: builtin/grep.c:850 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:864 +#: builtin/grep.c:852 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:866 +#: builtin/grep.c:854 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:869 +#: builtin/grep.c:857 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:871 +#: builtin/grep.c:859 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:874 +#: builtin/grep.c:862 msgid "show only matching parts of a line" msgstr "mostrar solo partes que concuerdan de una línea" -#: builtin/grep.c:876 +#: builtin/grep.c:864 msgid "show the number of matches instead of matching lines" msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:877 +#: builtin/grep.c:865 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:879 +#: builtin/grep.c:867 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:881 +#: builtin/grep.c:869 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:884 +#: builtin/grep.c:872 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:887 +#: builtin/grep.c:875 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:889 +#: builtin/grep.c:877 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:891 +#: builtin/grep.c:879 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:892 +#: builtin/grep.c:880 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:895 +#: builtin/grep.c:883 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:897 +#: builtin/grep.c:885 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:900 +#: builtin/grep.c:888 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:902 +#: builtin/grep.c:890 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:904 +#: builtin/grep.c:892 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:916 +#: builtin/grep.c:904 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:918 +#: builtin/grep.c:906 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:920 +#: builtin/grep.c:908 msgid "show parse tree for grep expression" msgstr "mostrar árbol analizado para la expresión grep" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "pager" msgstr "paginador" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:928 +#: builtin/grep.c:916 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:992 +#: builtin/grep.c:983 msgid "no pattern given" msgstr "no se ha entregado patrón" -#: builtin/grep.c:1028 +#: builtin/grep.c:1019 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1036 +#: builtin/grep.c:1027 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1067 +#: builtin/grep.c:1057 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked no es soportada con --recurse-submodules" + +#: builtin/grep.c:1061 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1064 builtin/pack-objects.c:3547 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1096 +#: builtin/grep.c:1101 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1119 -msgid "option not supported with --recurse-submodules" -msgstr "opción no soportada con --recurse-submodules" - -#: builtin/grep.c:1125 +#: builtin/grep.c:1127 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1131 +#: builtin/grep.c:1133 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1139 +#: builtin/grep.c:1141 msgid "both --cached and trees are given" msgstr "--cached y árboles han sido entregados" @@ -14519,7 +14941,7 @@ msgstr "leer error en input" 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:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:606 msgid "pack too large for current definition of off_t" msgstr "paquete muy grande para la definición actual de off_t" @@ -14579,191 +15001,191 @@ msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:158 +#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusión más allá de la locura en parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completado con %d objeto local" msgstr[1] "completado con %d objetos locales" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paquete tiene %d delta sin resolver" msgstr[1] "paquete tiene %d deltas sin resolver" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1392 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1406 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1431 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1439 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1463 msgid "error while closing pack file" msgstr "error mientras se cierra el archivo paquete" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1477 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1485 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1599 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No se puede abrir el índice del archivo paquete para '%s'" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1647 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1654 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1693 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:1742 builtin/index-pack.c:1745 +#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1781 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1783 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1789 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" @@ -15482,7 +15904,7 @@ msgstr "" msgid "do not print remote URL" msgstr "no mostrar el URL remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 msgid "exec" msgstr "ejecutar" @@ -15568,181 +15990,181 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:119 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "option `%s' requires a value" msgstr "opción `%s' requiere un valor" -#: builtin/merge.c:187 +#: builtin/merge.c:188 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:189 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:193 +#: builtin/merge.c:194 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:245 builtin/pull.c:132 msgid "do not show a diffstat at the end of the merge" msgstr "no mostrar un diffstat al final de la fusión" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:248 builtin/pull.c:135 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:249 builtin/pull.c:138 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:251 builtin/pull.c:141 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " "fusión" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:254 builtin/pull.c:147 msgid "create a single commit instead of doing a merge" msgstr "crear un commit único en lugar de hacer una fusión" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:256 builtin/pull.c:150 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:258 builtin/pull.c:153 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:262 builtin/pull.c:160 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:266 builtin/pull.c:163 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tiene una firma GPG válida" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 +#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 +#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:268 builtin/pull.c:168 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:171 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#: builtin/merge.c:278 +#: builtin/merge.c:279 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:280 +#: builtin/merge.c:281 msgid "--abort but leave index and working tree alone" msgstr "--abort pero deja el índice y el árbol de trabajo solos" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:285 builtin/pull.c:179 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:290 +#: builtin/merge.c:291 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" -#: builtin/merge.c:307 +#: builtin/merge.c:308 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:312 +#: builtin/merge.c:313 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:317 +#: builtin/merge.c:318 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:340 builtin/merge.c:357 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:386 +#: builtin/merge.c:387 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:397 +#: builtin/merge.c:398 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:448 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:585 +#: builtin/merge.c:586 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:705 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:719 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:734 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:786 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No se realiza commit de la fusión; use 'git commit' para completar la " "fusión.\n" -#: builtin/merge.c:801 +#: builtin/merge.c:804 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -15754,11 +16176,11 @@ msgstr "" "tópico.\n" "\n" -#: builtin/merge.c:806 +#: builtin/merge.c:809 msgid "An empty message aborts the commit.\n" msgstr "Un mensaje vacío aborta el commit.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:812 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15767,74 +16189,74 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" " el commit.\n" -#: builtin/merge.c:862 +#: builtin/merge.c:865 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:877 +#: builtin/merge.c:880 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:938 +#: builtin/merge.c:941 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:977 +#: builtin/merge.c:980 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:979 +#: builtin/merge.c:982 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:981 +#: builtin/merge.c:984 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:986 +#: builtin/merge.c:989 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remoto para %s de %s" -#: builtin/merge.c:1043 +#: builtin/merge.c:1046 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1146 +#: builtin/merge.c:1149 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1180 +#: builtin/merge.c:1183 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1283 +#: builtin/merge.c:1286 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1287 +#: builtin/merge.c:1290 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1296 +#: builtin/merge.c:1299 msgid "--quit expects no arguments" msgstr "--quit no espera argumentos" -#: builtin/merge.c:1309 +#: builtin/merge.c:1312 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1313 +#: builtin/merge.c:1316 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1329 +#: builtin/merge.c:1332 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15842,7 +16264,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:1336 +#: builtin/merge.c:1339 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15850,97 +16272,97 @@ 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:1339 +#: builtin/merge.c:1342 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:1353 +#: builtin/merge.c:1356 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1355 +#: builtin/merge.c:1358 msgid "You cannot combine --squash with --commit." msgstr "No se puede combinar --squash con --commit." -#: builtin/merge.c:1371 +#: builtin/merge.c:1374 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1388 +#: builtin/merge.c:1391 msgid "Squash commit into empty head not supported yet" msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" -#: builtin/merge.c:1390 +#: builtin/merge.c:1393 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1395 +#: builtin/merge.c:1398 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1397 +#: builtin/merge.c:1400 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1476 +#: builtin/merge.c:1481 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1485 +#: builtin/merge.c:1490 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1495 +#: builtin/merge.c:1500 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1537 +#: builtin/merge.c:1542 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1544 +#: builtin/merge.c:1549 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1569 +#: builtin/merge.c:1574 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1575 +#: builtin/merge.c:1580 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1603 builtin/merge.c:1668 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1602 +#: builtin/merge.c:1607 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1654 +#: builtin/merge.c:1659 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1656 +#: builtin/merge.c:1661 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1665 +#: builtin/merge.c:1670 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usando el %s para preparar resolución a mano.\n" -#: builtin/merge.c:1677 +#: builtin/merge.c:1682 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16195,52 +16617,52 @@ msgstr "%s, fuente=%s, destino=%s" msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' falló" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opciones>] <commit>..." -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opciones>] --all" -#: builtin/name-rev.c:405 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" -#: builtin/name-rev.c:462 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "imprimir sólo nombres (sin SHA-1)" -#: builtin/name-rev.c:463 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "sólo usar tags para nombrar commits" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "solo usar refs que concuerden con <patrón>" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignorar refs que concuerden con <patrón>" -#: builtin/name-rev.c:469 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "listar todos los commits alcanzables desde todas las referencias" -#: builtin/name-rev.c:470 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "leer desde stdin" -#: builtin/name-rev.c:471 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nombres `undefined` (predeterminado)" -#: builtin/name-rev.c:477 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags en la entrada (uso interno)" @@ -16656,7 +17078,7 @@ msgstr "referencia-de-notas" msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1643 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" @@ -16675,129 +17097,106 @@ msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:430 #, c-format msgid "bad packed object CRC for %s" msgstr "mal paquete de objeto CRC para %s" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:441 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:572 #, c-format msgid "recursive delta detected for object %s" msgstr "delta recursivo encontrado para objeto %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:783 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: builtin/pack-objects.c:794 -#, c-format -msgid "packfile is invalid: %s" -msgstr "packfile es inválido: %s" - -#: builtin/pack-objects.c:798 -#, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "no es posible abrir packfile para reusar: %s" - -#: builtin/pack-objects.c:802 -msgid "unable to seek in reused packfile" -msgstr "no es posible buscar en los packfile reusados" - -#: builtin/pack-objects.c:813 -msgid "unable to read from reused packfile" -msgstr "no es posible leer de packfile reusado" - -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:972 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:985 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:917 builtin/update-index.c:90 +#: builtin/pack-objects.c:1046 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1099 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1297 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:1592 +#: builtin/pack-objects.c:1724 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow de offset en la base de delta en paquete para %s" -#: builtin/pack-objects.c:1601 +#: builtin/pack-objects.c:1733 #, c-format msgid "delta base offset out of bound for %s" msgstr "outbound de offset en la base de delta para %s" -#: builtin/pack-objects.c:1870 +#: builtin/pack-objects.c:2004 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:2000 -#, c-format -msgid "unable to get size of %s" -msgstr "no se pudo obtener el tamaño de %s" - -#: builtin/pack-objects.c:2015 +#: builtin/pack-objects.c:2149 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 -#: builtin/pack-objects.c:2111 +#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 +#: builtin/pack-objects.c:2245 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 +#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2125 +#: builtin/pack-objects.c:2259 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2574 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2713 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no es posible empaquetar objetos alcanzables desde tag %s" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2801 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2807 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:2742 +#: builtin/pack-objects.c:2888 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16806,7 +17205,7 @@ msgstr "" "se espseraba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:2748 +#: builtin/pack-objects.c:2894 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16815,233 +17214,237 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2992 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 +#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:3082 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto perdido en %s no pudo ser examinado" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3167 msgid "unable to force loose object" msgstr "incapaz de forzar un objeto perdido" -#: builtin/pack-objects.c:3113 +#: builtin/pack-objects.c:3260 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3263 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3288 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3341 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3345 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3236 +#: builtin/pack-objects.c:3383 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3384 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3387 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3389 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3391 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3393 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3395 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3397 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3399 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3401 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3403 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3405 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3407 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3409 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3411 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3414 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3417 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3420 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3423 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3425 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3427 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3429 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3431 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3434 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3436 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3438 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3440 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:3295 +#: builtin/pack-objects.c:3442 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3297 +#: builtin/pack-objects.c:3444 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3446 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3448 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3450 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3454 msgid "write a bitmap index if possible" msgstr "escribir un índice de bitmap si es posible" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3458 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3314 +#: builtin/pack-objects.c:3461 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3316 +#: builtin/pack-objects.c:3463 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3492 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3497 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es muy grande, forzando %d" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3551 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size no puede ser usado para construir un paquete para " "transferencia" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3553 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3558 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin no puede ser usado para construir un paquete indexable" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3561 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3567 msgid "cannot use --filter without --stdout" msgstr "no se puede usar--filter sin --stdout" -#: builtin/pack-objects.c:3481 +#: builtin/pack-objects.c:3627 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3657 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "" +"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-" +"reusado %<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17083,66 +17486,66 @@ msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" msgid "cannot prune in a precious-objects repo" msgstr "no se puede recortar en un repositorio de objetos-preciosos" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor inválido para %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" -#: builtin/pull.c:142 +#: builtin/pull.c:122 msgid "control for recursive fetching of submodules" msgstr "control de fetch recursivo en submódulos" -#: builtin/pull.c:146 +#: builtin/pull.c:126 msgid "Options related to merging" msgstr "Opciones relacionadas a fusión" -#: builtin/pull.c:149 +#: builtin/pull.c:129 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 +#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: builtin/pull.c:186 +#: builtin/pull.c:166 msgid "automatically stash/stash pop before and after rebase" msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" -#: builtin/pull.c:202 +#: builtin/pull.c:182 msgid "Options related to fetching" msgstr "Opciones relacionadas a fetch" -#: builtin/pull.c:212 +#: builtin/pull.c:192 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/pull.c:220 +#: builtin/pull.c:200 msgid "number of submodules pulled in parallel" msgstr "número de submódulos que realizan pull en paralelo" -#: builtin/pull.c:320 +#: builtin/pull.c:300 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido para pull.ff: %s" -#: builtin/pull.c:437 +#: builtin/pull.c:426 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." -#: builtin/pull.c:439 +#: builtin/pull.c:428 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hay candidatos para fusionar entre las refs que has bajado con fetch." -#: builtin/pull.c:440 +#: builtin/pull.c:429 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17151,7 +17554,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:443 +#: builtin/pull.c:432 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17162,44 +17565,44 @@ msgstr "" "una rama. Porque este no es el remoto configurado por default\n" "para tu rama actual, tienes que especificar una rama en la línea de comando." -#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 +#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 +#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 +#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:453 builtin/pull.c:468 +#: builtin/pull.c:442 builtin/pull.c:457 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 -#: builtin/rebase.c:1381 git-parse-remote.sh:64 +#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 +#: builtin/rebase.c:1415 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 +#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75 +#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:472 git-parse-remote.sh:95 +#: builtin/pull.c:461 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si deseas configurar el rastreo de información para esta rama, puedes " "hacerlo con:" -#: builtin/pull.c:477 +#: builtin/pull.c:466 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17208,32 +17611,32 @@ msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" "de tu remoto, pero no se pudo hacer fetch a esa ref." -#: builtin/pull.c:587 +#: builtin/pull.c:576 #, c-format msgid "unable to access commit %s" msgstr "no es posible acceder al commit %s" -#: builtin/pull.c:867 +#: builtin/pull.c:857 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:922 +#: builtin/pull.c:912 msgid "--[no-]autostash option is only valid with --rebase." msgstr "La opción --[no-]autostash sólo es válida con --rebase." -#: builtin/pull.c:930 +#: builtin/pull.c:920 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nata con cambios agregados al índice." -#: builtin/pull.c:934 +#: builtin/pull.c:924 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:935 +#: builtin/pull.c:925 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:960 +#: builtin/pull.c:950 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17244,7 +17647,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:966 +#: builtin/pull.c:956 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17261,15 +17664,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:981 +#: builtin/pull.c:971 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:985 +#: builtin/pull.c:975 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:992 +#: builtin/pull.c:982 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -17708,216 +18111,207 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 +#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilizable: '%s'" -#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 -#, c-format -msgid "could not write '%s'." -msgstr "no se pudo escribir '%s'." - -#: builtin/rebase.c:271 -msgid "no HEAD?" -msgstr "¿Sin HEAD?" - -#: builtin/rebase.c:298 +#: builtin/rebase.c:292 #, c-format msgid "could not create temporary %s" msgstr "no se pudo crear archivo temporal %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:298 msgid "could not mark as interactive" msgstr "no se pudo marcar como interactivo" -#: builtin/rebase.c:362 +#: builtin/rebase.c:352 msgid "could not generate todo list" msgstr "no se pudo generar lista de pendientes" -#: builtin/rebase.c:402 +#: builtin/rebase.c:391 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit base tiene que ser provisto con --upstream o --onto" -#: builtin/rebase.c:457 +#: builtin/rebase.c:461 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opciones>]" -#: builtin/rebase.c:469 -msgid "keep empty commits" -msgstr "mantener commits vacíos" +#: builtin/rebase.c:474 builtin/rebase.c:1550 +msgid "(DEPRECATED) keep empty commits" +msgstr "(DEPRECADO) mantener commits vacíos" -#: builtin/rebase.c:471 builtin/revert.c:128 +#: builtin/rebase.c:478 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits con mensajes vacíos" -#: builtin/rebase.c:472 +#: builtin/rebase.c:480 msgid "rebase merge commits" msgstr "rebasando commits de fusión" -#: builtin/rebase.c:474 +#: builtin/rebase.c:482 msgid "keep original branch points of cousins" msgstr "mantener puntos originales de la rama de sus primos" -#: builtin/rebase.c:476 +#: builtin/rebase.c:484 msgid "move commits that begin with squash!/fixup!" msgstr "mover commits que comienzan con squash!/fixup!" -#: builtin/rebase.c:477 +#: builtin/rebase.c:485 msgid "sign commits" msgstr "firmar commits" -#: builtin/rebase.c:479 builtin/rebase.c:1455 +#: builtin/rebase.c:487 builtin/rebase.c:1490 msgid "display a diffstat of what changed upstream" msgstr "mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:481 +#: builtin/rebase.c:489 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:483 +#: builtin/rebase.c:491 msgid "skip commit" msgstr "saltar commit" -#: builtin/rebase.c:484 +#: builtin/rebase.c:492 msgid "edit the todo list" msgstr "editar la lista de pendientes" -#: builtin/rebase.c:486 +#: builtin/rebase.c:494 msgid "show the current patch" msgstr "mostrar el parche actual" -#: builtin/rebase.c:489 +#: builtin/rebase.c:497 msgid "shorten commit ids in the todo list" msgstr "ids de commits cortos en la lista de pendientes" -#: builtin/rebase.c:491 +#: builtin/rebase.c:499 msgid "expand commit ids in the todo list" msgstr "expandir ids de commits en la lista de pendientes" -#: builtin/rebase.c:493 +#: builtin/rebase.c:501 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase.c:495 +#: builtin/rebase.c:503 msgid "rearrange fixup/squash lines" msgstr "reorganizar líneas fixup/squash" -#: builtin/rebase.c:497 +#: builtin/rebase.c:505 msgid "insert exec commands in todo list" msgstr "insertar comando exec en la lista de pendientes" -#: builtin/rebase.c:498 +#: builtin/rebase.c:506 msgid "onto" msgstr "hacia" -#: builtin/rebase.c:501 +#: builtin/rebase.c:509 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:501 +#: builtin/rebase.c:509 msgid "restrict revision" msgstr "restringir revision" -#: builtin/rebase.c:503 +#: builtin/rebase.c:511 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:504 +#: builtin/rebase.c:512 msgid "squash onto" msgstr "squash hacia" -#: builtin/rebase.c:506 +#: builtin/rebase.c:514 msgid "the upstream commit" msgstr "el commit de upstream" -#: builtin/rebase.c:508 +#: builtin/rebase.c:516 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:508 +#: builtin/rebase.c:516 msgid "head name" msgstr "nombre de head" -#: builtin/rebase.c:513 +#: builtin/rebase.c:521 msgid "rebase strategy" msgstr "estrategia de rebase" -#: builtin/rebase.c:514 +#: builtin/rebase.c:522 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:515 +#: builtin/rebase.c:523 msgid "strategy options" msgstr "opciones de estrategia" -#: builtin/rebase.c:516 +#: builtin/rebase.c:524 msgid "switch-to" msgstr "cambiar a" -#: builtin/rebase.c:517 +#: builtin/rebase.c:525 msgid "the branch or commit to checkout" msgstr "la rama o commit para hacer checkout" -#: builtin/rebase.c:518 +#: builtin/rebase.c:526 msgid "onto-name" msgstr "hacia-nombre" -#: builtin/rebase.c:518 +#: builtin/rebase.c:526 msgid "onto name" msgstr "hacia nombre" -#: builtin/rebase.c:519 +#: builtin/rebase.c:527 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:519 +#: builtin/rebase.c:527 msgid "the command to run" msgstr "el comando para ejecutar" -#: builtin/rebase.c:522 builtin/rebase.c:1540 +#: builtin/rebase.c:530 builtin/rebase.c:1584 msgid "automatically re-schedule any `exec` that fails" msgstr "reprogramar automaticamente cualquier `exec` que falle" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" -#: builtin/rebase.c:556 +#: builtin/rebase.c:562 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiere un rebase interactivo" -#: builtin/rebase.c:608 +#: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:623 +#: builtin/rebase.c:627 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head inválido: '%s'" -#: builtin/rebase.c:648 +#: builtin/rebase.c:652 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando inválido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:724 +#: builtin/rebase.c:728 #, c-format msgid "Could not read '%s'" msgstr "No se pudo leer '%s'" -#: builtin/rebase.c:742 +#: builtin/rebase.c:746 #, c-format msgid "Cannot store %s" msgstr "No se puede guardar %s" -#: builtin/rebase.c:849 +#: builtin/rebase.c:853 msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisión HEAD" -#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17932,7 +18326,7 @@ msgstr "" "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:1060 +#: builtin/rebase.c:1058 #, c-format msgid "" "\n" @@ -17951,7 +18345,16 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1383 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" +"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y " +"\"ask\"." + +#: builtin/rebase.c:1401 #, c-format msgid "" "%s\n" @@ -17968,7 +18371,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1383 +#: builtin/rebase.c:1417 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17981,143 +18384,135 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1447 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1451 msgid "empty exec command" msgstr "comando exec vacío" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1481 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:1448 +#: builtin/rebase.c:1483 msgid "use the merge-base of upstream and branch as the current base" msgstr "usar la base de fusión de upstream y la rama como base actual" -#: builtin/rebase.c:1450 +#: builtin/rebase.c:1485 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1487 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:1458 +#: builtin/rebase.c:1493 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1496 msgid "add a Signed-off-by: line to each commit" msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit" -#: builtin/rebase.c:1464 -msgid "make committer date match author date" -msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" +#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +msgid "passed to 'git am'" +msgstr "pasado a 'git am'" -#: builtin/rebase.c:1466 -msgid "ignore author date and use current date" -msgstr "ignorar la fecha del autor y usar la fecha actual" - -#: builtin/rebase.c:1468 -msgid "synonym of --reset-author-date" -msgstr "sinónimo para --reset-author-date" - -#: builtin/rebase.c:1470 builtin/rebase.c:1474 +#: builtin/rebase.c:1506 builtin/rebase.c:1508 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:1472 -msgid "ignore changes in whitespace" -msgstr "ignorar cambios en espacios en blanco" - -#: builtin/rebase.c:1476 builtin/rebase.c:1479 +#: builtin/rebase.c:1510 builtin/rebase.c:1513 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1515 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1518 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1520 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1523 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde está" -#: builtin/rebase.c:1490 +#: builtin/rebase.c:1524 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1527 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1530 +msgid "use apply strategies to rebase" +msgstr "usar estrategias de apply para el rebase" + +#: builtin/rebase.c:1534 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusión para el rebase" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1538 msgid "let the user edit the list of commits to rebase" msgstr "permitir al usuario editar la lista de commits para rebasar" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1542 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1509 -msgid "preserve empty commits during rebase" -msgstr "preservar commits vacíos durante el rebase" +#: builtin/rebase.c:1547 +msgid "how to handle commits that become empty" +msgstr "como manejar commits que se vuelven vacíos" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1554 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: builtin/rebase.c:1517 +#: builtin/rebase.c:1560 msgid "automatically stash/stash pop before and after" msgstr "ejecutar automáticamente stash/stash pop antes y después" -#: builtin/rebase.c:1519 +#: builtin/rebase.c:1562 msgid "add exec lines after each commit of the editable list" msgstr "agregar líneas exec tras cada acommit de la lista editable" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1566 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vacíos" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1570 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:1529 +#: builtin/rebase.c:1573 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1531 +#: builtin/rebase.c:1575 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1533 builtin/revert.c:115 +#: builtin/rebase.c:1577 builtin/revert.c:115 msgid "option" msgstr "opción" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1578 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusión" -#: builtin/rebase.c:1537 +#: builtin/rebase.c:1581 msgid "rebase all reachable commits up to the root(s)" msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1598 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18125,38 +18520,38 @@ msgstr "" "el soporte para rebase.useBuiltin ha sido eliminado!\n" "Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1604 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Parece que 'git am' está en progreso. No se puede rebasar." -#: builtin/rebase.c:1601 +#: builtin/rebase.c:1645 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar." -#: builtin/rebase.c:1606 +#: builtin/rebase.c:1650 msgid "cannot combine '--keep-base' with '--onto'" msgstr "no se puede combinar '--keep-base' con '--onto'" -#: builtin/rebase.c:1608 +#: builtin/rebase.c:1652 msgid "cannot combine '--keep-base' with '--root'" msgstr "no se puede combinar '--keep-base' con '--root'" -#: builtin/rebase.c:1612 +#: builtin/rebase.c:1656 msgid "No rebase in progress?" msgstr "¿No hay rebase en progreso?" -#: builtin/rebase.c:1616 +#: builtin/rebase.c:1660 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "La acción --edit-todo sólo puede ser usada al rebasar interactivamente." -#: builtin/rebase.c:1639 +#: builtin/rebase.c:1683 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1651 +#: builtin/rebase.c:1695 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18164,16 +18559,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1670 +#: builtin/rebase.c:1714 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del árbol de trabajo" -#: builtin/rebase.c:1689 +#: builtin/rebase.c:1733 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1734 +#: builtin/rebase.c:1778 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18194,168 +18589,167 @@ msgstr "" "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahí.\n" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1806 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numérico" -#: builtin/rebase.c:1798 +#: builtin/rebase.c:1847 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1820 +#: builtin/rebase.c:1869 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1899 +msgid "cannot combine apply options with merge options" +msgstr "no se pueden combinar opciones de apply con opciones de merge" + +#: builtin/rebase.c:1912 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "Backend de rebase desconocido: %s" + +#: builtin/rebase.c:1937 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: builtin/rebase.c:1872 -msgid "cannot combine am options with either interactive or merge options" -msgstr "" -"no se pueden combinar opciones de am con opciones interactivas o de merge" - -#: builtin/rebase.c:1891 +#: builtin/rebase.c:1957 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1961 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-" "exec'" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1985 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inválido '%s'" -#: builtin/rebase.c:1925 +#: builtin/rebase.c:1991 msgid "Could not create new root commit" msgstr "No se pudo crear commit raíz nuevo" -#: builtin/rebase.c:1951 +#: builtin/rebase.c:2017 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': necesita exactamente una base de fusión con rama" -#: builtin/rebase.c:1954 +#: builtin/rebase.c:2020 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusión" -#: builtin/rebase.c:1962 +#: builtin/rebase.c:2028 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit válido '%s'" -#: builtin/rebase.c:1987 +#: builtin/rebase.c:2054 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1961 +#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:2006 +#: builtin/rebase.c:2073 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisión" -#: builtin/rebase.c:2044 +#: builtin/rebase.c:2111 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2114 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2120 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: builtin/rebase.c:2056 +#: builtin/rebase.c:2123 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: builtin/rebase.c:2059 +#: builtin/rebase.c:2126 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: builtin/rebase.c:2068 +#: builtin/rebase.c:2135 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: builtin/rebase.c:2095 -#, c-format -msgid "could not parse '%s'" -msgstr "no se puede analizar '%s'" - -#: builtin/rebase.c:2108 +#: builtin/rebase.c:2169 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2180 msgid "HEAD is up to date." msgstr "HEAD está actualizado." -#: builtin/rebase.c:2121 +#: builtin/rebase.c:2182 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s está actualizada.\n" -#: builtin/rebase.c:2129 +#: builtin/rebase.c:2190 msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: builtin/rebase.c:2131 +#: builtin/rebase.c:2192 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Rama actual %s está actualizada, rebase forzado.\n" -#: builtin/rebase.c:2139 +#: builtin/rebase.c:2200 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: builtin/rebase.c:2146 +#: builtin/rebase.c:2207 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2149 +#: builtin/rebase.c:2210 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2174 +#: builtin/rebase.c:2235 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " "de ésta...\n" -#: builtin/rebase.c:2183 +#: builtin/rebase.c:2244 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2253 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rápido de %s a %s.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:821 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18388,7 +18782,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:841 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18409,11 +18803,11 @@ msgstr "" "\n" "Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:1936 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1950 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." @@ -18439,49 +18833,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog existe <ref>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "Marcando objectos alcanzables..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "¡%s apunta a ningún lado!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "no reflog especificado para borrar" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "no es una reflog: %s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "no reflog para '%s'" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "formato inválido: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18489,82 +18883,82 @@ msgstr "" "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nombre> <url>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <viejo> <nuevo>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nombre>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nombre>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nombre>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nombre> <rama>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nombre>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nombre> <nuevo-url>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nombre> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opciones>] <nombre> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nombre> <rama>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nombre> <rama>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opciones>] <nombre>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opciones>] <nombre>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Actualizando %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18572,84 +18966,100 @@ msgstr "" "Usar --mirror es peligroso y está desaprobado;\n" "\t usa más bien --mirror=fetch o --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "argumento mirror desconocido: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "realizar fetch a las ramas remotas" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "importar todos los tags y objetos asociados cuando realiza el fetch" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o no realziar fetch a ningún tag (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "rama(s) para rastrear" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "rama master" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "configurar remote como mirror para realizar push o desde el cual realizar " "fetch" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una rama master no tiene sentido con --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:696 #, c-format msgid "remote %s already exists." msgstr "remoto %s ya existe." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:700 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no es un nombre remoto válido" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "No se pudo configurar master '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "No se pudo realizar el fetch al mapa para refspec %s" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(concordando)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 +#: builtin/remote.c:653 +#, c-format +msgid "could not set '%s'" +msgstr "no se pudo configurar '%s'" + +#: builtin/remote.c:658 +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" +"La configuración %s remote.pushDefault en:\n" +"\t%s:%d\n" +"ahora nombra al remoto inexistente '%s'" + +#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:706 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'" -#: builtin/remote.c:666 +#: builtin/remote.c:726 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18660,17 +19070,17 @@ msgstr "" "\t%s\n" "\tPor favor actualice la configuración manualmente si es necesario." -#: builtin/remote.c:701 +#: builtin/remote.c:766 #, c-format msgid "deleting '%s' failed" msgstr "borrando '%s' falló" -#: builtin/remote.c:735 +#: builtin/remote.c:800 #, c-format msgid "creating '%s' failed" msgstr "creando '%s' falló" -#: builtin/remote.c:801 +#: builtin/remote.c:876 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18685,118 +19095,118 @@ msgstr[1] "" "eliminadas;\n" "para borrarlas, use:" -#: builtin/remote.c:815 +#: builtin/remote.c:890 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la sección de configuración '%s'" -#: builtin/remote.c:916 +#: builtin/remote.c:993 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" -#: builtin/remote.c:919 +#: builtin/remote.c:996 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:921 +#: builtin/remote.c:998 msgid " stale (use 'git remote prune' to remove)" msgstr " viejo ( use 'git remote prune' para eliminar)" -#: builtin/remote.c:923 +#: builtin/remote.c:1000 msgid " ???" msgstr " ???" -#: builtin/remote.c:964 +#: builtin/remote.c:1041 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama" -#: builtin/remote.c:973 +#: builtin/remote.c:1050 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:975 +#: builtin/remote.c:1052 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:978 +#: builtin/remote.c:1055 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:982 +#: builtin/remote.c:1059 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:985 +#: builtin/remote.c:1062 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:988 +#: builtin/remote.c:1065 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1031 +#: builtin/remote.c:1108 msgid "create" msgstr "crear" -#: builtin/remote.c:1034 +#: builtin/remote.c:1111 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1038 +#: builtin/remote.c:1115 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1041 +#: builtin/remote.c:1118 msgid "fast-forwardable" msgstr "puede realizar fast-forward" -#: builtin/remote.c:1044 +#: builtin/remote.c:1121 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1051 +#: builtin/remote.c:1128 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1054 +#: builtin/remote.c:1131 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1058 +#: builtin/remote.c:1135 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1061 +#: builtin/remote.c:1138 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1129 +#: builtin/remote.c:1206 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1156 +#: builtin/remote.c:1233 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 +#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 msgid "(no URL)" msgstr "(sin URL)" @@ -18804,177 +19214,177 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1172 builtin/remote.c:1174 +#: builtin/remote.c:1249 builtin/remote.c:1251 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 +#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1176 +#: builtin/remote.c:1253 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1178 +#: builtin/remote.c:1255 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1182 +#: builtin/remote.c:1259 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" -#: builtin/remote.c:1194 +#: builtin/remote.c:1271 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1197 builtin/remote.c:1223 +#: builtin/remote.c:1274 builtin/remote.c:1300 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1206 +#: builtin/remote.c:1283 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Rama local configurada para 'git pull':" msgstr[1] " Ramas locales configuradas para 'git pull':" -#: builtin/remote.c:1214 +#: builtin/remote.c:1291 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales serán reflejadas por 'git push'" -#: builtin/remote.c:1220 +#: builtin/remote.c:1297 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referencia local configurada para 'git push'%s:" msgstr[1] " Referencias locales configuradas para 'git push'%s:" -#: builtin/remote.c:1241 +#: builtin/remote.c:1318 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1243 +#: builtin/remote.c:1320 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1258 +#: builtin/remote.c:1335 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1260 +#: builtin/remote.c:1337 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:" -#: builtin/remote.c:1270 +#: builtin/remote.c:1347 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1278 +#: builtin/remote.c:1355 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref válido: %s" -#: builtin/remote.c:1280 +#: builtin/remote.c:1357 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1375 #, c-format msgid " %s will become dangling!" msgstr " ¡%s será colgado!" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s has become dangling!" msgstr " ¡%s ha sido colgado!" -#: builtin/remote.c:1309 +#: builtin/remote.c:1386 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1403 #, c-format msgid " * [would prune] %s" msgstr " * [ejecutará prune] %s" -#: builtin/remote.c:1329 +#: builtin/remote.c:1406 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1374 +#: builtin/remote.c:1451 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 +#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1453 +#: builtin/remote.c:1530 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1460 +#: builtin/remote.c:1537 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1477 +#: builtin/remote.c:1554 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1479 +#: builtin/remote.c:1556 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1507 +#: builtin/remote.c:1584 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1533 +#: builtin/remote.c:1610 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1535 +#: builtin/remote.c:1612 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1537 +#: builtin/remote.c:1614 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1544 +#: builtin/remote.c:1621 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1583 +#: builtin/remote.c:1660 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrón de URL viejo inválido: %s" -#: builtin/remote.c:1591 +#: builtin/remote.c:1668 #, c-format msgid "No such URL found: %s" msgstr "No se encontró URL: %s" -#: builtin/remote.c:1593 +#: builtin/remote.c:1670 msgid "Will not delete all non-push URLs" msgstr "No borrará todos los URLs de no-push" @@ -19225,8 +19635,8 @@ msgstr "incapaz de correr fstat %s" msgid "unable to write object to database" msgstr "incapaz de escribir el objeto en la base de datos" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 -#: builtin/replace.c:453 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, c-format msgid "not a valid object name: '%s'" msgstr "nombre de objeto no válido: '%s'" @@ -19250,17 +19660,17 @@ msgstr "nuevo objeto es igual al antiguo: '%s'" msgid "could not parse %s as a commit" msgstr "no se pudo analizar %s como un commit" -#: builtin/replace.c:415 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mal mergetag en commit '%s'" -#: builtin/replace.c:417 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "mergetag mal formado en commit '%s'" -#: builtin/replace.c:429 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19269,31 +19679,31 @@ msgstr "" "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit " "en lugar de --graft" -#: builtin/replace.c:468 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "el commit original '%s' tiene una firma gpg" -#: builtin/replace.c:469 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "la firma será eliminada en el commit de reemplazo!" -#: builtin/replace.c:479 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no se pudo escribir el commit de reemplazo: '%s'" -#: builtin/replace.c:487 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft para '%s' innecesario" -#: builtin/replace.c:491 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "nuevo commit es le mismo que el antiguo: '%s'" -#: builtin/replace.c:526 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19302,71 +19712,71 @@ msgstr "" "no se pudo convertir el siguiente graft(s):\n" "%s" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "listar replace refs" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "borrar replace refs" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "editar objeto existente" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "cambiar un padre de commit" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "convertir archivo graft existente" -#: builtin/replace.c:552 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "reemplazar el ref si este existe" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "no se puede imprimir contenidos para --edit" -#: builtin/replace.c:555 +#: builtin/replace.c:556 msgid "use this format" msgstr "usar este formato" -#: builtin/replace.c:568 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format no puede ser usado cuando no se hace listing" -#: builtin/replace.c:576 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f solo tiene sentido cuando se escribe un reemplazo" -#: builtin/replace.c:580 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw solo tiene sentido con --edit" -#: builtin/replace.c:586 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d necesita al menos un argumento" -#: builtin/replace.c:592 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "mal número de argumentos" -#: builtin/replace.c:598 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e necesita exactamente un argumento" -#: builtin/replace.c:604 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g necesita al menos un argumento" -#: builtin/replace.c:610 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file no toma argumentos" -#: builtin/replace.c:616 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "solo se puede dar un patrón con -l" @@ -19450,8 +19860,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:294 builtin/stash.c:519 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" @@ -19536,21 +19946,21 @@ 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:411 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:472 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:522 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:525 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "conteo de marcas es incompatible con --objects" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -19715,38 +20125,42 @@ msgid_plural "the following files have local modifications:" msgstr[0] "el siguiente archivo tiene modificaciones locales:" msgstr[1] "los siguientes archivos tienen modificaciones locales:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "no listar archivos eliminado" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "solo eliminar del índice" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "sobrescribir el check de actualizado" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "permitir eliminar de forma recursiva" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "salir con estado cero incluso si nada coincide" -#: builtin/rm.c:289 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "Se entregó un nuevo pathspec. ¿Qué archivos debería eliminar?" + +#: builtin/rm.c:305 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " "para proceder" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "no eliminando '%s' de manera recursiva sin -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no es posible eliminar %s" @@ -19994,66 +20408,84 @@ msgstr "no mostrar resultados en stdout (útil con --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "mostrar refs de stdin que no están en el repositorio local" -#: builtin/sparse-checkout.c:20 -msgid "git sparse-checkout (init|list|set|disable) <options>" -msgstr "git sparse-checkout (init|list|set|disable) <opciones>" +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|disable) <opciones>" -#: builtin/sparse-checkout.c:61 +#: builtin/sparse-checkout.c:64 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no " "existe)" -#: builtin/sparse-checkout.c:220 +#: builtin/sparse-checkout.c:225 +msgid "failed to create directory for sparse-checkout file" +msgstr "falló al crear directorio para el archivo sparse-checkout" + +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "falló al configurar opción extensions.worktreeConfig" -#: builtin/sparse-checkout.c:237 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:256 +#: 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:262 +#: builtin/sparse-checkout.c:308 msgid "initialize sparse-checkout" msgstr "inicializar sparse-checkout" -#: builtin/sparse-checkout.c:295 +#: builtin/sparse-checkout.c:341 #, c-format msgid "failed to open '%s'" msgstr "falló al abrir '%s'" -#: builtin/sparse-checkout.c:361 -msgid "git sparse-checkout set (--stdin | <patterns>)" -msgstr "git sparse-checkout set (--stdin | <patrones>)" +#: builtin/sparse-checkout.c:398 +#, c-format +msgid "could not normalize path %s" +msgstr "no se pudo normalizar la ruta %s" + +#: builtin/sparse-checkout.c:410 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" + +#: builtin/sparse-checkout.c:435 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "no es posible dequote para la cadena de estilo C '%s'" + +#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +msgid "unable to load existing sparse-checkout patterns" +msgstr "no se pudo cargar patrones de sparse-checkout existentes" -#: builtin/sparse-checkout.c:378 +#: builtin/sparse-checkout.c:558 msgid "read patterns from standard in" msgstr "leer patrones de standard in" -#: builtin/sparse-checkout.c:384 +#: builtin/sparse-checkout.c:564 msgid "set sparse-checkout patterns" msgstr "configurar patrones de sparse-checkout" -#: builtin/sparse-checkout.c:447 +#: builtin/sparse-checkout.c:581 msgid "disable sparse-checkout" msgstr "deshabilitar sparse-checkout" -#: builtin/sparse-checkout.c:459 +#: builtin/sparse-checkout.c:593 msgid "error while refreshing working directory" msgstr "error al refrescar directorio de trabajo" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<opciones>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<opciones>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -20061,25 +20493,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nombre-rama> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: builtin/stash.c:28 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" +" [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: builtin/stash.c:32 builtin/stash.c:85 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20087,186 +20521,196 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<mensaje>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>" -#: builtin/stash.c:127 +#: builtin/stash.c:78 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" +" [--] [<pathspec>...]]" + +#: builtin/stash.c:128 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' no es un commit estilo stash" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Se especificaron demasiadas revisiones: %s" -#: builtin/stash.c:161 git-legacy-stash.sh:549 +#: builtin/stash.c:162 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "No se encontraron entradas de stash." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s no es una referencia válida" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parámetros no está implementado" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "no se puede aplicar un stash en medio de un merge" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "no se pudo generar diff %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "conflictos en índice. Intente sin --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "no se puede guardar el índice del árbol" -#: builtin/stash.c:436 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" -#: builtin/stash.c:450 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Fusionando %s con %s" -#: builtin/stash.c:460 git-legacy-stash.sh:681 +#: builtin/stash.c:461 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: builtin/stash.c:521 builtin/stash.c:620 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "intento de recrear el index" -#: builtin/stash.c:554 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Botado %s (%s)" -#: builtin/stash.c:557 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: No se pudo borrar entrada stash" -#: builtin/stash.c:582 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' no es una referencia stash" -#: builtin/stash.c:632 git-legacy-stash.sh:695 +#: builtin/stash.c:633 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." -#: builtin/stash.c:655 git-legacy-stash.sh:713 +#: builtin/stash.c:656 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "No se especificó el nombre de la rama" -#: builtin/stash.c:795 builtin/stash.c:832 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:823 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1045 git-legacy-stash.sh:218 +#: builtin/stash.c:1049 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1145 git-legacy-stash.sh:150 +#: builtin/stash.c:1149 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial" -#: builtin/stash.c:1172 git-legacy-stash.sh:165 +#: builtin/stash.c:1176 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: builtin/stash.c:1181 git-legacy-stash.sh:180 +#: builtin/stash.c:1185 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 #: git-legacy-stash.sh:214 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: builtin/stash.c:1229 git-legacy-stash.sh:234 +#: builtin/stash.c:1233 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: builtin/stash.c:1278 git-legacy-stash.sh:338 +#: builtin/stash.c:1282 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: builtin/stash.c:1294 +#: builtin/stash.c:1298 msgid "Did you forget to 'git add'?" msgstr "¿Olvidaste 'git add'?" -#: builtin/stash.c:1309 git-legacy-stash.sh:346 +#: builtin/stash.c:1313 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1316 git-legacy-stash.sh:351 +#: builtin/stash.c:1320 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1331 git-legacy-stash.sh:355 +#: builtin/stash.c:1335 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1336 +#: builtin/stash.c:1340 #, c-format msgid "Saved working directory and index state %s" msgstr "Directorio de trabajo guardado y estado de índice %s" -#: builtin/stash.c:1426 git-legacy-stash.sh:385 +#: builtin/stash.c:1430 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del árbol de trabajo" -#: builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1463 builtin/stash.c:1499 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1464 builtin/stash.c:1500 +#: builtin/stash.c:1472 builtin/stash.c:1537 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1466 builtin/stash.c:1502 +#: builtin/stash.c:1474 builtin/stash.c:1539 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1476 builtin/stash.c:1541 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1564 +#: builtin/stash.c:1600 #, c-format msgid "could not exec %s" msgstr "no se pudo ejecutar %s" @@ -20288,7 +20732,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:1970 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" @@ -20302,7 +20746,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:1380 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" @@ -20345,7 +20789,7 @@ msgstr "" 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:1053 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 msgid "Recurse into nested submodules" msgstr "Recursar en submódulos anidados" @@ -20392,27 +20836,27 @@ msgstr "Suprime la salida para inicializar un submódulo" msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 +#: 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:879 +#: builtin/submodule--helper.c:889 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20420,47 +20864,47 @@ msgstr "" "Usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:880 +#: builtin/submodule--helper.c:890 msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:983 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:989 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:1003 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1014 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "error al actualizar el remoto para el submódulo '%s'" -#: builtin/submodule--helper.c:1051 +#: 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:1058 +#: builtin/submodule--helper.c:1068 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1122 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20469,7 +20913,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:1124 +#: builtin/submodule--helper.c:1134 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20478,46 +20922,46 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1132 +#: builtin/submodule--helper.c:1142 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1144 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" -#: builtin/submodule--helper.c:1145 +#: builtin/submodule--helper.c:1155 #, c-format msgid "could not create empty submodule directory %s" msgstr "no se pudo crear directorio vacío de submódulo %s" -#: builtin/submodule--helper.c:1161 +#: builtin/submodule--helper.c:1171 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:1190 +#: builtin/submodule--helper.c:1200 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Remover árboles de trabajo de submódulos incluso si contienen cambios locales" -#: builtin/submodule--helper.c:1191 +#: builtin/submodule--helper.c:1201 msgid "Unregister all submodules" msgstr "Quitar todos los submódulos" -#: builtin/submodule--helper.c:1196 +#: builtin/submodule--helper.c:1206 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1220 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" -#: builtin/submodule--helper.c:1275 +#: builtin/submodule--helper.c:1289 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -20531,152 +20975,153 @@ msgstr "" "con\n" "'--reference-if-able' en lugar de '--reference'." -#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 +#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1353 +#: builtin/submodule--helper.c:1367 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1360 +#: builtin/submodule--helper.c:1374 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1383 +#: builtin/submodule--helper.c:1398 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1386 +#: builtin/submodule--helper.c:1401 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1389 +#: builtin/submodule--helper.c:1404 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1412 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 +#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 msgid "disallow cloning into non-empty directory" msgstr "no permitir clonar en directorios no vacíos" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1424 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference " -"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " -"<ruta>" +"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" +"url <url> --path <ruta>" -#: builtin/submodule--helper.c:1431 +#: builtin/submodule--helper.c:1449 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo" -#: builtin/submodule--helper.c:1442 +#: builtin/submodule--helper.c:1460 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clon de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:1446 +#: builtin/submodule--helper.c:1464 #, c-format msgid "directory not empty: '%s'" msgstr "directorio no está vacío: '%s'" -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1476 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no se pudo obtener el directorio de submódulo para '%s'" -#: builtin/submodule--helper.c:1494 +#: builtin/submodule--helper.c:1512 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1498 +#: builtin/submodule--helper.c:1516 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1594 +#: builtin/submodule--helper.c:1617 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:1598 +#: builtin/submodule--helper.c:1621 msgid "Maybe you want to use 'update --init'?" msgstr "¿Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:1628 +#: builtin/submodule--helper.c:1651 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:1657 +#: builtin/submodule--helper.c:1680 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:1803 +#: builtin/submodule--helper.c:1830 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1814 +#: builtin/submodule--helper.c:1841 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 +#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:1879 +#: builtin/submodule--helper.c:1906 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" -#: builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:1910 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1889 +#: 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:1892 +#: builtin/submodule--helper.c:1919 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1894 +#: builtin/submodule--helper.c:1921 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación superficial" -#: builtin/submodule--helper.c:1895 +#: builtin/submodule--helper.c:1922 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1904 +#: builtin/submodule--helper.c:1933 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1917 +#: builtin/submodule--helper.c:1946 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1965 +#: builtin/submodule--helper.c:1994 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20685,51 +21130,51 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " "el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2088 +#: builtin/submodule--helper.c:2117 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no se pudo conseguir un handle para el submódulo '%s'" -#: builtin/submodule--helper.c:2121 +#: builtin/submodule--helper.c:2150 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2127 +#: builtin/submodule--helper.c:2156 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2183 +#: builtin/submodule--helper.c:2212 msgid "check if it is safe to write to the .gitmodules file" msgstr "revisar is es seguro escribir el archivo .gitmodules" -#: builtin/submodule--helper.c:2186 +#: builtin/submodule--helper.c:2215 msgid "unset the config in the .gitmodules file" msgstr "desconfigura la opción en elarchivo .gitmodules" -#: builtin/submodule--helper.c:2191 +#: builtin/submodule--helper.c:2220 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2192 +#: builtin/submodule--helper.c:2221 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2193 +#: builtin/submodule--helper.c:2222 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2212 git-submodule.sh:173 +#: builtin/submodule--helper.c:2241 git-submodule.sh:174 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo" -#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2268 +#: builtin/submodule--helper.c:2297 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper válido" @@ -20983,7 +21428,7 @@ msgstr "el tag '%s' ya existe" msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" -#: builtin/unpack-objects.c:501 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Desempaquetando objetos" @@ -21367,7 +21812,7 @@ msgstr "git worktree remove [<opciones>] <worktree>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:60 builtin/worktree.c:898 +#: builtin/worktree.c:60 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "falló al borrar '%s'" @@ -21420,12 +21865,12 @@ msgstr "expirar árboles de trabajo más viejos a <tiempo>" msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:251 +#: builtin/worktree.c:244 #, c-format msgid "unable to re-add worktree '%s'" msgstr "no es posible volver a agregar el árbol '%s'" -#: builtin/worktree.c:256 +#: builtin/worktree.c:249 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21435,7 +21880,7 @@ msgstr "" "usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:258 +#: builtin/worktree.c:251 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21444,124 +21889,124 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:308 +#: builtin/worktree.c:301 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:439 builtin/worktree.c:445 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:441 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)" -#: builtin/worktree.c:450 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:456 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:497 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " "trabajo" -#: builtin/worktree.c:500 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:502 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:504 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:505 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:508 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:511 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#: builtin/worktree.c:519 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:580 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" -#: builtin/worktree.c:680 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 -#: builtin/worktree.c:926 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:694 builtin/worktree.c:727 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:699 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:701 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:729 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:770 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado" -#: builtin/worktree.c:778 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:801 builtin/worktree.c:928 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:806 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no se pudo descubrir el nombre de destino de '%s'" -#: builtin/worktree.c:812 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "el objetivo '%s' ya existe" -#: builtin/worktree.c:820 +#: builtin/worktree.c:813 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21570,7 +22015,7 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:822 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21578,37 +22023,37 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:825 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "falló validación, no se puede mover el árbol de trabajo: %s" -#: builtin/worktree.c:830 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:878 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:882 +#: builtin/worktree.c:875 #, 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:887 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no se pudo ejecutar 'git status' en '%s', código %d" -#: builtin/worktree.c:910 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:933 +#: builtin/worktree.c:926 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21617,7 +22062,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:935 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21625,7 +22070,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:938 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" @@ -21948,41 +22393,41 @@ msgstr "no se puede desinflar el request; zlib end error %d" msgid "dumb http transport does not support shallow capabilities" msgstr "dump http transport no soporta capacidades superficiales" -#: remote-curl.c:1037 +#: remote-curl.c:1038 msgid "fetch failed." msgstr "fetch falló." -#: remote-curl.c:1085 +#: remote-curl.c:1086 msgid "cannot fetch by sha1 over smart http" msgstr "no se puede hacer fetch por sha1 sobre smart http" -#: remote-curl.c:1129 remote-curl.c:1135 +#: remote-curl.c:1130 remote-curl.c:1136 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" -#: remote-curl.c:1147 remote-curl.c:1261 +#: remote-curl.c:1148 remote-curl.c:1263 #, c-format msgid "http transport does not support %s" msgstr "http transport no soporta %s" -#: remote-curl.c:1183 +#: remote-curl.c:1184 msgid "git-http-push failed" msgstr "git-http-push falló" -#: remote-curl.c:1367 +#: remote-curl.c:1369 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" -#: remote-curl.c:1399 +#: remote-curl.c:1401 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: error leyendo command stream de git" -#: remote-curl.c:1406 +#: remote-curl.c:1408 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fetch intentado sin un repositorio local" -#: remote-curl.c:1446 +#: remote-curl.c:1448 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" @@ -22925,61 +23370,50 @@ msgstr "${REV}: No se pudo borrar entrada stash" msgid "(To restore them type \"git stash apply\")" msgstr "(Para restaurarlos, escribe \"git stash apply\")" -#: git-submodule.sh:202 +#: git-submodule.sh:203 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "La ruta relativa sólo se puede usar desde el nivel superior del árbol de " "trabajo" -#: git-submodule.sh:212 +#: git-submodule.sh:213 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../" -#: git-submodule.sh:231 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ya existe en el índice" -#: git-submodule.sh:234 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ya existe en el índice y no es un submódulo" -#: git-submodule.sh:241 +#: git-submodule.sh:242 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' no tiene un commit checked out" -#: git-submodule.sh:247 -#, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$sm_path\n" -"Use -f if you really want to add it." -msgstr "" -"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" -"$sm_path\n" -"Usa -f si en verdad quieres agregarlo." - -#: git-submodule.sh:270 +#: git-submodule.sh:273 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Agregando el repositorio existente en '$sm_path' al índice" -#: git-submodule.sh:272 +#: git-submodule.sh:275 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ya existe y no es un repositorio git válido" -#: git-submodule.sh:280 +#: git-submodule.sh:283 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Se encontró localmente un directorio git para '$sm_name' con el(los) " "remoto(s):" -#: git-submodule.sh:282 +#: git-submodule.sh:285 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22996,39 +23430,39 @@ msgstr "" "o no estás seguro de lo que esto significa, escoge otro nombre con la opción " "'--name'." -#: git-submodule.sh:288 +#: git-submodule.sh:291 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reactivar directorio git local para el submódulo '$sm_name'." -#: git-submodule.sh:300 +#: git-submodule.sh:303 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No es posible hacer checkout al submódulo '$sm_path'" -#: git-submodule.sh:305 +#: git-submodule.sh:308 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falló al agregar el submódulo '$sm_path'" -#: git-submodule.sh:314 +#: git-submodule.sh:317 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falló al registrar el submódulo '$sm_path'" -#: git-submodule.sh:580 +#: git-submodule.sh:590 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No se pudo encontrar la revisión actual en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:590 +#: git-submodule.sh:600 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" -#: git-submodule.sh:595 +#: git-submodule.sh:605 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23037,7 +23471,7 @@ msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " "de submódulo '$sm_path'" -#: git-submodule.sh:613 +#: git-submodule.sh:623 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23046,7 +23480,7 @@ msgstr "" "No es posible realizar fetch en la ruta de submódulo '$displaypath'; " "intentando hacer un fetch directo $sha1:" -#: git-submodule.sh:619 +#: git-submodule.sh:629 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23055,75 +23489,75 @@ msgstr "" "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " "Fetch directo del commit falló." -#: git-submodule.sh:626 +#: git-submodule.sh:636 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:627 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:641 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:632 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:647 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'" -#: git-submodule.sh:638 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:643 +#: git-submodule.sh:653 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falló la ejecución de '$command $sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:644 +#: git-submodule.sh:654 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:675 +#: git-submodule.sh:685 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:886 +#: git-submodule.sh:896 msgid "The --cached option cannot be used with the --files option" msgstr "La opción --cached no puede ser usada con la opción --files" -#: git-submodule.sh:938 +#: git-submodule.sh:948 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:958 +#: git-submodule.sh:968 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Advertencia: $display_name no contiene el commit $sha1_src" -#: git-submodule.sh:961 +#: git-submodule.sh:971 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" -#: git-submodule.sh:964 +#: git-submodule.sh:974 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -23445,6 +23879,10 @@ 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 +msgid "Note that empty commits are commented out" +msgstr "Tenga en cuenta que los commits vacíos están comentados" + #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" @@ -23736,128 +24174,11 @@ msgstr "" msgid "The selected hunks do not apply to the index!\n" msgstr "¡Los hunks seleccionados no aplican al índice!\n" -#: git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? " - -#: git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Nada fue aplicado.\n" - #: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1428 -#, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1429 -#, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1430 -#, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1433 -#, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1434 -#, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1435 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1438 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1439 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1440 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1443 -#, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1444 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1445 -#, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1449 git-add--interactive.perl:1464 -#, 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,?]? " - -#: git-add--interactive.perl:1450 git-add--interactive.perl:1465 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1453 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1454 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1455 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1458 -#, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d" -"%s,?]? " - -#: git-add--interactive.perl:1459 -#, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1460 -#, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " - #: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " @@ -24331,6 +24652,114 @@ msgid "Do you really want to send %s? [y|N]: " msgstr "¿Realmente deseas mandar %s?[y|N]: " #, c-format +#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " +#~ msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? " + +#, c-format +#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " +#~ msgstr "¿Aplicar stage al borrado [y,n,a,q,d%s,?]? " + +#, c-format +#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " +#~ msgstr "¿Aplicar stage a este hunk [y,n,a,q,d%s,?]? " + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for staging.\n" +#~ msgstr "" +#~ "Si el parche aplica limpiamente, el hunk editado sera marcado\n" +#~ "inmediatamente para el área de stage.\n" + +#~ msgid "" +#~ "y - stage this hunk\n" +#~ "n - do not stage this hunk\n" +#~ "q - quit; do not stage this hunk or any of the remaining ones\n" +#~ "a - stage this and all the remaining hunks\n" +#~ "d - do not stage this hunk nor any of the remaining hunks\n" +#~ msgstr "" +#~ "y - aplicar stage a este hunk\n" +#~ "n - no aplicar stage a este hunk\n" +#~ "q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" +#~ "a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" +#~ "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " +#~ "archivo\n" + +#, c-format +#~ msgid "could not copy '%s' to '%s'." +#~ msgstr "no se pudo copiar '%s' a '%s'." + +#~ msgid "malformed ident line" +#~ msgstr "línea de entrada mal formada" + +#~ msgid "corrupted author without date information" +#~ msgstr "autor corrupto sin información de fecha" + +#, c-format +#~ msgid "could not parse '%.*s'" +#~ msgstr "no se puede analizar '%.*s'" + +#, c-format +#~ msgid "could not checkout %s" +#~ msgstr "no se puede hacer checkout a %s" + +#, c-format +#~ msgid "filename in tree entry contains backslash: '%s'" +#~ msgstr "nombre de archivo en el árbol contiene un backslash: '%s'" + +#, c-format +#~ msgid "Use -f if you really want to add them.\n" +#~ msgstr "Usa -f si realmente quieres agregarlos.\n" + +#, c-format +#~ msgid "Maybe you wanted to say 'git add .'?\n" +#~ msgstr "¿Tal vez quiso decir 'git add .'?\n" + +#, c-format +#~ msgid "packfile is invalid: %s" +#~ msgstr "packfile es inválido: %s" + +#, c-format +#~ msgid "unable to open packfile for reuse: %s" +#~ msgstr "no es posible abrir packfile para reusar: %s" + +#~ msgid "unable to seek in reused packfile" +#~ msgstr "no es posible buscar en los packfile reusados" + +#~ msgid "unable to read from reused packfile" +#~ msgstr "no es posible leer de packfile reusado" + +#~ msgid "no HEAD?" +#~ msgstr "¿Sin HEAD?" + +#~ msgid "make committer date match author date" +#~ msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" + +#~ msgid "ignore author date and use current date" +#~ msgstr "ignorar la fecha del autor y usar la fecha actual" + +#~ msgid "synonym of --reset-author-date" +#~ msgstr "sinónimo para --reset-author-date" + +#~ msgid "ignore changes in whitespace" +#~ msgstr "ignorar cambios en espacios en blanco" + +#~ msgid "preserve empty commits during rebase" +#~ msgstr "preservar commits vacíos durante el rebase" + +#~ msgid "cannot combine --use-bitmap-index with object filtering" +#~ msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" + +#, sh-format +#~ msgid "" +#~ "The following path is ignored by one of your .gitignore files:\n" +#~ "$sm_path\n" +#~ "Use -f if you really want to add it." +#~ msgstr "" +#~ "La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" +#~ "$sm_path\n" +#~ "Usa -f si en verdad quieres agregarlo." + +#, c-format #~ msgid "unable to get tree for %s" #~ msgstr "no se pudo obtener árbol para %s" |