diff options
| author | Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> | 2020-01-06 09:18:43 -0500 |
|---|---|---|
| committer | Christopher Diaz Riveros <chrisadr@gentoo.org> | 2020-01-06 09:18:43 -0500 |
| commit | 7fdc5f296ff27092d8dadebe8bede9f663fa190f (patch) | |
| tree | 2b3a7bce5b46efc368557d71e7bc25730dc2085f /po | |
| parent | 9d48668cd51220f1d8b83c7e1aa65416520aeee6 (diff) | |
| download | git-7fdc5f296ff27092d8dadebe8bede9f663fa190f.tar.gz | |
l10n: es: 2.25.0 round #1
Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
Diffstat (limited to 'po')
| -rw-r--r-- | po/es.po | 5120 |
1 files changed, 2838 insertions, 2282 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-10-28 13:19+0800\n" -"PO-Revision-Date: 2019-10-28 19:20-0500\n" +"POT-Creation-Date: 2019-12-30 08:48+0800\n" +"PO-Revision-Date: 2020-01-06 09:12-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,40 +16,468 @@ 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\n" +"X-Generator: Poedit 2.2.4\n" -#: advice.c:109 +#: add-interactive.c:347 +#, 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 +msgid "could not read index" +msgstr "no se pudo leer 铆ndice" + +#: add-interactive.c:555 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binario" + +#: add-interactive.c:613 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "nada" + +#: add-interactive.c:614 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "sin cambios" + +#: add-interactive.c:651 git-add--interactive.perl:643 +msgid "Update" +msgstr "Actualizar" + +#: add-interactive.c:668 add-interactive.c:856 +#, 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 +msgid "could not write index" +msgstr "no se pudo escribir 铆ndice" + +#: add-interactive.c:677 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 +#, 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 +#: 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 +msgid "Revert" +msgstr "Revertir" + +#: add-interactive.c:746 +msgid "Could not parse HEAD^{tree}" +msgstr "no se pudo analizar HEAD^{tree}" + +#: add-interactive.c:784 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 +#, c-format +msgid "No untracked files.\n" +msgstr "No hay archivos sin rastrear.\n" + +#: add-interactive.c:839 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Agregar no rastreados" + +#: add-interactive.c:866 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 +#, 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 +#, 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 +#, c-format +msgid "No changes.\n" +msgstr "Sin cambios.\n" + +#: add-interactive.c:914 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "Actualizaci贸n del parche" + +#: add-interactive.c:953 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "Revisi贸n de diff" + +#: add-interactive.c:981 +msgid "show paths with changes" +msgstr "mostrar rutas con cambios" + +#: add-interactive.c:983 +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 +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 +msgid "pick hunks and update selectively" +msgstr "elegir hunks y actualizar de forma selectiva" + +#: add-interactive.c:989 +msgid "view diff between HEAD and index" +msgstr "ver diff entre HEAD e index" + +#: add-interactive.c:991 +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 +msgid "Prompt help:" +msgstr "Mostrar ayuda:" + +#: add-interactive.c:1001 +msgid "select a single item" +msgstr "selecciona un 煤nico objeto" + +#: add-interactive.c:1003 +msgid "select a range of items" +msgstr "selecciona un rango de objetos" + +#: add-interactive.c:1005 +msgid "select multiple ranges" +msgstr "selecciona multiples rangos" + +#: add-interactive.c:1007 add-interactive.c:1052 +msgid "select item based on unique prefix" +msgstr "seleccionar objeto basado en prefijo 煤nico" + +#: add-interactive.c:1009 +msgid "unselect specified items" +msgstr "quitar objetos especificados" + +#: add-interactive.c:1011 +msgid "choose all items" +msgstr "escoger todos los objetos" + +#: add-interactive.c:1013 +msgid "(empty) finish selecting" +msgstr "(vac铆o) finalizar selecci贸n" + +#: add-interactive.c:1050 +msgid "select a numbered item" +msgstr "selecciona un objeto numerado" + +#: add-interactive.c:1054 +msgid "(empty) select nothing" +msgstr "(vac铆o) selecciona nada" + +#: add-interactive.c:1062 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 +msgid "What now" +msgstr "Ahora que" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "staged" +msgstr "rastreado" + +#: add-interactive.c:1115 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 +msgid "path" +msgstr "ruta" + +#: add-interactive.c:1122 +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 +#, 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: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: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:111 +#, 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 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "no se puede analizar hunk header '%.*s'" + +#: add-patch.c:176 +msgid "could not parse diff" +msgstr "no se puede analizar diff" + +#: add-patch.c:194 +msgid "could not parse colored diff" +msgstr "no se pudo analizar diff a colores" + +#: add-patch.c:508 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"se esperaba l铆nea de contexto #%d en\n" +"%.*s" + +#: add-patch.c:523 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"hunks no hacen overlap:\n" +"%.*s\n" +"\tno acaba con:\n" +"%.*s" + +#: add-patch.c:799 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 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"Para eliminar '%c' l铆neas, haga de ellas l铆neas ' ' (contexto).\n" +"Para eliminar '%c' l铆neas, b贸rrelas.\n" +"Lineas comenzando con %c ser谩n eliminadas.\n" + +#: 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 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si esto no aplica de manera limpia, se te da la oportunidad de \n" +"editar nuevamente. Si todas las l铆neas del hunk son eliminadas, entonces \n" +"la edici贸n es abortada y el hunk queda sin cambios.\n" + +#: add-patch.c:851 +msgid "could not parse hunk header" +msgstr "no se puede analizar hunk header" + +#: add-patch.c:895 add-patch.c:1294 +msgid "'git apply --cached' failed" +msgstr "fall贸 'git apply --cached'" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:952 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:1016 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - deja este hunk sin decidir, ver el siguiente hunk sin decisi贸n\n" +"J - deja este hunk sin decidir, ver siguiente hunk\n" +"k - deja este hunk sin decidir, ver hunk previo sin decidir\n" +"K - deja este hunk sin decidir, ver hunk anterior\n" +"g - selecciona un hunk a d贸nde ir\n" +"/ - buscar un hunk que cumpla con el regex dado\n" +"s - separar el hunk actual en m谩s peque帽os\n" +"e - editar manualmente el hunk actual\n" +"? - imprimir ayuda\n" + +#: add-patch.c:1137 add-patch.c:1147 +msgid "No previous hunk" +msgstr "No el anterior hunk" + +#: add-patch.c:1142 add-patch.c:1152 +msgid "No next hunk" +msgstr "No el siguiente hunk" + +#: add-patch.c:1158 +msgid "No other hunks to goto" +msgstr "No hay m谩s pedazos para el ir" + +#: add-patch.c:1169 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 +msgid "go to which hunk? " +msgstr "驴a que hunk ir? " + +#: add-patch.c:1181 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Numero inv谩lido: '%s'" + +#: add-patch.c:1186 +#, 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 +msgid "No other hunks to search" +msgstr "No hay m谩s pedazos para buscar" + +#: add-patch.c:1201 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "驴buscar para regexp? " + +#: add-patch.c:1216 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Regexp para la b煤squeda mal formado %s: %s" + +#: add-patch.c:1233 +msgid "No hunk matches the given pattern" +msgstr "No hay hunks que concuerden con el patr贸n entregado." + +#: add-patch.c:1240 +msgid "Sorry, cannot split this hunk" +msgstr "Perd贸n, no se puede dividir este pedazo" + +#: add-patch.c:1244 +#, c-format +msgid "Split into %d hunks." +msgstr "Cortar en %d hunk." + +#: add-patch.c:1248 +msgid "Sorry, cannot edit this hunk" +msgstr "Perd贸n, no se puede editar este pedazo" + +#: advice.c:111 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:162 +#: advice.c:164 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:164 +#: advice.c:166 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:166 +#: advice.c:168 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:168 +#: advice.c:170 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:170 +#: advice.c:172 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:172 +#: advice.c:174 #, 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:180 +#: advice.c:182 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -57,23 +485,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:188 +#: advice.c:190 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:195 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusi贸n (MERGE_HEAD existe)." -#: advice.c:195 +#: advice.c:197 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:196 +#: advice.c:198 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusi贸n inconclusa." -#: advice.c:202 +#: advice.c:204 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -112,7 +540,7 @@ msgstr "" "\n" " git switch -\n" "\n" -"Apaga este aviso mediante la variable de config advice.detachedHead en " +"Desactiva este aviso poniendo la variable de config advice.detachedHead en " "false\n" "\n" @@ -225,7 +653,7 @@ msgstr[1] "" #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -"el header de git diff carece de informaci贸n del nombre del archivo (l铆nea %d)" +"la cabecera de git diff carece de informaci贸n del nombre del archivo (l铆nea %d)" #: apply.c:1481 #, c-format @@ -290,24 +718,24 @@ msgstr "no es posible leer el enlace simb贸lico %s" msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "comienzo inv谩lido de l铆nea: '%c'" -#: apply.c:3047 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Hunk #%d tuvo 茅xito en %d (%d l铆nea compensada)." msgstr[1] "Hunk #%d tuvo 茅xito en %d (%d l铆neas compensadas)." -#: apply.c:3059 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d" -#: apply.c:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -316,23 +744,23 @@ msgstr "" "mientras se busca:\n" "%.*s" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3095 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" -#: apply.c:3142 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "no se puede aplicar el parche binario a '%s' sin un 铆ndice completo" -#: apply.c:3152 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -340,289 +768,284 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3160 +#: apply.c:3170 #, 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:3178 +#: apply.c:3188 #, 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:3191 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3197 +#: apply.c:3207 #, 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:3218 +#: apply.c:3228 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche fall贸: %s:%ld" -#: apply.c:3341 +#: apply.c:3351 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3401 +#: apply.c:3411 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simb贸lico" -#: apply.c:3430 apply.c:3673 +#: apply.c:3440 apply.c:3683 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3516 apply.c:3688 +#: apply.c:3526 apply.c:3698 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el 铆ndice" -#: apply.c:3525 apply.c:3696 +#: apply.c:3535 apply.c:3706 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el 铆ndice" -#: apply.c:3560 +#: apply.c:3570 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:3563 +#: apply.c:3573 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-v铆as...\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3589 apply.c:3593 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3595 +#: apply.c:3605 #, 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:3609 +#: apply.c:3619 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3614 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3640 +#: apply.c:3650 msgid "removal patch leaves file contents" msgstr "parche de eliminaci贸n deja contenidos en el archivo" -#: apply.c:3713 +#: apply.c:3723 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3715 +#: apply.c:3725 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1320 #, c-format msgid "invalid path '%s'" msgstr "ruta inv谩lida '%s'" -#: apply.c:3924 +#: apply.c:3934 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el 铆ndice" -#: apply.c:3927 +#: apply.c:3937 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3947 +#: apply.c:3957 #, 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:3952 +#: apply.c:3962 #, 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:3972 +#: apply.c:3982 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' est谩 tras un enlace simb贸lico" -#: apply.c:3976 +#: apply.c:3986 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:3991 +#: apply.c:4001 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4083 +#: apply.c:4093 #, 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:4090 +#: apply.c:4100 #, 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:4093 +#: apply.c:4103 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informaci贸n sha1 o es in煤til (%s)." -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry fall贸 para la ruta '%s'" - -#: apply.c:4102 +#: apply.c:4112 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo a帽adir %s al 铆ndice temporal" -#: apply.c:4112 +#: apply.c:4122 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un 铆ndice temporal para %s" -#: apply.c:4250 +#: apply.c:4260 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del 铆ndice" -#: apply.c:4284 +#: apply.c:4294 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el subm贸dulo %s" -#: apply.c:4290 +#: apply.c:4300 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo reci茅n creado '%s'" -#: apply.c:4298 +#: apply.c:4308 #, 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:4304 apply.c:4449 +#: apply.c:4314 apply.c:4459 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4347 +#: apply.c:4357 #, c-format msgid "failed to write to '%s'" msgstr "fall贸 escribir para '%s'" -#: apply.c:4351 +#: apply.c:4361 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4421 +#: apply.c:4431 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4519 +#: apply.c:4529 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4527 +#: apply.c:4537 msgid "internal error" msgstr "error interno" -#: apply.c:4530 +#: apply.c:4540 #, 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:4541 +#: apply.c:4551 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4563 +#: apply.c:4573 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4567 +#: apply.c:4577 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4686 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4694 +#: apply.c:4704 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4714 +#: apply.c:4724 msgid "unable to read index file" msgstr "no es posible leer el archivo 铆ndice" -#: apply.c:4871 +#: apply.c:4881 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4898 +#: apply.c:4908 #, 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:4904 apply.c:4919 +#: apply.c:4914 apply.c:4929 #, 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:4912 +#: apply.c:4922 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -631,146 +1054,137 @@ msgstr[0] "" msgstr[1] "" "%d l铆neas aplicadas despu茅s de arreglar los errores de espacios en blanco." -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo 铆ndice" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 -msgid "path" -msgstr "ruta" - -#: apply.c:4956 +#: apply.c:4966 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4959 +#: apply.c:4969 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4971 builtin/am.c:2206 msgid "num" msgstr "num" -#: apply.c:4962 +#: apply.c:4972 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4965 +#: apply.c:4975 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4967 +#: apply.c:4977 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:4971 +#: apply.c:4981 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:4973 +#: apply.c:4983 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:4975 +#: apply.c:4985 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:4977 +#: apply.c:4987 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al 铆ndice actual" -#: apply.c:4979 +#: apply.c:4989 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4981 +#: apply.c:4991 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el 谩rbol de trabajo" -#: apply.c:4983 +#: apply.c:4993 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del 谩rea de trabajo" -#: apply.c:4986 +#: apply.c:4996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tambi茅n aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4988 +#: apply.c:4998 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:4990 +#: apply.c:5000 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:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5003 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:4995 +#: apply.c:5005 msgid "ensure at least <n> lines of context match" -msgstr "asegure que por lo menos <n> l铆neas del contexto concuerden" +msgstr "asegurar que al menos concuerden <n> l铆neas del contexto concuerden" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 msgid "action" msgstr "acci贸n" -#: apply.c:4997 +#: apply.c:5007 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:5000 apply.c:5003 +#: apply.c:5010 apply.c:5013 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5006 +#: apply.c:5016 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5008 +#: apply.c:5018 msgid "don't expect at least one line of context" msgstr "no espera al menos una l铆nea del contexto" -#: apply.c:5010 +#: apply.c:5020 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5012 +#: apply.c:5022 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: 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 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5015 +#: apply.c:5025 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:5018 +#: apply.c:5028 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:5020 builtin/am.c:2194 +#: apply.c:5030 builtin/am.c:2194 msgid "root" msgstr "ra铆z" -#: apply.c:5021 +#: apply.c:5031 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -793,7 +1207,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concord贸 con ninguna carpeta" @@ -825,7 +1239,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato del archivo" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "prefijo" @@ -833,12 +1247,12 @@ msgstr "prefijo" 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:873 builtin/blame.c:874 +#: 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/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:186 +#: parse-options.h:190 msgid "file" msgstr "carpeta" @@ -870,8 +1284,8 @@ msgstr "comprimir mejor" msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: 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 msgid "repo" msgstr "repo" @@ -910,17 +1324,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:345 +#: archive-tar.c:125 archive-zip.c:350 #, c-format msgid "cannot stream blob %s" msgstr "no se puede transmitir el blob %s" -#: archive-tar.c:266 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:368 #, 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:353 +#: archive-tar.c:293 archive-zip.c:358 #, c-format msgid "cannot read %s" msgstr "no se puede leer %s" @@ -939,37 +1353,37 @@ msgstr "incapaz de redirigir descriptor" msgid "'%s' filter reported error" msgstr "filtro '%s' report贸 un error" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "ruta no v谩lida UTF-8: %s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta muy larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: archive-zip.c:609 +#: archive-zip.c:614 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no es un nombre de atributo v谩lido" -#: attr.c:370 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no permitido: %s:%d" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1109,9 +1523,9 @@ 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:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: 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 #: builtin/shortlog.c:192 msgid "revision walk setup failed" @@ -1293,8 +1707,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:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 +#: builtin/commit.c:811 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" @@ -1325,42 +1739,42 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "El bundle requiere esta referencia:" msgstr[1] "El bundle requiere estas %d referencias:" -#: bundle.c:272 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "pack-objects muri贸" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "rev-list muri贸" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vac铆o." -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "index-pack muri贸" @@ -1369,18 +1783,18 @@ msgstr "index-pack muri贸" msgid "invalid color value: %.*s" msgstr "color inv谩lido: %.*s" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: 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 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "隆%s %s no es un commit!" -#: commit.c:192 +#: commit.c:193 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1400,27 +1814,27 @@ msgstr "" "Apapa este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1128 +#: commit.c:1152 #, 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:1131 +#: commit.c:1155 #, 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:1134 +#: commit.c:1158 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1137 +#: commit.c:1161 #, 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:1391 +#: commit.c:1415 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" @@ -1431,77 +1845,72 @@ msgstr "" "variable de configuraci贸n i18n.commitencoding para la codificaci贸n que usa " "tu proyecto.\n" -#: commit-graph.c:127 +#: commit-graph.c:130 msgid "commit-graph file is too small" msgstr "archivo commit-graph es muy peque帽o" -#: commit-graph.c:192 +#: commit-graph.c:195 #, 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:199 +#: commit-graph.c:202 #, 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:206 +#: commit-graph.c:209 #, 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:229 +#: commit-graph.c:232 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:240 +#: commit-graph.c:243 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset del chunk de commit-graph inapropiado %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:286 #, 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:347 +#: commit-graph.c:350 msgid "commit-graph has no base graphs chunk" msgstr "commit-graph no tiene una chunk base de graphs" -#: commit-graph.c:357 +#: commit-graph.c:360 msgid "commit-graph chain does not match" msgstr "cadena commit-graph no concuerda" -#: commit-graph.c:404 +#: commit-graph.c:407 #, 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:430 +#: commit-graph.c:433 msgid "unable to find all commit-graph files" msgstr "no es posible encontrar los archivos commit-graph" -#: commit-graph.c:561 commit-graph.c:621 +#: commit-graph.c:564 commit-graph.c:624 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "posici贸n de commit inv谩lida. commit-graph est谩 probablemente corrupto" -#: commit-graph.c:582 +#: commit-graph.c:585 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:858 builtin/am.c:1287 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: commit-graph.c:859 -#, c-format -msgid "unable to get tree for %s" -msgstr "no se pudo obtener 谩rbol para %s" - #: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" @@ -1568,12 +1977,12 @@ msgstr "Encontrando esquinas extra en commit graph" 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:810 +#: commit-graph.c:1379 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:241 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "no se puede crear '%s'" @@ -1739,7 +2148,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:2401 +#: config.c:406 sequencer.c:2530 #, c-format msgid "invalid key: %s" msgstr "llave inv谩lida: %s" @@ -1863,145 +2272,145 @@ msgstr "core.commentChar deber铆a tener solo un caracter" msgid "invalid mode for object creation: %s" msgstr "modo inv谩lido de creaci贸n de objetos: %s" -#: config.c:1425 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "valor malformado para %s" -#: config.c:1451 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "valor malformado para %s: %s" -#: config.c:1452 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1513 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresi贸n de pack err贸neo %d" -#: config.c:1634 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz de cargar configuraci贸n de objeto blob '%s'" -#: config.c:1637 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referencia '%s' no apunta a un blob" -#: config.c:1654 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no se posible resolver configuraci贸n de blob '%s'" -#: config.c:1684 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1740 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuraci贸n de la l铆nea de comando" -#: config.c:2091 +#: config.c:2096 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurri贸 mientras se le铆an los archivos de configuraci贸n" -#: config.c:2261 +#: config.c:2266 #, c-format msgid "Invalid %s: '%s'" msgstr "Inv谩lido %s: '%s'" -#: config.c:2306 +#: config.c:2311 #, 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:2352 +#: config.c:2357 #, 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:2354 +#: config.c:2359 #, 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:2435 +#: config.c:2440 #, c-format msgid "invalid section name '%s'" msgstr "nombre de secci贸n inv谩lido '%s'" -#: config.c:2467 +#: config.c:2472 #, c-format msgid "%s has multiple values" msgstr "%s tiene m煤ltiples valores" -#: config.c:2496 +#: config.c:2501 #, c-format msgid "failed to write new configuration file %s" msgstr "fall贸 al escribir nuevo archivo de configuraci贸n %s" -#: config.c:2748 config.c:3072 +#: config.c:2753 config.c:3077 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuraci贸n %s" -#: config.c:2759 +#: config.c:2764 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2794 builtin/config.c:328 +#: config.c:2799 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "patr贸n inv谩lido: %s" -#: config.c:2819 +#: config.c:2824 #, c-format msgid "invalid config file %s" msgstr "archivo de configuraci贸n inv谩lido: %s" -#: config.c:2832 config.c:3085 +#: config.c:2837 config.c:3090 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s fall贸" -#: config.c:2843 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2852 config.c:3090 +#: config.c:2857 config.c:3095 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s fall贸" -#: config.c:2937 config.c:3187 +#: config.c:2942 config.c:3192 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuraci贸n %s" -#: config.c:2971 +#: config.c:2976 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2978 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3063 +#: config.c:3068 #, c-format msgid "invalid section name: %s" msgstr "secci贸n de nombre inv谩lida: %s" -#: config.c:3230 +#: config.c:3235 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2166,19 +2575,19 @@ msgstr "ruta extra帽a '%s' bloqueada" msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:100 +#: connected.c:101 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:120 +#: connected.c:121 msgid "failed write to rev-list" msgstr "fall贸 escribir a rev-list" -#: connected.c:127 +#: connected.c:128 msgid "failed to close rev-list's stdin" msgstr "fall贸 al cerrar la entrada standard de rev-list" @@ -2215,26 +2624,26 @@ msgstr "" "LF ser谩 reemplazado por CRLF en %s.\n" "El archivo tendr谩 sus finales de l铆nea originales en tu directorio de trabajo" -#: convert.c:280 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM est谩 prohibido en '%s' si es codificado como %s" -#: convert.c:287 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." -msgstr "" -"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como " +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." +msgstr "" +"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%.*s " +"como working-tree-encoding." -#: convert.c:305 +#: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM es requerido en '%s' si es codificado como %s" -#: convert.c:307 +#: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2243,50 +2652,50 @@ msgstr "" "Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o " "UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding." -#: convert.c:425 convert.c:496 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "fall贸 al codificar '%s' de %s a %s" -#: convert.c:468 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "codificaci贸n '%s' de %s a %s y de vuelta no son iguales" -#: convert.c:674 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no se puede hacer fork para ejecutar filtros externos '%s'" -#: convert.c:694 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "no se pueden alimentar de input a los filtros externos '%s'" -#: convert.c:701 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' fall贸 %d" -#: convert.c:736 convert.c:739 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "lectura de filtro externo '%s' fall贸" -#: convert.c:742 convert.c:797 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "filtro externo '%s' fall贸" -#: convert.c:845 +#: convert.c:839 msgid "unexpected filter type" msgstr "tipo de filtro inesperado" -#: convert.c:856 +#: convert.c:850 msgid "path name too long for external filter" msgstr "nombre de ruta muy largo para filtro externo" -#: convert.c:930 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2295,16 +2704,16 @@ msgstr "" "filtro externo '%s' ya no est谩 disponible aunque no todas las rutas han sido " "filtradas" -#: convert.c:1229 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "true/false no son working-tree-encodings v谩lidos" -#: convert.c:1417 convert.c:1451 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: fall贸 al limpiar filtro '%s'" -#: convert.c:1495 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: filtro smudge %s fall贸" @@ -2473,35 +2882,35 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4218 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo muri贸, deteniendo en %s" -#: diff.c:4563 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4566 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4644 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4692 +#: diff.c:4676 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat inv谩lido: %s" -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor num茅rico" -#: diff.c:4729 +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2510,42 +2919,42 @@ msgstr "" "Fall贸 al analizar par谩metro de opci贸n --dirstat/-X:\n" "%s" -#: diff.c:4814 +#: diff.c:4798 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4838 +#: diff.c:4822 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4852 +#: diff.c:4836 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4902 diff.c:4908 +#: diff.c:4886 diff.c:4892 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4920 +#: diff.c:4904 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:4941 +#: diff.c:4925 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:4960 +#: diff.c:4944 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo inv谩lido '%s' en --color-moved-ws" -#: diff.c:5000 +#: diff.c:4984 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2553,154 +2962,154 @@ msgstr "" "opci贸n diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5036 diff.c:5056 +#: diff.c:5020 diff.c:5040 #, c-format msgid "invalid argument to %s" msgstr "argumento inv谩lido para %s" -#: diff.c:5194 +#: diff.c:5178 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "fall贸 al analizar par谩metro de opci贸n --submodule: '%s'" -#: diff.c:5250 +#: diff.c:5234 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5273 +#: diff.c:5257 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5275 diff.c:5281 +#: diff.c:5259 diff.c:5265 msgid "generate patch" msgstr "generar parche" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5262 builtin/log.c:173 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5283 diff.c:5397 diff.c:5404 +#: diff.c:5267 diff.c:5381 diff.c:5388 msgid "<n>" msgstr "<n>" -#: diff.c:5284 diff.c:5287 +#: diff.c:5268 diff.c:5271 msgid "generate diffs with <n> lines context" msgstr "genera diffs con <n> l铆neas de contexto" -#: diff.c:5289 +#: diff.c:5273 msgid "generate the diff in raw format" msgstr "genera el diff en formato raw" -#: diff.c:5292 +#: diff.c:5276 msgid "synonym for '-p --raw'" msgstr "sin贸nimo para '-p --stat'" -#: diff.c:5296 +#: diff.c:5280 msgid "synonym for '-p --stat'" msgstr "sin贸nimo para '-p --stat'" -#: diff.c:5300 +#: diff.c:5284 msgid "machine friendly --stat" msgstr "--stat amigable para m谩quina" -#: diff.c:5303 +#: diff.c:5287 msgid "output only the last line of --stat" msgstr "mostrar solo la 煤ltima l铆nea para --stat" -#: diff.c:5305 diff.c:5313 +#: diff.c:5289 diff.c:5297 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5306 +#: diff.c:5290 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "muestra la distribuci贸n de cantidades de cambios relativa para cada " "subdirectorio" -#: diff.c:5310 +#: diff.c:5294 msgid "synonym for --dirstat=cumulative" msgstr "sin贸nimo para --dirstat=cumulative" -#: diff.c:5314 +#: diff.c:5298 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo para --dirstat=archivos,param1,param2..." -#: diff.c:5318 +#: diff.c:5302 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "advierte si cambios introducen conflictos de markers o errores de espacios " "en blanco" -#: diff.c:5321 +#: diff.c:5305 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5324 +#: diff.c:5308 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5327 +#: diff.c:5311 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5329 +#: diff.c:5313 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" -#: diff.c:5330 +#: diff.c:5314 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5332 diff.c:5335 diff.c:5338 +#: diff.c:5316 diff.c:5319 diff.c:5322 msgid "<width>" msgstr "<ancho>" -#: diff.c:5333 +#: diff.c:5317 msgid "generate diffstat with a given width" msgstr "genera diffstat con un ancho dado" -#: diff.c:5336 +#: diff.c:5320 msgid "generate diffstat with a given name width" msgstr "genera diffstat con un nombre de ancho dado" -#: diff.c:5339 +#: diff.c:5323 msgid "generate diffstat with a given graph width" msgstr "genera diffstat con un ancho de graph dado" -#: diff.c:5341 +#: diff.c:5325 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5342 +#: diff.c:5326 msgid "generate diffstat with limited lines" msgstr "genera diffstat con l铆neas limitadas" -#: diff.c:5345 +#: diff.c:5329 msgid "generate compact summary in diffstat" msgstr "genera un resumen compacto de diffstat" -#: diff.c:5348 +#: diff.c:5332 msgid "output a binary diff that can be applied" msgstr "muestra un diff binario que puede ser aplicado" -#: diff.c:5351 +#: diff.c:5335 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "mostrar todo un pre- y post-image de nombres de objetos en las l铆neas \"index" "\"" -#: diff.c:5353 +#: diff.c:5337 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5354 +#: diff.c:5338 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5355 +#: diff.c:5339 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2708,7 +3117,7 @@ msgstr "" "resaltar errores de espacios en blanco en las l铆neas 'context', 'old' o " "'new' del diff" -#: diff.c:5358 +#: diff.c:5342 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2716,89 +3125,89 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5362 +#: diff.c:5346 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5365 +#: diff.c:5349 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostrar el prefijo de destino en lugar de \"b/\"" -#: diff.c:5368 +#: diff.c:5352 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada l铆nea mostrada" -#: diff.c:5371 +#: diff.c:5355 msgid "do not show any source or destination prefix" msgstr "no mostrar ning煤n prefijo de fuente o destino" -#: diff.c:5374 +#: diff.c:5358 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "muestra el contexto entre hunks de diff hasta el n煤mero especificado de " "l铆neas" -#: diff.c:5378 diff.c:5383 diff.c:5388 +#: diff.c:5362 diff.c:5367 diff.c:5372 msgid "<char>" msgstr "<char>" -#: diff.c:5379 +#: diff.c:5363 msgid "specify the character to indicate a new line instead of '+'" msgstr "especifica el char para indicar una nueva l铆nea en lugar de '+'" -#: diff.c:5384 +#: diff.c:5368 msgid "specify the character to indicate an old line instead of '-'" msgstr "especifica el char para indicar una l铆nea vieja en lugar de '-'" -#: diff.c:5389 +#: diff.c:5373 msgid "specify the character to indicate a context instead of ' '" msgstr "especifica el char para indicar un contexto en lugar de ' '" -#: diff.c:5392 +#: diff.c:5376 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5393 +#: diff.c:5377 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5394 +#: diff.c:5378 msgid "break complete rewrite changes into pairs of delete and create" msgstr "descomponer los cambios de reescritura en pares de borrar y crear" -#: diff.c:5398 +#: diff.c:5382 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5402 +#: diff.c:5386 msgid "omit the preimage for deletes" msgstr "omite la preimage para borrados" -#: diff.c:5405 +#: diff.c:5389 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5409 +#: diff.c:5393 msgid "use unmodified files as source to find copies" msgstr "usa archivos no modificados como fuente para encontrar copias" -#: diff.c:5411 +#: diff.c:5395 msgid "disable rename detection" msgstr "deshabilita detecci贸n de renombres" -#: diff.c:5414 +#: diff.c:5398 msgid "use empty blobs as rename source" msgstr "usa blobs vac铆os como fuente de renombre" -#: diff.c:5416 +#: diff.c:5400 msgid "continue listing the history of a file beyond renames" msgstr "continua listando el historial de un archivo m谩s all谩 de renombres" -#: diff.c:5419 +#: diff.c:5403 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2806,155 +3215,155 @@ msgstr "" "previene detecci贸n de renombre/copias si el n煤mero de objetivos para " "renombres/copias excede el l铆mite dado" -#: diff.c:5421 +#: diff.c:5405 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5423 +#: diff.c:5407 msgid "produce the smallest possible diff" msgstr "produce el diff m谩s peque帽o posible" -#: diff.c:5426 +#: diff.c:5410 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando l铆neas" -#: diff.c:5429 +#: diff.c:5413 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de l铆neas en blanco" -#: diff.c:5432 +#: diff.c:5416 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5435 +#: diff.c:5419 msgid "ignore carrier-return at the end of line" msgstr "ignora carrier-return al final de la l铆nea" -#: diff.c:5438 +#: diff.c:5422 msgid "ignore changes whose lines are all blank" msgstr "ignora cambios cuyas l铆neas son todas en blanco" -#: diff.c:5441 +#: diff.c:5425 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heur铆stica para cambiar los l铆mites de hunk para una f谩cil lectura" -#: diff.c:5444 +#: diff.c:5428 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5448 +#: diff.c:5432 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5450 +#: diff.c:5434 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5451 +#: diff.c:5435 msgid "choose a diff algorithm" msgstr "escoge un algoritmo para diff" -#: diff.c:5453 +#: diff.c:5437 msgid "<text>" msgstr "<texto>" -#: diff.c:5454 +#: diff.c:5438 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera un diff usando algoritmo \"anchored diff\"" -#: diff.c:5456 diff.c:5465 diff.c:5468 +#: diff.c:5440 diff.c:5449 diff.c:5452 msgid "<mode>" msgstr "<modo>" -#: diff.c:5457 +#: diff.c:5441 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5459 diff.c:5462 diff.c:5507 +#: diff.c:5443 diff.c:5446 diff.c:5491 msgid "<regex>" msgstr "<regex>" -#: diff.c:5460 +#: diff.c:5444 msgid "use <regex> to decide what a word is" msgstr "usa <regex> para decidir que palabra es" -#: diff.c:5463 +#: diff.c:5447 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5466 +#: diff.c:5450 msgid "moved lines of code are colored differently" msgstr "l铆neas movidas de c贸digo est谩n coloreadas diferente" -#: diff.c:5469 +#: diff.c:5453 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5472 +#: diff.c:5456 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5474 +#: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra " "paths relativos" -#: diff.c:5478 +#: diff.c:5462 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5480 +#: diff.c:5464 msgid "swap two inputs, reverse the diff" msgstr "cambia dos inputs, invierte el diff" -#: diff.c:5482 +#: diff.c:5466 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5484 +#: diff.c:5468 msgid "disable all output of the program" msgstr "deshabilita todo el output del programa" -#: diff.c:5486 +#: diff.c:5470 msgid "allow an external diff helper to be executed" msgstr "permite la ejecuci贸n de un diff helper externo" -#: diff.c:5488 +#: diff.c:5472 msgid "run external text conversion filters when comparing binary files" msgstr "" "ejecuta filtros de conversi贸n de texto externos cuando comparando binarios" -#: diff.c:5490 +#: diff.c:5474 msgid "<when>" msgstr "<cuando>" -#: diff.c:5491 +#: diff.c:5475 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a subm贸dulos en la generaci贸n de diff" -#: diff.c:5494 +#: diff.c:5478 msgid "<format>" msgstr "<formato>" -#: diff.c:5495 +#: diff.c:5479 msgid "specify how differences in submodules are shown" msgstr "especifica como son mostradas las diferencias en subm贸dulos" -#: diff.c:5499 +#: diff.c:5483 msgid "hide 'git add -N' entries from the index" msgstr "ocultar entradas 'git add -N' del index" -#: diff.c:5502 +#: diff.c:5486 msgid "treat 'git add -N' entries as real in the index" msgstr "trata entradas 'git add -N' como reales en el index" -#: diff.c:5504 +#: diff.c:5488 msgid "<string>" msgstr "<string>" -#: diff.c:5505 +#: diff.c:5489 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2962,7 +3371,7 @@ msgstr "" "busca por diferencias que cambien el n煤mero de ocurrencias para el string " "especificado" -#: diff.c:5508 +#: diff.c:5492 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2970,23 +3379,23 @@ msgstr "" "busca por diferencias que cambien el n煤mero de ocurrencias para el regex " "especificado" -#: diff.c:5511 +#: diff.c:5495 msgid "show all changes in the changeset with -S or -G" msgstr "mostrar todos los cambios en el changeset con -S o -G" -#: diff.c:5514 +#: diff.c:5498 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tratar <string> en -S como una expresi贸n regular extendida de POSIX" -#: diff.c:5517 +#: diff.c:5501 msgid "control the order in which files appear in the output" msgstr "controlar el orden en el que los archivos aparecen en la salida" -#: diff.c:5518 +#: diff.c:5502 msgid "<object-id>" msgstr "<id-objeto>" -#: diff.c:5519 +#: diff.c:5503 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -2994,33 +3403,33 @@ msgstr "" "busca por diferencias que cambien el n煤mero de ocurrencias para el objeto " "especificado" -#: diff.c:5521 +#: diff.c:5505 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5522 +#: diff.c:5506 msgid "select files by diff type" msgstr "selecciona archivos por tipo de diff" -#: diff.c:5524 +#: diff.c:5508 msgid "<file>" msgstr "<archivo>" -#: diff.c:5525 +#: diff.c:5509 msgid "Output to a specific file" msgstr "Output a un archivo espec铆fico" -#: diff.c:6180 +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." msgstr "" "detecci贸n de cambio de nombre inexacta fue saltada por haber muchos archivos." -#: diff.c:6183 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber muchos archivos." -#: diff.c:6186 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3028,41 +3437,61 @@ msgstr "" "tal vez quieras configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:549 +#: dir.c:554 #, 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:938 +#: dir.c:664 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "patr贸n desconocido: '%s'" + +#: dir.c:682 dir.c:696 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "patr贸n negativo no reconocido: '%s'" + +#: dir.c:714 +#, 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 +msgid "disabling cone pattern matching" +msgstr "deshabilitar coincidencia de patr贸nes cono" + +#: dir.c:1101 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusi贸n" -#: dir.c:1877 +#: dir.c:2078 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2128 +#: dir.c:2415 msgid "failed to get kernel name and information" msgstr "fall贸 al conseguir la informaci贸n y nombre del kernel" -#: dir.c:2252 +#: dir.c:2539 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache est谩 desactivado en este sistema o ubicaci贸n" -#: dir.c:3056 +#: dir.c:3343 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo 铆ndice corrompido en repositorio %s" -#: dir.c:3101 dir.c:3106 +#: dir.c:3388 dir.c:3393 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3135 +#: dir.c:3422 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -3081,12 +3510,12 @@ msgstr "Filtrando contenido" msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" -#: environment.c:148 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:330 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no se pudo configurar GIT_DIR a '%s'" @@ -3122,32 +3551,32 @@ msgstr "no se puede escribir al remoto" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "l铆nea poco profunda inv谩lida: %s" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "l铆nea superficial inv谩lida: %s" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" @@ -3166,7 +3595,7 @@ msgstr "commit inv谩lido %s" msgid "giving up" msgstr "rindi茅ndose" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "listo" @@ -3180,162 +3609,162 @@ msgstr "se obtuvo %s (%d) %s" msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:742 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:781 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:789 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "error de protocolo: paquete de header err贸neo" -#: fetch-pack.c:857 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:873 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "%s fall贸" -#: fetch-pack.c:875 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:907 +#: fetch-pack.c:965 #, c-format msgid "Server version is %.*s" msgstr "Versi贸n de servidor es %.*s" -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 #, c-format msgid "Server supports %s" msgstr "El servidor soporta %s" -#: fetch-pack.c:914 +#: fetch-pack.c:972 msgid "Server does not support shallow clients" msgstr "El servidor no soporta clientes superficiales" -#: fetch-pack.c:974 +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shalow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shalow-exclude" -#: fetch-pack.c:983 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:1000 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch fall贸." -#: fetch-pack.c:1150 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1157 +#: fetch-pack.c:1216 msgid "Server supports filter" msgstr "El servidor soporta filtro" -#: fetch-pack.c:1180 +#: fetch-pack.c:1239 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" -#: fetch-pack.c:1198 +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "error leyendo secci贸n header '%s'" -#: fetch-pack.c:1204 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibi贸 '%s'" -#: fetch-pack.c:1243 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "l铆nea de confirmaci贸n inesperada: '%s'" -#: fetch-pack.c:1248 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "error procesando acks: %d" -#: fetch-pack.c:1258 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "espere que el packfile sea mandado luego del 'listo'" -#: fetch-pack.c:1260 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "espere que ninguna otra secci贸n sea enviada luego del 'listo'" -#: fetch-pack.c:1302 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "error procesando informaci贸n superficial: %d" -#: fetch-pack.c:1349 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1354 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1359 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "error procesando refs deseadas: %d" -#: fetch-pack.c:1693 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1785 builtin/clone.c:688 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: fetch-pack.c:1743 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1746 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "gpg fall贸 al firmar la data" - -#: gpg-interface.c:347 +#: gpg-interface.c:223 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:350 +#: gpg-interface.c:226 #, c-format msgid "failed writing detached signature to '%s'" msgstr "fall贸 al escribir la firma separada para '%s'" -#: graph.c:97 +#: 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" msgstr "ignora color inv谩lido '%.*s' en log.graphColors" @@ -3353,7 +3782,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -3409,7 +3838,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Comandos de bajo nivel / Interrogadores" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Comandos de bajo nivel / Sincronizaci贸n de repositorios" #: help.c:38 @@ -3574,7 +4003,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:611 +#: ident.c:436 builtin/commit.c:631 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inv谩lido: %s" @@ -3660,7 +4089,7 @@ 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:537 builtin/checkout.c:796 builtin/clone.c:785 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "no es posible escribir el archivo 铆ndice" @@ -3850,7 +4279,7 @@ msgstr "renombrar" msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" @@ -3899,7 +4328,7 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2114 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3910,7 +4339,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:2088 +#: merge-recursive.c:2146 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3920,7 +4349,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:2098 +#: merge-recursive.c:2156 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3929,7 +4358,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:2190 +#: merge-recursive.c:2248 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3938,7 +4367,7 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2493 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3947,52 +4376,52 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-recursive.c:2961 +#: merge-recursive.c:3019 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:3022 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3086 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3028 +#: merge-recursive.c:3086 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3040 +#: merge-recursive.c:3098 msgid "content" msgstr "contenido" -#: merge-recursive.c:3044 +#: merge-recursive.c:3102 msgid "add/add" msgstr "agregar/agregar" -#: merge-recursive.c:3067 +#: merge-recursive.c:3125 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3147 git-submodule.sh:993 msgid "submodule" msgstr "subm贸dulo" -#: merge-recursive.c:3090 +#: merge-recursive.c:3148 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusi贸n en %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3178 #, c-format msgid "Adding as %s instead" msgstr "Agregando m谩s bien como %s" -#: merge-recursive.c:3203 +#: merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4001,7 +4430,7 @@ msgstr "" "Path actualizado: %s agregado en %s dentro de un directorio que fue " "renombrado en %s; movi茅ndolo a %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4010,7 +4439,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:3210 +#: merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4019,7 +4448,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:3213 +#: merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4029,61 +4458,61 @@ msgstr "" "directorio que fue renombrado en %s, sugiriendo que tal vez deber铆a ser " "movido a %s." -#: merge-recursive.c:3327 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3355 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3362 +#: merge-recursive.c:3420 #, 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:3371 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3482 msgid "Already up to date!" msgstr "隆Ya est谩 actualizado!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "fall贸 la fusi贸n de los 谩rboles %s y %s" -#: merge-recursive.c:3537 +#: merge-recursive.c:3595 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3608 #, 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:3600 +#: merge-recursive.c:3658 msgid "merge returned no commit" msgstr "la fusi贸n no devolvi贸 ning煤n commit" -#: merge-recursive.c:3659 +#: merge-recursive.c:3717 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4093,12 +4522,12 @@ msgstr "" "merge:\n" " %s" -#: merge-recursive.c:3756 +#: merge-recursive.c:3814 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Incapaz de escribir el 铆ndice." @@ -4166,79 +4595,95 @@ msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy peque帽o" msgid "error preparing packfile from multi-pack-index" msgstr "error preparando packfile de multi-pack-index" -#: midx.c:469 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" msgstr "fall贸 al agregar packfile '%s'" -#: midx.c:475 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "fall贸 al abrir pack-index '%s'" -#: midx.c:535 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" msgstr "fall贸 al ubicar objeto %d en packfile" -#: midx.c:864 +#: midx.c:842 +msgid "Adding packfiles to multi-pack-index" +msgstr "Agregando packfiles a multi-pack-index" + +#: midx.c:875 #, c-format msgid "did not see pack-file %s to drop" msgstr "no se vi贸 pack-file %s caer" -#: midx.c:1035 +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "Escribiendo chunks a multi-pack-index" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "fall贸 al limpiar multi-pack-index en %s" -#: midx.c:1090 +#: midx.c:1108 msgid "Looking for referenced packfiles" msgstr "Buscando por packfiles referidos" -#: midx.c:1105 +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1109 -msgid "Verifying OID order in MIDX" -msgstr "Verificando orden de OID en MIDX" +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" +msgstr "Verificando orden de OID en multi-pack-index" -#: midx.c:1118 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1137 +#: midx.c:1157 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1143 +#: midx.c:1164 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1159 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1165 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "fall贸 al cargar el pack-index para packfile %s" -#: midx.c:1174 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1349 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "Contando objetos no referenciados" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Encontrando y borrando packfiles sin referencias" + +#: midx.c:1388 msgid "could not start pack-objects" msgstr "no se pudo empezar los pack-objetcts" -#: midx.c:1368 +#: midx.c:1407 msgid "could not finish pack-objects" msgstr "no se pudo finalizar pack-objetcts" @@ -4328,13 +4773,13 @@ msgstr "hash no concuerda %s" msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1887 +#: packfile.c:1888 #, 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:1891 +#: packfile.c:1892 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4446,35 +4891,35 @@ msgstr "opci贸n `%s' puede usar \"always\", \"auto\", o \"never\"" msgid "malformed object name '%s'" msgstr "nombre de objeto mal formado '%s'" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "No se pudo hacer que %s fuera escribible por el grupo" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Car谩cter de escape '\\' no permitido como 煤ltimo car谩cter en el valor attr" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Solo una especificaci贸n 'attr' es permitida." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "especificaci贸n attr no puede estar vac铆a" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nombre de atributo %s inv谩lido" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4482,50 +4927,55 @@ msgstr "" "la configuraci贸n global de 'literal' para patrones de ruta es incompatible " "con las dem谩s configuraciones globales de patrones de ruta" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "par谩metro no v谩lido para el prefijo 'magic pathspec'" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magic pathspec inv谩lido '%.*s' en '%s'" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta ')' al final del magic pathspec en '%s'" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magic pathspec '%c' no implementado en '%s'" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' y 'glob' son incompatibles" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: '%s' est谩 fuera del repositorio" -#: pathspec.c:514 +#: pathspec.c:516 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (nemot茅cnico: '%c')" -#: pathspec.c:524 +#: pathspec.c:526 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec no soportado por este comando: %s" -#: pathspec.c:591 +#: pathspec.c:593 #, 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 +#, c-format +msgid "line is badly quoted: %s" +msgstr "la l铆nea est谩 m谩l citada: %s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "no es posible escribir flush packet" @@ -4586,42 +5036,42 @@ msgstr "Refrescando index" msgid "unable to create threaded lstat: %s" msgstr "no es posible crear lstat hilado: %s" -#: pretty.c:966 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "Remoto sin URL" -#: promisor-remote.c:61 +#: promisor-remote.c:58 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "nombre remoto promisor no puede comenzar con '/': %s" -#: range-diff.c:71 +#: range-diff.c:75 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:73 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:96 sequencer.c:5163 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:118 +#: range-diff.c:122 #, c-format msgid "could not parse git header '%.*s'" msgstr "no se puede analizar git header '%.*s'" -#: range-diff.c:275 +#: range-diff.c:285 msgid "failed to generate diff" msgstr "fall贸 al generar diff" -#: range-diff.c:507 range-diff.c:509 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" @@ -4661,16 +5111,16 @@ msgstr "no es posible agregar '%s' al index" msgid "unable to stat '%s'" msgstr "incapaz de correr stat en '%s'" -#: read-cache.c:1314 +#: read-cache.c:1325 #, 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:1520 +#: read-cache.c:1531 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1635 +#: read-cache.c:1646 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4679,7 +5129,7 @@ msgstr "" "index.version configurado, pero el valor no es v谩lido.\n" "Usando versi贸n %i" -#: read-cache.c:1645 +#: read-cache.c:1656 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4688,138 +5138,138 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es v谩lido.\n" "Usando versi贸n %i" -#: read-cache.c:1701 +#: read-cache.c:1712 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1704 +#: read-cache.c:1715 #, c-format msgid "bad index version %d" msgstr "mala versi贸n del 铆ndice %d" -#: read-cache.c:1713 +#: read-cache.c:1724 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1743 +#: read-cache.c:1754 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index usa %.4s extensiones, cosa que no entendemos" -#: read-cache.c:1745 +#: read-cache.c:1756 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensi贸n %.4s" -#: read-cache.c:1782 +#: read-cache.c:1793 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de index desconocido 0x%08x" -#: read-cache.c:1798 +#: read-cache.c:1809 #, 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:1855 +#: read-cache.c:1866 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1858 +#: read-cache.c:1869 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "m煤ltiples entradas extra帽as para archivo fusionado '%s'" -#: read-cache.c:1861 +#: read-cache.c:1872 #, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 +#: 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:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "archivo 铆ndice corrompido" -#: read-cache.c:2108 +#: read-cache.c:2119 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2121 +#: read-cache.c:2132 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entires: %s" -#: read-cache.c:2154 +#: read-cache.c:2165 #, c-format msgid "%s: index file open failed" msgstr "%s: fall贸 al abrir el archivo index" -#: read-cache.c:2158 +#: read-cache.c:2169 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: no se puede hacer stat del index abierto" -#: read-cache.c:2162 +#: read-cache.c:2173 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index m谩s peque帽o de lo esperado" -#: read-cache.c:2166 +#: read-cache.c:2177 #, c-format msgid "%s: unable to map index file" msgstr "%s: no se pudo mapear el archivo index" -#: read-cache.c:2208 +#: read-cache.c:2219 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2235 +#: read-cache.c:2246 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2267 +#: read-cache.c:2278 #, c-format msgid "could not freshen shared index '%s'" msgstr "no se pudo refrescar el index compartido '%s'" -#: read-cache.c:2314 +#: read-cache.c:2325 #, 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:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:3126 +#: read-cache.c:3137 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3138 +#: read-cache.c:3149 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3163 +#: read-cache.c:3174 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3312 +#: read-cache.c:3323 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: no se puede eliminar a stage #0" @@ -4924,8 +5374,8 @@ msgstr "" 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:3388 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 +#: 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 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" @@ -4995,16 +5445,17 @@ msgstr "ref '%s' ya existe" #: refs.c:825 #, c-format msgid "unexpected object ID when writing '%s'" -msgstr "ID de objecto inesperado cuando se escrib铆a '%s'" +msgstr "ID de objecto inesperado al escribir '%s'" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "no se pudo escribir en '%s'" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1031 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" @@ -5012,7 +5463,7 @@ msgstr "no se pudo abrir '%s' para escritura" #: refs.c:867 #, c-format msgid "unexpected object ID when deleting '%s'" -msgstr "ID de objecto inesperado cuando se borraba '%s'" +msgstr "ID de objecto inesperado al borrar '%s'" #: refs.c:998 #, c-format @@ -5668,8 +6119,8 @@ msgstr "no se puede desvincular stray '%s'" msgid "Recorded preimage for '%s'" msgstr "Resoluci贸n precargada para '%s'" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -5703,33 +6154,33 @@ msgstr "Se olvid贸 resoluci贸n para '%s'\n" msgid "unable to open rr-cache directory" msgstr "no es posible abrir directorio rr-cache" -#: revision.c:2509 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2512 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "tu rama actual '%s' no tiene ning煤n commit todav铆a" -#: revision.c:2720 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: revision.c:2724 +#: revision.c:2712 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L no soporta todav铆a formatos de diff fuera de -p y -s" -#: run-command.c:763 +#: run-command.c:762 msgid "open /dev/null failed" msgstr "fall贸 al abrir /dev/null" -#: run-command.c:1269 +#: run-command.c:1268 #, c-format msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" -#: run-command.c:1333 +#: run-command.c:1332 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5739,30 +6190,30 @@ msgstr "" "Puedes desactivar esta advertencias con `git config advice.ignoredHook " "false`." -#: send-pack.c:142 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "flush packet inesperado mientras se le铆a estatus de desempaquetado remoto" -#: send-pack.c:144 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no es posible analizar el estado de desempaquetado remoto: %s" -#: send-pack.c:146 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "desempaquetado remoto fall贸: %s" -#: send-pack.c:307 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "fall贸 al firmar el certificado de push" -#: send-pack.c:421 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta --signed push" -#: send-pack.c:423 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5770,47 +6221,47 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed )" -#: send-pack.c:435 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push at贸micos (--atomic)" -#: send-pack.c:440 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:187 +#: sequencer.c:189 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit inv谩lido, modo cleanup '%s'" -#: sequencer.c:292 +#: sequencer.c:294 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "no se pudo eliminar'%s'" -#: sequencer.c:321 +#: sequencer.c:323 msgid "revert" msgstr "revertir" -#: sequencer.c:323 +#: sequencer.c:325 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:327 +#: sequencer.c:329 #, c-format msgid "unknown action: %d" msgstr "acci贸n desconocida: %d" -#: sequencer.c:385 +#: sequencer.c:387 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5818,7 +6269,7 @@ msgstr "" "despu茅s de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:388 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5828,44 +6279,44 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:401 sequencer.c:2847 +#: sequencer.c:403 sequencer.c:2993 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:408 +#: sequencer.c:410 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 +#: sequencer.c:3277 #, c-format msgid "failed to finalize '%s'" msgstr "fall贸 al finalizar '%s'" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: 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 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: sequencer.c:462 +#: sequencer.c:464 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales ser谩n sobreescritos por %s." -#: sequencer.c:466 +#: sequencer.c:468 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:498 +#: sequencer.c:500 #, c-format msgid "%s: fast-forward" msgstr "%s: avance r谩pido" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:539 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup inv谩lido %s" @@ -5873,65 +6324,69 @@ msgstr "Modo cleanup inv谩lido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:631 +#: sequencer.c:633 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo 铆ndice" -#: sequencer.c:648 +#: sequencer.c:650 msgid "unable to update cache tree" msgstr "no es posible actualizar el 谩rbol de la cach茅" -#: sequencer.c:662 +#: sequencer.c:664 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:742 +#: sequencer.c:744 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:753 +#: sequencer.c:755 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:800 +#: sequencer.c:802 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:805 +#: sequencer.c:807 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:810 +#: sequencer.c:812 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:814 +#: sequencer.c:816 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:819 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:872 +#: sequencer.c:902 sequencer.c:1427 +msgid "malformed ident line" +msgstr "l铆nea de entrada mal formada" + +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5961,11 +6416,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1146 +#: sequencer.c:1218 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' fall贸" -#: sequencer.c:1153 +#: sequencer.c:1224 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5992,7 +6447,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1166 +#: sequencer.c:1237 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6016,325 +6471,329 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1208 +#: sequencer.c:1279 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit reci茅n creado" -#: sequencer.c:1210 +#: sequencer.c:1281 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit reci茅n creado" -#: sequencer.c:1256 +#: sequencer.c:1327 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1258 +#: sequencer.c:1329 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1262 +#: sequencer.c:1333 msgid " (root-commit)" msgstr " (commit-ra铆z)" -#: sequencer.c:1283 +#: sequencer.c:1354 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1285 +#: sequencer.c:1356 #, c-format msgid "HEAD %s is not a commit!" msgstr "隆HEAD %s no es un commit!" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1411 sequencer.c:2055 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: 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 msgid "git write-tree failed to write a tree" msgstr "git write-tree fall贸 al escribir el 谩rbol" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1480 sequencer.c:1550 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 #: builtin/merge.c:908 msgid "failed to write commit object" msgstr "fall贸 al escribir el objeto commit" -#: sequencer.c:1456 +#: sequencer.c:1577 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1461 +#: sequencer.c:1582 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1656 sequencer.c:1767 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1714 sequencer.c:1739 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinaci贸n de %d commits." -#: sequencer.c:1602 +#: sequencer.c:1724 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1726 sequencer.c:3304 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1606 +#: sequencer.c:1728 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1612 +#: sequencer.c:1734 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1627 +#: sequencer.c:1749 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1634 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1640 +#: sequencer.c:1762 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d ser谩 saltado:" -#: sequencer.c:1728 +#: sequencer.c:1850 msgid "your index file is unmerged." msgstr "tu archivo 铆ndice no est谩 fusionado." -#: sequencer.c:1735 +#: sequencer.c:1857 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit ra铆z" -#: sequencer.c:1754 +#: sequencer.c:1876 #, 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:1762 sequencer.c:1770 +#: sequencer.c:1884 sequencer.c:1892 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1776 +#: sequencer.c:1898 #, c-format msgid "cannot get commit message for %s" msgstr "no se puede obtener el mensaje de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1795 +#: sequencer.c:1917 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1860 +#: sequencer.c:1982 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1915 +#: sequencer.c:2037 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1916 +#: sequencer.c:2038 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1983 +#: sequencer.c:2105 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: fall贸 al leer el 铆ndice" -#: sequencer.c:1990 +#: sequencer.c:2112 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: fall贸 al refrescar el 铆ndice" -#: sequencer.c:2066 +#: sequencer.c:2189 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2075 +#: sequencer.c:2198 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2112 +#: sequencer.c:2235 #, c-format msgid "could not parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:2166 +#: sequencer.c:2289 #, c-format msgid "invalid line %d: %.*s" msgstr "l铆nea inv谩lida %d: %.*s" -#: sequencer.c:2177 +#: sequencer.c:2300 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: 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:2261 +#: sequencer.c:2384 msgid "cancelling a cherry picking in progress" msgstr "cancelando cherry-pick en progreso" -#: sequencer.c:2268 +#: sequencer.c:2391 msgid "cancelling a revert in progress" msgstr "cancelando revert en progreso" -#: sequencer.c:2302 +#: sequencer.c:2435 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2304 +#: sequencer.c:2437 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2309 +#: sequencer.c:2442 msgid "no commits parsed." msgstr "ning煤n commit analizado." -#: sequencer.c:2320 +#: sequencer.c:2453 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2322 +#: sequencer.c:2455 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2404 +#: sequencer.c:2533 #, c-format msgid "invalid value for %s: %s" msgstr "valor inv谩lido para %s: %s" -#: sequencer.c:2491 +#: sequencer.c:2630 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2507 +#: sequencer.c:2646 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2736 sequencer.c:4463 msgid "empty commit set passed" msgstr "conjunto de commits vac铆o entregado" -#: sequencer.c:2606 +#: sequencer.c:2752 msgid "revert is already in progress" msgstr "revert ya est谩 en progreso" -#: sequencer.c:2608 +#: sequencer.c:2754 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" -#: sequencer.c:2611 +#: sequencer.c:2757 msgid "cherry-pick is already in progress" msgstr "cherry-pick ya est谩 en progreso" -#: sequencer.c:2613 +#: sequencer.c:2759 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2627 +#: sequencer.c:2773 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2642 +#: sequencer.c:2788 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2848 sequencer.c:4209 msgid "no cherry-pick or revert in progress" msgstr "ning煤n cherry-pick o revert en progreso" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2850 sequencer.c:2861 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2852 sequencer.c:2896 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2736 builtin/grep.c:736 +#: sequencer.c:2882 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2738 +#: sequencer.c:2884 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2739 +#: sequencer.c:2885 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2745 +#: sequencer.c:2891 #, 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:2756 +#: sequencer.c:2902 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:2797 +#: sequencer.c:2943 msgid "no revert in progress" msgstr "no hay revert en progreso" -#: sequencer.c:2805 +#: sequencer.c:2951 msgid "no cherry-pick in progress" msgstr "ning煤n cherry-pick en progreso" -#: sequencer.c:2815 +#: sequencer.c:2961 msgid "failed to skip the commit" msgstr "fall贸 al escribir el commit" -#: sequencer.c:2822 +#: sequencer.c:2968 msgid "there is nothing to skip" msgstr "no hay nada que saltar" -#: sequencer.c:2825 +#: sequencer.c:2971 #, c-format msgid "" "have you committed already?\n" @@ -6343,21 +6802,21 @@ msgstr "" "驴ya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:3095 sequencer.c:4121 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3134 sequencer.c:4101 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:3004 +#: sequencer.c:3151 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3012 +#: sequencer.c:3159 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6376,27 +6835,22 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3022 +#: sequencer.c:3169 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:3029 +#: sequencer.c:3176 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 -msgid "could not read index" -msgstr "no se pudo leer 铆ndice" - -#: sequencer.c:3074 +#: sequencer.c:3221 #, c-format msgid "" "execution failed: %s\n" @@ -6411,11 +6865,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3080 +#: sequencer.c:3227 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:3086 +#: sequencer.c:3233 #, c-format msgid "" "execution succeeded: %s\n" @@ -6432,76 +6886,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3147 +#: sequencer.c:3294 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3201 +#: sequencer.c:3348 msgid "writing fake root commit" msgstr "escribiendo commit ra铆z falso" -#: sequencer.c:3206 +#: sequencer.c:3353 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 #, c-format msgid "failed to find tree of %s" msgstr "fall贸 al encontrar 谩rbol de %s" -#: sequencer.c:3262 builtin/rebase.c:874 -msgid "could not write index" -msgstr "no se pudo escribir 铆ndice" - -#: sequencer.c:3289 +#: sequencer.c:3436 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3320 +#: sequencer.c:3467 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versi贸n actual" -#: sequencer.c:3342 +#: sequencer.c:3489 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3351 +#: sequencer.c:3498 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3363 +#: sequencer.c:3510 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:3378 +#: sequencer.c:3526 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3538 +#: sequencer.c:3688 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3554 +#: sequencer.c:3704 msgid "merge: Unable to write new index file" msgstr "fusi贸n: No se puede escribir el nuevo archivo 铆ndice" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3773 builtin/rebase.c:733 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3635 +#: sequencer.c:3785 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6513,31 +6963,31 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3699 +#: sequencer.c:3849 #, c-format msgid "could not checkout %s" msgstr "no se puede hacer checkout a %s" -#: sequencer.c:3713 +#: sequencer.c:3863 #, c-format msgid "%s: not a valid OID" msgstr "%s no es OID v谩lido" -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3733 +#: sequencer.c:3883 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3735 +#: sequencer.c:3885 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3743 +#: sequencer.c:3893 #, c-format msgid "" "Could not execute the todo command\n" @@ -6558,48 +7008,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3827 +#: sequencer.c:3979 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:3898 +#: sequencer.c:4050 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:3957 +#: sequencer.c:4109 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:3962 +#: sequencer.c:4114 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:3976 +#: sequencer.c:4128 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:4069 +#: sequencer.c:4221 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del 谩rea de stage." -#: sequencer.c:4078 +#: sequencer.c:4230 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4080 +#: sequencer.c:4232 #, c-format msgid "invalid file: '%s'" msgstr "archivo inv谩lido: '%s'" -#: sequencer.c:4082 +#: sequencer.c:4234 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inv谩lido: '%s'" -#: sequencer.c:4085 +#: sequencer.c:4237 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6610,42 +7060,42 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4121 sequencer.c:4159 +#: sequencer.c:4273 sequencer.c:4312 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4174 +#: sequencer.c:4327 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4181 +#: sequencer.c:4334 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el 谩rea de stage." -#: sequencer.c:4285 +#: sequencer.c:4440 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4289 +#: sequencer.c:4444 #, c-format msgid "%s: bad revision" msgstr "%s: revisi贸n err贸nea" -#: sequencer.c:4324 +#: sequencer.c:4479 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4774 +#: sequencer.c:4952 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4777 +#: sequencer.c:4955 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:4935 +#: sequencer.c:5113 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6655,15 +7105,15 @@ msgstr "" "rebase --continue'.\n" "O se puede abortar el rebase con 'git rebase --abort'.\n" -#: sequencer.c:5047 sequencer.c:5064 +#: sequencer.c:5226 sequencer.c:5243 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5078 +#: sequencer.c:5257 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5166 +#: sequencer.c:5351 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." @@ -7171,6 +7621,11 @@ msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" +#: strbuf.c:1149 +#, c-format +msgid "could not edit '%s'" +msgstr "no se pudo editar '%s'" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7205,14 +7660,14 @@ msgstr "El patr贸n de ruta '%s' est谩 en el subm贸dulo '%.*s'" 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:1989 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 msgid "Failed to resolve HEAD as a valid ref." msgstr "Fall贸 al resolver HEAD como un ref v谩lido." #: submodule.c:1481 #, c-format msgid "Could not access submodule '%s'" -msgstr "no pudo acceder al subm贸dulo '%s'" +msgstr "No pudo acceder al subm贸dulo '%s'" #: submodule.c:1651 #, c-format @@ -7244,7 +7699,12 @@ msgstr "subm贸dulo '%s' tiene un 铆ndice corrupto" msgid "Submodule '%s' could not be updated." msgstr "Subm贸dulo '%s' no pudo ser actualizado." -#: submodule.c:2007 +#: submodule.c:2027 +#, 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 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7252,12 +7712,17 @@ msgstr "" "relocate_gitdir para el subm贸dulo '%s' con m谩s de un 谩rbol de trabajo no " "soportado" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2060 submodule.c:2119 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el subm贸dulo '%s'" -#: submodule.c:2026 +#: submodule.c:2064 +#, 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 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7268,16 +7733,16 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2109 +#: submodule.c:2154 #, c-format msgid "could not recurse into submodule '%s'" msgstr "no pudo recursar en el subm贸dulo '%s'" -#: submodule.c:2153 +#: submodule.c:2198 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2192 +#: submodule.c:2237 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvi贸 un c贸digo %d inesperado" @@ -7298,12 +7763,12 @@ msgstr "" "ignorando '%s' ya que puede ser interpretado como una opci贸n de l铆nea de " "comando: %s" -#: submodule-config.c:490 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "valor inv谩lido para %s" -#: submodule-config.c:761 +#: submodule-config.c:769 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No se pudo actualizar la entrada %s de .gitmodules" @@ -7451,7 +7916,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:655 +#: transport.c:1345 transport-helper.c:656 msgid "operation not supported by protocol" msgstr "operaci贸n no soportada por protocolo" @@ -7464,7 +7929,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:569 +#: transport-helper.c:160 transport-helper.c:570 msgid "can't dup helper output fd" msgstr "no se puede duplicar output de fd del helper" @@ -7491,90 +7956,90 @@ msgstr "%s dijo inesperadamente: '%s'" msgid "%s also locked %s" msgstr "%s tambi茅n bloque贸 %s" -#: transport-helper.c:491 +#: transport-helper.c:492 msgid "couldn't run fast-import" msgstr "no se pudo ejecutar fast-import" -#: transport-helper.c:514 +#: transport-helper.c:515 msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:543 transport-helper.c:1132 +#: transport-helper.c:544 transport-helper.c:1133 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" -#: transport-helper.c:588 +#: transport-helper.c:589 #, c-format msgid "unknown response to connect: %s" msgstr "respuesta para conectar desconocida: %s" -#: transport-helper.c:610 +#: transport-helper.c:611 msgid "setting remote service path not supported by protocol" msgstr "configurando servicio de ruta remota no soportado por el protocolo" -#: transport-helper.c:612 +#: transport-helper.c:613 msgid "invalid remote service path" msgstr "ruta de servicio remoto inv谩lida" -#: transport-helper.c:658 +#: transport-helper.c:659 #, c-format msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:734 +#: transport-helper.c:735 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:787 +#: transport-helper.c:788 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper report贸 estado inesperado de %s" -#: transport-helper.c:848 +#: transport-helper.c:849 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:851 +#: transport-helper.c:852 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:854 +#: transport-helper.c:855 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:859 +#: transport-helper.c:860 #, c-format msgid "helper %s does not support --atomic" msgstr "helper %s no soporta --atomic" -#: transport-helper.c:865 +#: transport-helper.c:866 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:963 +#: transport-helper.c:964 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:968 +#: transport-helper.c:969 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:1015 +#: transport-helper.c:1016 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:1020 +#: transport-helper.c:1021 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1045 +#: transport-helper.c:1046 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7583,47 +8048,47 @@ 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:1118 +#: transport-helper.c:1119 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1270 +#: transport-helper.c:1271 #, c-format msgid "read(%s) failed" msgstr "leer(%s) fall贸" -#: transport-helper.c:1297 +#: transport-helper.c:1298 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) fall贸" -#: transport-helper.c:1346 +#: transport-helper.c:1347 #, c-format msgid "%s thread failed" msgstr "hilo %s fall贸" -#: transport-helper.c:1350 +#: transport-helper.c:1351 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s fall贸 al unirse: %s" -#: transport-helper.c:1369 transport-helper.c:1373 +#: transport-helper.c:1370 transport-helper.c:1374 #, 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:1410 +#: transport-helper.c:1411 #, c-format msgid "%s process failed to wait" msgstr "proceso %s fall贸 al esperar" -#: transport-helper.c:1414 +#: transport-helper.c:1415 #, c-format msgid "%s process failed" msgstr "proceso %s fall贸" -#: transport-helper.c:1432 transport-helper.c:1441 +#: transport-helper.c:1433 transport-helper.c:1442 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" @@ -7639,7 +8104,12 @@ msgstr "modo mal formado en la entrada de 谩rbol" msgid "empty filename in tree entry" msgstr "nombre de archivo vac铆o en la entrada de 谩rbol" -#: tree-walk.c:118 +#: 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 msgid "too-short tree file" msgstr "archivo de 谩rbol muy corto" @@ -7899,6 +8369,10 @@ msgstr "" "en un filesystem case-insensitive) y solo una del grupo\n" "colisionando est谩 en el 谩rbol de trabajo:\n" +#: unpack-trees.c:1441 +msgid "Updating index flags" +msgstr "Actualizando flags del index" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nombre de URL inv谩lido o聽sufijo '://' faltante" @@ -8507,133 +8981,133 @@ msgstr "adicionalmente, tu 铆ndice contiene cambios que no est谩n en un commit." msgid "cannot %s: Your index contains uncommitted changes." msgstr "no se puede %s: Tu 铆ndice contiene cambios que no est谩n en un commit." -#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 #, c-format msgid "failed to unlink '%s'" msgstr "fall贸 al desvincular '%s'" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opci贸n>] [--] <especificaci贸n-de-ruta>..." -#: builtin/add.c:84 +#: builtin/add.c:87 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:92 builtin/commit.c:288 msgid "updating files failed" msgstr "fall贸 la actualizaci贸n de carpetas" -#: builtin/add.c:99 +#: builtin/add.c:102 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:177 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del 谩rea de stage tras refrescar el 铆ndice:" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:252 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "No se pudo leer el 铆ndice" -#: builtin/add.c:245 +#: builtin/add.c:263 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:249 +#: builtin/add.c:267 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:252 +#: builtin/add.c:270 msgid "editing patch failed" msgstr "fall贸 la edici贸n del parche" -#: builtin/add.c:255 +#: builtin/add.c:273 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:257 +#: builtin/add.c:275 msgid "Empty patch. Aborted." msgstr "Parche vac铆o. Abortado." -#: builtin/add.c:262 +#: builtin/add.c:280 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:270 +#: builtin/add.c:288 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:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: 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 msgid "dry run" msgstr "dry run ( ejecuci贸n en seco)" -#: builtin/add.c:293 +#: builtin/add.c:311 msgid "interactive picking" msgstr "selecci贸n interactiva" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:295 +#: builtin/add.c:313 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:296 +#: builtin/add.c:314 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:297 +#: builtin/add.c:315 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:298 +#: builtin/add.c:316 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:299 +#: builtin/add.c:317 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:300 +#: builtin/add.c:318 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:303 +#: builtin/add.c:321 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:305 +#: builtin/add.c:323 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el 铆ndice" -#: builtin/add.c:306 +#: builtin/add.c:324 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:307 +#: builtin/add.c:325 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:309 builtin/update-index.c:1002 +#: builtin/add.c:327 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:311 +#: builtin/add.c:329 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:326 +#: builtin/add.c:347 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8664,39 +9138,57 @@ msgstr "" "\n" "Vea \"git help submodule\" para m谩s informaci贸n." -#: builtin/add.c:354 +#: builtin/add.c:375 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:372 +#: 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:379 +#: builtin/add.c:400 msgid "adding files failed" msgstr "fall贸 al agregar archivos" -#: builtin/add.c:419 +#: builtin/add.c:428 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 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file es incompatible con --edit" + +#: builtin/add.c:446 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:426 +#: builtin/add.c:449 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:430 +#: builtin/add.c:453 #, 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:445 +#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 +#: builtin/reset.c:327 +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 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul requiere --pathspec-from-file" + +#: builtin/add.c:482 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "驴Tal vez quiso decir 'git add .'?\n" @@ -8749,7 +9241,7 @@ msgstr "offset de zona horaria inv谩lido" msgid "Patch format detection failed." msgstr "Fall贸 al detectar el formato del parche." -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:948 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "fall贸 al crear el directorio '%s'" @@ -8843,7 +9335,7 @@ msgstr "Cuerpo de commit es:" 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:374 +#: builtin/am.c:1695 builtin/commit.c:394 msgid "unable to write index file" msgstr "no es posible escribir en el archivo 铆ndice" @@ -8893,8 +9385,8 @@ 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:329 -#: builtin/reset.c:337 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." @@ -8937,7 +9429,7 @@ 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:297 builtin/stash.c:812 +#: builtin/repack.c:304 builtin/stash.c:811 msgid "be quiet" msgstr "ser silencioso" @@ -8980,12 +9472,12 @@ msgstr "descubrir todo antes de una l铆nea de tijeras" msgid "pass it through git-apply" msgstr "pasarlo a trav茅s de git-apply" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 +#: 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/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:150 parse-options.h:171 parse-options.h:312 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" @@ -9034,13 +9526,13 @@ msgstr "mentir sobre la fecha del committer" 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:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: 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 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 msgid "GPG-sign commits" msgstr "Commits con firma GPG" @@ -9201,7 +9693,7 @@ msgstr "No estamos bisecando.\n" msgid "'%s' is not a valid commit" msgstr "'%s' no es un commit v谩lido" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:172 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9209,27 +9701,27 @@ msgstr "" "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mal argumento bisect_write: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no se puede obtener el oid de la rev '%s'" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:233 #, c-format msgid "couldn't open the file '%s'" msgstr "no se pudo abrir el archivo '%s'" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Comando inv谩lido: actualmente se encuentra en un bisect %s/%s" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:286 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9238,7 +9730,7 @@ msgstr "" "Tienes que dar al menos un %s y un %s revision.\n" "Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:290 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9249,7 +9741,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:321 +#: builtin/bisect--helper.c:322 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -9258,15 +9750,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:330 msgid "Are you sure [Y/n]? " msgstr "驴Est谩s seguro [Y/n]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:377 msgid "no terms defined" msgstr "no hay t茅rminos definidos" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:380 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9275,7 +9767,7 @@ msgstr "" "Tus t茅rminos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:390 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9284,112 +9776,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:475 +#: builtin/bisect--helper.c:476 #, c-format msgid "unrecognized option: '%s'" msgstr "opci贸n desconocida: '%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:480 #, 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:511 +#: builtin/bisect--helper.c:512 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:527 #, 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:547 +#: builtin/bisect--helper.c:548 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecar谩 en un 谩rbol con cg-seek" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:551 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simb贸lico extra帽o" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:575 #, c-format msgid "invalid ref: '%s'" msgstr "ref inv谩lido: '%s'" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:631 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:633 msgid "write the terms to .git/BISECT_TERMS" msgstr "escribe los t茅rminos a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:635 msgid "cleanup the bisection state" msgstr "limpiar el estado de bisecci贸n" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:637 msgid "check for expected revs" msgstr "revisar por revs esperados" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:639 msgid "reset the bisection state" msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:641 msgid "write out the bisection state in BISECT_LOG" msgstr "escribir el estado de bisect en BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:643 msgid "check and set terms in a bisection state" msgstr "revisar y configurar los terms en el estado de bisect" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:645 msgid "check whether bad or good terms exist" msgstr "revisar si existen t茅rminos malos o buenos" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:647 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:649 msgid "start the bisect session" msgstr "comenzar la sesi贸n de bisect" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:651 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:652 +#: builtin/bisect--helper.c:653 msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:670 msgid "--write-terms requires two arguments" msgstr "--write-terms requiere dos argumentos" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:674 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:681 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset requiere un commit o ning煤n argumento" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:685 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write requiere entre 4 o 5 argumentos" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:691 msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:697 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:703 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" @@ -9488,17 +9980,17 @@ msgstr "Mostrar en cambio el email del autor (Default: off)" msgid "Ignore whitespace differences" msgstr "Ignorar diferencias de espacios en blanco" -#: builtin/blame.c:860 builtin/log.c:1630 +#: builtin/blame.c:860 builtin/log.c:1702 msgid "rev" msgstr "rev" #: builtin/blame.c:860 msgid "Ignore <rev> when blaming" -msgstr "ignorar <rev> durante el blame" +msgstr "Ignorar <rev> durante el blame" #: builtin/blame.c:861 msgid "Ignore revisions from <file>" -msgstr "ignorar revisiones de <archivo>" +msgstr "Ignorar revisiones de <archivo>" #: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" @@ -9508,43 +10000,39 @@ msgstr "colorear metadata redundante de l铆neas previas de manera diferente" msgid "color lines by age" msgstr "colorear l铆neas por edad" -#: builtin/blame.c:870 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Usar un heur铆stico experimental para mejorar los diffs" - -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Ocupo m谩s ciclos para encontrar mejoras resultados" -#: builtin/blame.c:873 +#: builtin/blame.c:865 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" -#: builtin/blame.c:874 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "Usar contenido de <archivo> como imagen final" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "puntaje" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "Encontrar copias de l铆neas entre y a trav茅s de archivos" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "Encontrar movimientos de l铆neas entre y a trav茅s de archivos" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "Procesar solo el rango de l铆neas n,m, contando desde 1" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -9556,18 +10044,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "hace 4 a帽os, 11 meses" -#: builtin/blame.c:1087 +#: builtin/blame.c:1079 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "archivo %s tiene solo %lu l铆nea" msgstr[1] "archivo %s tiene solo %lu l铆neas" -#: builtin/blame.c:1133 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "Blaming a l铆neas" @@ -9780,7 +10268,7 @@ msgstr "configurando modo tracking (mirar git-pull(1))" msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:505 msgid "upstream" msgstr "upstream" @@ -9789,8 +10277,8 @@ msgid "change the upstream info" msgstr "cambiar info de upstream" #: builtin/branch.c:627 -msgid "Unset the upstream info" -msgstr "Desconfigurando la info de upstream" +msgid "unset the upstream info" +msgstr "desconfigurando la info de upstream" #: builtin/branch.c:628 msgid "use colored output" @@ -9891,7 +10379,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:760 +#: builtin/branch.c:684 builtin/clone.c:784 msgid "HEAD not found below refs/heads!" msgstr "隆HEAD no encontrado abajo de refs/heads!" @@ -9982,19 +10470,64 @@ msgstr "" "la opci贸n '--set-upstream' ya no es soportada. Considere usar '--track' o '--" "set-upstream-to' en cambio." -#: builtin/bundle.c:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s est谩 bien\n" +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "git bundle create [<opciones>] <file> <git-rev-list args>" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [<options>] <file>" +msgstr "git bundle verify [<opciones>] <archivo>" + +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +msgid "do not show progress meter" +msgstr "no mostrar medidor de progreso" -#: builtin/bundle.c:58 +#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +msgid "show progress meter" +msgstr "mostrar medidor de progreso" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +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 +msgid "similar to --all-progress when progress meter is shown" +msgstr "similar a --all-progress cuando medidor de progreso es mostrado" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "Se necesita un repositorio para agrupar." -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "no mostrar detalles del bundle" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s est谩 bien\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." +#: builtin/bundle.c:168 builtin/remote.c:1609 +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 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sub-comando desconocido: %s" + #: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" @@ -10043,7 +10576,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:936 +#: builtin/cat-file.c:645 git-submodule.sh:992 msgid "blob" msgstr "blob" @@ -10104,7 +10637,7 @@ 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:1433 builtin/gc.c:537 +#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 #: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -10197,8 +10730,8 @@ 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:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 #: builtin/worktree.c:679 msgid "string" msgstr "string" @@ -10227,98 +10760,98 @@ msgstr "git switch [<opciones>] [<rama>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..." -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "ruta '%s' no tiene nuestra versi贸n" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "ruta '%s' no tiene su versi贸n" -#: builtin/checkout.c:191 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:241 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:259 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:275 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusi贸n a '%s'" -#: builtin/checkout.c:375 +#: builtin/checkout.c:377 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Recreado %d conflicto de merge" msgstr[1] "Recreados %d conflictos de merge" -#: builtin/checkout.c:380 +#: builtin/checkout.c:382 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Actualizada %d ruta para %s" msgstr[1] "Actualizadas %d rutas para %s" -#: builtin/checkout.c:387 +#: builtin/checkout.c:389 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Actualizada %d ruta desde el index" msgstr[1] "Actualizadas %d rutas desde el index" -#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:423 builtin/checkout.c:426 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:430 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:434 +#: builtin/checkout.c:436 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s' o '%s' est谩n especificados" -#: builtin/checkout.c:438 +#: builtin/checkout.c:440 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' tiene que ser usado cuando '%s' no es especificado" -#: builtin/checkout.c:443 builtin/checkout.c:448 +#: builtin/checkout.c:445 builtin/checkout.c:450 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' no puede ser usado con %s" -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:680 +#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu 铆ndice actual primero" -#: builtin/checkout.c:730 +#: builtin/checkout.c:732 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10327,50 +10860,50 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:833 +#: builtin/checkout.c:835 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:877 msgid "HEAD is now at" msgstr "HEAD est谩 ahora en" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:881 builtin/clone.c:716 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:885 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:888 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:892 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:894 builtin/checkout.c:1291 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:896 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:947 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d m谩s.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:953 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10393,7 +10926,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:972 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10420,28 +10953,28 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1007 msgid "internal error in revision walk" msgstr "error interno en camino de revisi贸n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1011 msgid "Previous HEAD position was" msgstr "La posici贸n previa de HEAD era" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1051 builtin/checkout.c:1286 msgid "You are on a branch yet to be born" msgstr "Est谩s en una rama por nacer" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1178 msgid "only one reference expected" msgstr "solo una referencia esperada" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1195 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1232 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10450,37 +10983,37 @@ 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:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "referencia inv谩lida: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1258 builtin/checkout.c:1622 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n 谩rbol: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1307 #, 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:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1308 builtin/checkout.c:1316 #, c-format msgid "a branch is expected, got '%s'" msgstr "se esperaba branch, se obuto '%s'" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1311 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1327 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10488,7 +11021,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1331 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10496,7 +11029,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:1333 +#: builtin/checkout.c:1335 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10504,7 +11037,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1339 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10512,7 +11045,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:1341 +#: builtin/checkout.c:1343 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10520,122 +11053,119 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1347 msgid "you are switching branch while bisecting" msgstr "est谩s cambiando ramas durante un bisect" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1354 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 +#: builtin/checkout.c:1380 builtin/checkout.c:1385 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1382 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1390 #, 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:1395 +#: builtin/checkout.c:1397 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: 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/send-pack.c:174 msgid "force progress reporting" msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1440 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:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1442 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1454 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1455 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1457 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1461 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1464 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:1475 +#: builtin/checkout.c:1477 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versi贸n para archivos sin fusionar" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1480 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versi贸n para los archivos sin fusionar" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1484 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1537 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1540 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1577 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1578 +#: builtin/checkout.c:1582 msgid "missing branch name; try -b" msgstr "falta nombre de rama; prueba -b" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1615 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "debes especificar path(s) para restaurar" - #: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "especificaci贸n de ruta inv谩lida" @@ -10650,7 +11180,15 @@ msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" 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:1646 +#: builtin/checkout.c:1651 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file es incompatible con --detach" + +#: builtin/checkout.c:1654 builtin/reset.c:324 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file es incompatible con --patch" + +#: builtin/checkout.c:1665 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10658,7 +11196,11 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del 铆ndice." -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1670 +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" @@ -10688,65 +11230,65 @@ msgstr "" "de nombre <nombre> remota, como 'origin', considera configurar\n" "checkout.defaultRemote=origin en tu configuraci贸n." -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: 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 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1715 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1717 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1718 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1720 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "adivinar segunda opci贸n 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1721 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1743 +#: builtin/checkout.c:1766 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1745 +#: builtin/checkout.c:1768 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1747 +#: builtin/checkout.c:1770 msgid "second guess 'git switch <no-such-branch>'" msgstr "adivinar segunda opci贸n 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1749 +#: builtin/checkout.c:1772 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1804 msgid "which tree-ish to checkout from" msgstr "de qu茅 谩rbol hacer el checkout" -#: builtin/checkout.c:1783 +#: builtin/checkout.c:1806 msgid "restore the index" msgstr "restaurar el index" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1808 msgid "restore the working tree (default)" msgstr "restaurar el 谩rbol de trabajo (default)" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1810 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1811 msgid "use overlay mode" msgstr "usar modo overlay" @@ -10786,7 +11328,7 @@ msgstr "fall贸 al borrar %s" msgid "could not lstat %s\n" msgstr "no se pudo lstat %s\n" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10799,7 +11341,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo 煤nico\n" " - (vac铆o) no elegir nada\n" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10820,8 +11362,8 @@ msgstr "" "* - escoger todos los objetos\n" " - (vac铆o) terminar selecci贸n\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "驴Ahh (%s)?\n" @@ -10846,11 +11388,6 @@ msgstr "Seleccionar objetos para borrar" msgid "Remove %s [y/N]? " msgstr "驴Borrar %s [y/N]? " -#: builtin/clean.c:787 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Adi贸s.\n" - #: builtin/clean.c:795 msgid "" "clean - start cleaning\n" @@ -10869,14 +11406,6 @@ msgstr "" "help - esta ventana\n" "? - ayuda para selecci贸n de opciones" -#: builtin/clean.c:822 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "*** Comandos ***" - -#: builtin/clean.c:823 git-add--interactive.perl:1846 -msgid "What now" -msgstr "Ahora que" - #: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" @@ -10904,8 +11433,8 @@ 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:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: 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/show-ref.c:179 msgid "pattern" msgstr "patr贸n" @@ -10946,156 +11475,161 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "crear un repositorio vac铆o" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "crear un repositorio espejo (implica vac铆o)" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "clonar de un repositorio local" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "no usar hardlinks, siempre copiar" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "configurar como repositorio compartido" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "inicializar subm贸dulos en el clonado" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "numero de subm贸dulos clonados en paralelo" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "directorio del cual los templates ser谩n usados" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1885 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1887 msgid "use --reference only while cloning" msgstr "usa--reference solamente si est谩s clonado" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:327 msgid "name" msgstr "nombre" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checkout <rama> en lugar de HEAD remota" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 #: builtin/pull.c:227 msgid "depth" msgstr "profundidad" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 msgid "time" msgstr "tiempo" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo espec铆fico" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1445 msgid "revision" msgstr "revision" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "no clonar ning煤n tag, y hacer que los subsiguientes fetch no los sigan" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "cualquier subm贸dulo clonado ser谩 superficial" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separa git dir del 谩rbol de trabajo" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "llave=valor" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opci贸n para trasmitir" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" -#: builtin/clone.c:148 +#: builtin/clone.c:149 msgid "any cloned submodules will use their remote-tracking branch" msgstr "cualquier subm贸dulo clonado usar谩 su branch de rastreo remoto" -#: builtin/clone.c:284 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" +"inicializar archivo sparse-checkout para incluir solo archivos en la ra铆z" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11103,42 +11637,42 @@ msgstr "" "No se pudo adivinar ning煤n nombre de directorio.\n" "Por favor especifique un directorio en la l铆nea de comando" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No se pudo agregar un alterno para '%s': %s\n" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:427 +#: builtin/clone.c:430 #, c-format msgid "failed to start iterator over '%s'" msgstr "fall贸 al iniciar el iterador sobre '%s'" -#: builtin/clone.c:457 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "fall贸 al crear link '%s'" -#: builtin/clone.c:461 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "fall贸 al copiar archivo a '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:469 #, c-format msgid "failed to iterate over '%s'" msgstr "fall贸 al iterar sobre '%s'" -#: builtin/clone.c:491 +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:505 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11148,96 +11682,100 @@ msgstr "" "Puedes inspeccionar a qu茅 se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:582 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No se pudo encontrar la rama remota %s para clonar." -#: builtin/clone.c:701 +#: builtin/clone.c:704 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:751 +#: builtin/clone.c:752 +msgid "failed to initialize sparse-checkout" +msgstr "fall贸 al inicializar sparse-checkout" + +#: builtin/clone.c:775 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:782 +#: builtin/clone.c:806 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el 谩rbol de trabajo" -#: builtin/clone.c:832 +#: builtin/clone.c:856 msgid "unable to write parameters to config file" msgstr "no es posible escribir par谩metros al archivo config" -#: builtin/clone.c:895 +#: builtin/clone.c:919 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:897 +#: builtin/clone.c:921 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:959 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:941 +#: builtin/clone.c:963 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:954 +#: builtin/clone.c:976 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:957 +#: builtin/clone.c:979 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:970 +#: builtin/clone.c:992 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:998 builtin/fetch.c:1787 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:986 +#: builtin/clone.c:1008 #, 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:996 +#: builtin/clone.c:1018 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:1016 +#: builtin/clone.c:1038 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un 谩rbol de trabajo '%s'" -#: builtin/clone.c:1036 +#: builtin/clone.c:1058 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vac铆o '%s'...\n" -#: builtin/clone.c:1038 +#: builtin/clone.c:1060 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1062 +#: builtin/clone.c:1084 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11245,36 +11783,36 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1123 +#: builtin/clone.c:1148 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:1125 +#: builtin/clone.c:1150 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:1127 +#: builtin/clone.c:1152 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1129 +#: builtin/clone.c:1154 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:1132 +#: builtin/clone.c:1157 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1137 +#: builtin/clone.c:1162 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1237 builtin/clone.c:1245 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1223 +#: builtin/clone.c:1248 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -11323,7 +11861,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "padre duplicado %s ignorado" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto v谩lido %s" @@ -11351,13 +11889,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: 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/tag.c:412 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1496 msgid "commit message" msgstr "mensaje del commit" @@ -11365,7 +11903,7 @@ msgstr "mensaje del commit" msgid "read commit log message from file" msgstr "leer mensaje de commit desde un archivo" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 #: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -11441,57 +11979,65 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "fall贸 al desempaquetar objeto del 谩rbol HEAD" -#: builtin/commit.c:356 +#: builtin/commit.c:351 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "--pathspec-from-file con -a no tiene sentido" + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "No hay rutas con --include/--only no tiene sentido." + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "no es posible crear un 铆ndice temporal" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "adici贸n interactiva fallida" -#: builtin/commit.c:376 +#: builtin/commit.c:396 msgid "unable to update temporary index" msgstr "no es posible actualizar el 铆ndice temporal" -#: builtin/commit.c:378 +#: builtin/commit.c:398 msgid "Failed to update main cache tree" msgstr "Fall贸 al actualizar el cache principal del 谩rbol" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:475 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusi贸n." -#: builtin/commit.c:457 +#: builtin/commit.c:477 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:465 +#: builtin/commit.c:485 msgid "cannot read the index" msgstr "no se puede leer el 铆ndice" -#: builtin/commit.c:484 +#: builtin/commit.c:504 msgid "unable to write temporary index file" msgstr "no es posible escribir el 铆ndice temporal" -#: builtin/commit.c:582 +#: builtin/commit.c:602 #, c-format msgid "commit '%s' lacks author header" msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:584 +#: builtin/commit.c:604 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una l铆nea de autor mal formada" -#: builtin/commit.c:603 +#: builtin/commit.c:623 msgid "malformed --author parameter" msgstr "par谩metro --author mal formado" -#: builtin/commit.c:656 +#: builtin/commit.c:676 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11499,38 +12045,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:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:726 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:708 +#: builtin/commit.c:728 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:712 +#: builtin/commit.c:732 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:763 builtin/commit.c:779 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:770 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:830 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:829 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -11545,7 +12091,7 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -11560,7 +12106,7 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11570,7 +12116,7 @@ msgstr "" " l铆neas que comiencen con '%c' ser谩n ignoradas, y un mensaje\n" " vac铆o aborta el commit.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:875 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11582,147 +12128,143 @@ msgstr "" " usted mismo si lo desea.\n" "Un mensaje vac铆o aborta el commit.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:892 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:900 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:907 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:925 msgid "Cannot read index" msgstr "No se puede leer el 铆ndice" -#: builtin/commit.c:972 +#: builtin/commit.c:992 msgid "Error building trees" msgstr "Error al construir los 谩rboles" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1006 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:1030 +#: builtin/commit.c:1050 #, 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:1044 +#: builtin/commit.c:1064 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inv谩lido '%s'" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inv谩lido de los archivos no rastreados '%s'" -#: builtin/commit.c:1102 +#: builtin/commit.c:1122 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1146 +#: builtin/commit.c:1166 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1155 +#: builtin/commit.c:1175 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1158 +#: builtin/commit.c:1178 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:1160 +#: builtin/commit.c:1180 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:1163 +#: builtin/commit.c:1183 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1173 +#: builtin/commit.c:1193 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:1175 +#: builtin/commit.c:1195 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:1183 +#: builtin/commit.c:1203 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:1200 +#: builtin/commit.c:1220 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:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "No hay rutas con --include/--only no tiene sentido." - -#: builtin/commit.c:1208 +#: builtin/commit.c:1226 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1357 builtin/commit.c:1519 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1359 builtin/commit.c:1521 msgid "show branch information" msgstr "mostrar informaci贸n de la rama" -#: builtin/commit.c:1343 +#: builtin/commit.c:1361 msgid "show stash information" msgstr "mostrar informaci贸n del stash" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1363 builtin/commit.c:1523 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atr谩s" -#: builtin/commit.c:1347 +#: builtin/commit.c:1365 msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 #: builtin/worktree.c:650 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1527 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1371 builtin/commit.c:1530 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1374 builtin/commit.c:1533 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:1360 +#: builtin/commit.c:1378 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11730,11 +12272,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1380 parse-options.h:192 msgid "when" msgstr "cuando" -#: builtin/commit.c:1363 +#: builtin/commit.c:1381 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11742,173 +12284,173 @@ msgstr "" "ignorar cambios en subm贸dulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1383 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1366 +#: builtin/commit.c:1384 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1368 +#: builtin/commit.c:1386 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de 铆ndice" -#: builtin/commit.c:1388 +#: builtin/commit.c:1406 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:1493 +#: builtin/commit.c:1489 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1494 +#: builtin/commit.c:1490 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1496 +#: builtin/commit.c:1492 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "author" msgstr "autor" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1495 builtin/gc.c:538 msgid "date" msgstr "fecha" -#: builtin/commit.c:1499 +#: builtin/commit.c:1495 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 +#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1501 +#: builtin/commit.c:1497 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1502 +#: builtin/commit.c:1498 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1503 +#: builtin/commit.c:1499 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash聽para arreglar el commit especificado" -#: builtin/commit.c:1504 +#: builtin/commit.c:1500 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:1505 +#: builtin/commit.c:1501 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:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 #: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1507 +#: builtin/commit.c:1503 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1508 +#: builtin/commit.c:1504 msgid "force edit of commit" msgstr "forzar la edici贸n del commit" -#: builtin/commit.c:1510 +#: builtin/commit.c:1506 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1515 +#: builtin/commit.c:1511 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1512 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1517 +#: builtin/commit.c:1513 msgid "add specified files to index for commit" msgstr "agregar archivos espec铆ficos al 铆ndice para confirmar" -#: builtin/commit.c:1518 +#: builtin/commit.c:1514 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1519 +#: builtin/commit.c:1515 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1520 +#: builtin/commit.c:1516 msgid "commit only specified files" msgstr "s贸lo confirmar archivos espec铆ficos" -#: builtin/commit.c:1521 +#: builtin/commit.c:1517 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1522 +#: builtin/commit.c:1518 msgid "show what would be committed" msgstr "mostrar lo que ser铆a incluido en el commit" -#: builtin/commit.c:1535 +#: builtin/commit.c:1531 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1536 +#: builtin/commit.c:1532 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vac铆o" -#: builtin/commit.c:1543 +#: builtin/commit.c:1541 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vac铆o" -#: builtin/commit.c:1616 +#: builtin/commit.c:1614 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1623 +#: builtin/commit.c:1621 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1640 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1647 #, 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:1654 +#: builtin/commit.c:1652 #, 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:1688 +#: builtin/commit.c:1686 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -11918,21 +12460,13 @@ msgstr "" "new_index. Verifique que el disco no este lleno y la quota no ha\n" "sido superada, y luego \"git restore --sateged :/\" para recuperar." -#: builtin/commit-graph.c:11 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "git commit-graph [--object-dir <objdir>]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "git commit-graph read [--object-dir <objdir>]" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" @@ -11941,55 +12475,54 @@ msgstr "" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de " "split>" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 +#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 -#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "El directorio de objetos para guardar el gr谩fico" -#: builtin/commit-graph.c:58 +#: builtin/commit-graph.c:51 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:80 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:73 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:173 +#: builtin/commit-graph.c:106 msgid "start walk at all refs" msgstr "comenzar caminata en todas las refs" -#: builtin/commit-graph.c:175 +#: builtin/commit-graph.c:108 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de 铆ndices por stdin por commits" -#: builtin/commit-graph.c:177 +#: builtin/commit-graph.c:110 msgid "start walk at commits listed by stdin" msgstr "comenzar a caminar a los commits listados por stdin" -#: builtin/commit-graph.c:179 +#: builtin/commit-graph.c:112 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:182 +#: builtin/commit-graph.c:115 msgid "allow writing an incremental commit-graph file" msgstr "permitir escribir un archivo commit-graph incremental" -#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 +#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 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:186 +#: builtin/commit-graph.c:119 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:204 +#: builtin/commit-graph.c:137 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" @@ -12443,7 +12976,7 @@ msgstr "solo considerar tags que concuerden con <patr贸n>" msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patr贸n>" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:553 builtin/name-rev.c:473 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" @@ -12702,7 +13235,7 @@ msgstr "Use el feature done para terminar el stream" msgid "Skip output of blob data" msgstr "Saltar el output de data blob" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "refspec" @@ -12747,89 +13280,89 @@ msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel no puede ser negativo" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:140 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:248 msgid "set upstream for git pull/fetch" msgstr "configurar upstream para git pulll/fetch" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:144 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:145 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "forzar sobrescritura de referencia local" -#: builtin/fetch.c:147 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "extraer de m煤ltiples remotos" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:153 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "n煤mero de subm贸dulos extra铆dos en paralelo" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "limpiar ramas remotas rastreadas que ya no est谩n en el remoto" -#: builtin/fetch.c:157 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "limpiar tags locales que no se encuentran en el remoto y eliminar tags " "cambiados" -#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:159 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "controlar extracci贸n recursiva de subm贸dulos" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:165 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:179 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del subm贸dulo" -#: builtin/fetch.c:182 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12837,90 +13370,94 @@ msgstr "" "default para extracci贸n recursiva de subm贸dulos (menor prioridad que " "archivos de configuraci贸n)" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:236 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "especificar extracci贸n de refmap" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "reporta que solo tenemos objetos alcanzables de este objeto" -#: builtin/fetch.c:198 +#: builtin/fetch.c:199 msgid "run 'gc --auto' after fetching" msgstr "ejecutar 'gc --auto' tras el fetch" -#: builtin/fetch.c:200 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "verificar updates forzados en todos los branch actualizados" -#: builtin/fetch.c:510 +#: builtin/fetch.c:203 +msgid "write the commit-graph after fetching" +msgstr "escribir commit-graph luego del fetch" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:650 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuraci贸n fetch.output contiene el valor inv谩lido %s" -#: builtin/fetch.c:748 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:752 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:776 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[actualizaci贸n de tag]" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:781 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "podr铆a golpear tag existente" -#: builtin/fetch.c:803 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:806 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:848 +#: builtin/fetch.c:851 msgid "forced update" msgstr "actualizaci贸n forzada" -#: builtin/fetch.c:853 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:874 +#: builtin/fetch.c:877 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -12931,7 +13468,7 @@ msgstr "" "show-forced-updates'\n" "o ejecute 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:878 +#: builtin/fetch.c:881 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12944,22 +13481,22 @@ msgstr "" "false'\n" "para evitar esta validaci贸n.\n" -#: builtin/fetch.c:908 +#: builtin/fetch.c:911 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envi贸 todos los objetos necesarios\n" -#: builtin/fetch.c:929 +#: builtin/fetch.c:932 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque ra铆ces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1017 builtin/fetch.c:1155 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1028 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12968,56 +13505,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:1127 +#: builtin/fetch.c:1125 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondr谩 colgado)" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1126 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1158 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1159 builtin/remote.c:1035 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1182 #, 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:1203 +#: builtin/fetch.c:1201 #, 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:1206 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opci贸n \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1414 -msgid "multiple branch detected, incompatible with --set-upstream" +#: builtin/fetch.c:1412 +msgid "multiple branches detected, incompatible with --set-upstream" msgstr "m煤ltiples ramas detectadas, incompatible con --set-upstream" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1427 msgid "not setting upstream for a remote remote-tracking branch" msgstr "no configurar upstream para una rama de rastreo remoto" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1429 msgid "not setting upstream for a remote tag" msgstr "no configurar upstream para un tag remoto" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1431 msgid "unknown branch type" msgstr "tipo de branch desconocido" -#: builtin/fetch.c:1435 +#: builtin/fetch.c:1433 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -13025,22 +13562,22 @@ msgstr "" "no se encontr贸 rama fuente.\n" "tienes que especificar exactamente una rama con la opci贸n --set-upstream." -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1559 builtin/fetch.c:1622 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1583 +#: builtin/fetch.c:1581 #, 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:1685 +#: builtin/fetch.c:1684 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13048,44 +13585,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:1722 +#: builtin/fetch.c:1721 msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1771 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1773 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1778 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1780 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1796 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1798 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1807 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1814 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:1835 +#: builtin/fetch.c:1832 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13099,23 +13636,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:674 msgid "populate log with at most <n> entries from shortlog" msgstr "poblar el log con m谩ximo <n> entradas del shorlog" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:677 msgid "alias for --log (deprecated)" msgstr "alias para --log (deprecado)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:680 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:681 msgid "use <text> as start of message" msgstr "use <text> como comienzo de mensaje" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:682 msgid "file to read from" msgstr "archivo del cual leer" @@ -13179,32 +13716,32 @@ msgstr "mostrar solo refs que contienen el commit" msgid "print only refs which don't contain the commit" msgstr "mostrar solo refs que no contienen el commit" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 msgid "unknown" msgstr "desconocido" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:100 builtin/fsck.c:120 #, c-format msgid "error in %s %s: %s" msgstr "error en %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:114 #, c-format msgid "warning in %s %s: %s" msgstr "peligro en %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:143 builtin/fsck.c:146 #, c-format msgid "broken link from %7s %s" msgstr "link roto de %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:155 msgid "wrong object type in link" msgstr "tipo de objeto equivocado en link" -#: builtin/fsck.c:184 +#: builtin/fsck.c:171 #, c-format msgid "" "broken link from %7s %s\n" @@ -13213,211 +13750,211 @@ msgstr "" "link roto de %7s %s\n" " a %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:282 #, c-format msgid "missing %s %s" msgstr "faltan %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:309 #, c-format msgid "unreachable %s %s" msgstr "inalcanzable %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:329 #, c-format msgid "dangling %s %s" msgstr "actualizando %s %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:339 msgid "could not create lost-found" msgstr "no se pudo crear lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:350 #, c-format msgid "could not finish '%s'" msgstr "no se pudo finalizar '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:367 #, c-format msgid "Checking %s" msgstr "Revisando %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:405 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Verificando conectividad (%d objetos)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:424 #, c-format msgid "Checking %s %s" msgstr "Revisando %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:429 msgid "broken links" msgstr "links rotos" -#: builtin/fsck.c:447 +#: builtin/fsck.c:438 #, c-format msgid "root %s" msgstr "ra铆z %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:446 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "tag %s %s (%s) en %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:475 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecto corrupto o faltante" -#: builtin/fsck.c:509 +#: builtin/fsck.c:500 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: referencia inv谩lida %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:514 #, c-format msgid "Checking reflog %s->%s" msgstr "Revisando reflog %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:548 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntero sha1 inv谩lido %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:555 #, c-format msgid "%s: not a commit" msgstr "%s: no es un commit" -#: builtin/fsck.c:619 +#: builtin/fsck.c:609 msgid "notice: No default references" msgstr "aviso: No hay referencias por defecto" -#: builtin/fsck.c:634 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objeto corrupto o no encontrado: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:637 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no se puede analizar objeto: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:657 #, c-format msgid "bad sha1 file: %s" msgstr "mal sha1 de archivo: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:672 msgid "Checking object directory" msgstr "Revisando directorio de objetos" -#: builtin/fsck.c:685 +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:700 +#: builtin/fsck.c:690 #, c-format msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s inv谩lido" -#: builtin/fsck.c:712 +#: builtin/fsck.c:702 #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a algo extra帽o (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:708 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD desacoplado apunta a nada" -#: builtin/fsck.c:722 +#: builtin/fsck.c:712 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "aviso: %s apunta a un branch no nacido (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:724 msgid "Checking cache tree" msgstr "Revisando el cache tree" -#: builtin/fsck.c:739 +#: builtin/fsck.c:729 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntero inv谩lido sha1 en cache-tree" -#: builtin/fsck.c:750 +#: builtin/fsck.c:738 msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" -#: builtin/fsck.c:781 +#: builtin/fsck.c:769 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "mostrar objetos ilegibles" -#: builtin/fsck.c:788 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "mostrar objetos colgados" -#: builtin/fsck.c:789 +#: builtin/fsck.c:777 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:790 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "reportar nodos ra铆z" -#: builtin/fsck.c:791 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "hacer objetos 铆ndices cabezas de nodos" -#: builtin/fsck.c:792 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "tambi茅n considerar paquetes y objetos alternos" -#: builtin/fsck.c:794 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:795 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "habilitar revisi贸n m谩s estricta" -#: builtin/fsck.c:797 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgados en .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:799 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/fsck.c:887 +#: builtin/fsck.c:874 #, c-format msgid "%s: object missing" msgstr "%s: objeto faltante" -#: builtin/fsck.c:899 +#: builtin/fsck.c:885 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "par谩metro inv谩lido: sha1 esperado, se obtuvo '%s'" @@ -13986,7 +14523,7 @@ msgstr "se usaron m谩s bytes de los disponibles" msgid "pack too large for current definition of off_t" msgstr "paquete muy grande para la definici贸n actual de off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el m谩ximo tama帽o permitido" @@ -14226,7 +14763,7 @@ msgstr "--stdin requiere un repositorio git" 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:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" @@ -14410,121 +14947,126 @@ msgstr "--trailer con --only-input no tiene sentido" msgid "no input file given for in-place editing" msgstr "no se entreg贸 archivo de entrada para edici贸n en lugar" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opciones>] [<rango-de-revisi贸n>] [[--] <ruta>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "opci贸n --decorate inv谩lida: %s" -#: builtin/log.c:173 +#: builtin/log.c:174 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:174 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "Usar archivo de mapa de mail" -#: builtin/log.c:176 +#: builtin/log.c:177 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patr贸n>" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patr贸n>" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "Procesar rango de l铆neas n,m en archivo, contando desde 1" -#: builtin/log.c:280 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:549 builtin/log.c:644 +#: builtin/log.c:550 builtin/log.c:645 #, c-format msgid "could not read object %s" msgstr "no se pudo leer objeto %s" -#: builtin/log.c:669 +#: builtin/log.c:670 #, c-format msgid "unknown type: %d" msgstr "tipo desconocido: %d" -#: builtin/log.c:792 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: modo cover from description inv谩lido" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:909 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:925 +#: builtin/log.c:952 #, c-format msgid "cannot open patch file %s" msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:942 +#: builtin/log.c:969 msgid "need exactly one range" msgstr "necesita exactamente un rango" -#: builtin/log.c:952 +#: builtin/log.c:979 msgid "not a range" msgstr "no es un rango" -#: builtin/log.c:1075 +#: builtin/log.c:1143 msgid "cover letter needs email format" msgstr "letras de portada necesita formato email" -#: builtin/log.c:1081 +#: builtin/log.c:1149 msgid "failed to create cover-letter file" msgstr "fall贸 al crear los archivos cover-letter" -#: builtin/log.c:1160 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1187 +#: builtin/log.c:1255 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1245 +#: builtin/log.c:1313 msgid "two output directories?" msgstr "驴dos directorios de salida?" -#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format msgid "unknown commit %s" msgstr "commit desconocido %s" -#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "fall贸 al resolver '%s' como ref v谩lida" -#: builtin/log.c:1371 +#: builtin/log.c:1439 msgid "could not find exact merge base" msgstr "no se pudo encontrar una base de fusi贸n exacta" -#: builtin/log.c:1375 +#: builtin/log.c:1443 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -14536,271 +15078,281 @@ msgstr "" "O puedes especificar un commit base mediante --base=<id-commit-base> " "manualmente" -#: builtin/log.c:1395 +#: builtin/log.c:1463 msgid "failed to find exact merge base" msgstr "fall贸 al encontrar una base de fusi贸n exacta" -#: builtin/log.c:1406 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisi贸n" -#: builtin/log.c:1410 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisi贸n" -#: builtin/log.c:1463 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1515 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "fall贸 al inferir rangos range-diff" -#: builtin/log.c:1560 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un 煤nico parche" -#: builtin/log.c:1563 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con m煤ltiples parches" -#: builtin/log.c:1567 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1569 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1571 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "" "usar una secuencia simple de n煤meros para salida de nombres de archivos" -#: builtin/log.c:1572 +#: builtin/log.c:1641 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1573 +#: builtin/log.c:1642 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1575 +#: builtin/log.c:1644 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1577 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1579 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1582 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "modo-cover-from-description" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" +"genera partes de una carta de presentaci贸n basado en la descripci贸n de la " +"rama" + +#: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1585 +#: builtin/log.c:1657 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1588 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1591 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1593 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1595 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1597 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1599 +#: builtin/log.c:1671 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1600 +#: builtin/log.c:1672 msgid "header" msgstr "cabezal" -#: builtin/log.c:1601 +#: builtin/log.c:1673 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "email" -#: builtin/log.c:1602 +#: builtin/log.c:1674 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1604 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1606 +#: builtin/log.c:1678 msgid "ident" msgstr "ident" -#: builtin/log.c:1607 +#: builtin/log.c:1679 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "configurar direcci贸n From a <ident> ( o identidad de committer si est谩 " "ausente)" -#: builtin/log.c:1609 +#: builtin/log.c:1681 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1610 +#: builtin/log.c:1682 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "l铆mite" -#: builtin/log.c:1612 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1615 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "poner el parche en l铆nea" -#: builtin/log.c:1619 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1621 +#: builtin/log.c:1693 msgid "signature" msgstr "firma" -#: builtin/log.c:1622 +#: builtin/log.c:1694 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1623 +#: builtin/log.c:1695 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1624 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar informaci贸n de 谩rbol de requisitos previos a la serie de parches" -#: builtin/log.c:1626 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1627 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1629 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1631 +#: builtin/log.c:1703 msgid "show changes against <rev> in cover letter or single patch" msgstr "muestra cambios contra <rev> en cover letter o en un solo parche" -#: builtin/log.c:1634 +#: builtin/log.c:1706 msgid "show changes against <refspec> in cover letter or single patch" msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche" -#: builtin/log.c:1636 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creaci贸n es pesada" -#: builtin/log.c:1711 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "l铆nea de identificaci贸n inv谩lida: %s" -#: builtin/log.c:1726 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1728 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1736 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1738 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1740 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1773 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "驴salida standard, o directorio, cual?" -#: builtin/log.c:1877 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche 煤nico" -#: builtin/log.c:1881 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1882 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:1888 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:1892 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche 煤nico" -#: builtin/log.c:1900 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1901 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:1912 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:1948 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:1992 +#: builtin/log.c:2073 msgid "failed to create output files" msgstr "fall贸 al crear los archivos de salida" -#: builtin/log.c:2051 +#: builtin/log.c:2132 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<l铆mite>]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14930,7 +15482,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:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 msgid "exec" msgstr "ejecutar" @@ -15083,7 +15635,7 @@ 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:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" @@ -15523,17 +16075,17 @@ msgstr "permitir la creaci贸n de m谩s de un 谩rbol" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<tama帽o>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<tama帽o>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15541,15 +16093,15 @@ msgstr "" "durante el repack, recolectar los pack-files de tama帽o menor en un batch que " "es m谩s grande que este tama帽o" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "muchos argumentos" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "opci贸n --batch-size es solo para el subcomando 'repack'" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "subcomando desconocido: %s" @@ -15643,52 +16195,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:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' fall贸" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:403 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opciones>] <commit>..." -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:404 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opciones>] --all" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:405 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:462 msgid "print only names (no SHA-1)" msgstr "imprimir s贸lo nombres (sin SHA-1)" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:463 msgid "only use tags to name the commits" msgstr "s贸lo usar tags para nombrar commits" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:465 msgid "only use refs matching <pattern>" msgstr "solo usar refs que concuerden con <patr贸n>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:467 msgid "ignore refs matching <pattern>" msgstr "ignorar refs que concuerden con <patr贸n>" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:469 msgid "list all commits reachable from all refs" msgstr "listar todos los commits alcanzables desde todas las referencias" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:470 msgid "read from stdin" msgstr "leer desde stdin" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:471 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nombres `undefined` (predeterminado)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:477 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags en la entrada (uso interno)" @@ -16171,7 +16723,7 @@ msgstr "" msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "fall贸 al iniciar %s" @@ -16304,22 +16856,6 @@ msgstr "versi贸n de 铆ndice no soportada %s" msgid "bad index version '%s'" msgstr "mala versi贸n del 铆ndice '%s'" -#: builtin/pack-objects.c:3228 -msgid "do not show progress meter" -msgstr "no mostrar medidor de progreso" - -#: builtin/pack-objects.c:3230 -msgid "show progress meter" -msgstr "mostrar medidor de progreso" - -#: builtin/pack-objects.c:3232 -msgid "show progress meter during object writing phase" -msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" - -#: builtin/pack-objects.c:3235 -msgid "similar to --all-progress when progress meter is shown" -msgstr "similar a --all-progress cuando medidor de progreso es mostrado" - #: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<versi贸n>[,<offset>]" @@ -16569,7 +17105,7 @@ msgstr "Opciones relacionadas a fusi贸n" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusi贸n" -#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" @@ -16626,7 +17162,7 @@ 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:1347 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." @@ -16643,7 +17179,7 @@ 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:1353 git-parse-remote.sh:64 +#: builtin/rebase.c:1381 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" @@ -16652,7 +17188,7 @@ msgstr "<remoto>" msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1373 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." @@ -16743,15 +17279,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "taquigraf铆a de tag sin <tag>" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:167 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16760,7 +17296,7 @@ msgstr "" "Para elegir si la opci贸n es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:170 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16785,7 +17321,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16800,7 +17336,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:199 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16814,12 +17350,12 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:208 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "La rama actual %s tiene m煤ltiples ramas upstream, rechazando el push." -#: builtin/push.c:210 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16830,13 +17366,13 @@ msgstr "" "la rama actual '%s', sin decirme qu茅 poner en el push\n" "para actualizar en qu茅 rama de remoto." -#: builtin/push.c:269 +#: builtin/push.c:270 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No se especific贸 ning煤n refspecs para hacer push, y push.default es \"nada\"." -#: builtin/push.c:276 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16848,7 +17384,7 @@ msgstr "" "'git pull ...') antes de hacer push de nuevo.\n" "Mira 'Note about fast-forwards' en 'git push --help' para m谩s detalles." -#: builtin/push.c:282 +#: builtin/push.c:283 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -16861,7 +17397,7 @@ msgstr "" "(ejem. 'git pull ...') antes de volver a hacer push.\n" "Vea las 'Notes about fast-forwards' en 'git push --help' para m谩s detalles." -#: builtin/push.c:288 +#: builtin/push.c:289 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -16875,12 +17411,12 @@ msgstr "" "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." -#: builtin/push.c:295 +#: builtin/push.c:296 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." -#: builtin/push.c:298 +#: builtin/push.c:299 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -16890,99 +17426,99 @@ msgstr "" "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" "sin usar la opci贸n '--force'.\n" -#: builtin/push.c:359 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:366 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "fall贸 el push de algunas referencias a '%s'" -#: builtin/push.c:541 +#: builtin/push.c:542 msgid "repository" msgstr "repositorio" -#: builtin/push.c:542 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:545 +#: builtin/push.c:546 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:546 +#: builtin/push.c:547 msgid "push tags (can't be used with --all or --mirror)" msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" -#: builtin/push.c:549 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:551 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:552 builtin/send-pack.c:182 +#: builtin/push.c:553 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:555 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de subm贸dulos" -#: builtin/push.c:557 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:560 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:563 +#: builtin/push.c:564 msgid "prune locally removed refs" msgstr "recortando refs eliminadas localmente" -#: builtin/push.c:565 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:566 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:569 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:571 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "solicitar transacci贸n at贸mica en el lado remoto" -#: builtin/push.c:589 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:591 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:611 +#: builtin/push.c:612 #, c-format msgid "bad repository '%s'" msgstr "mal repositorio '%s'" -#: builtin/push.c:612 +#: builtin/push.c:613 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -17004,27 +17540,27 @@ msgstr "" "\n" " git push <nombre>\n" -#: builtin/push.c:627 +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:629 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:633 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:635 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:638 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:642 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de l铆nea nueva" @@ -17042,24 +17578,32 @@ msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Porcentaje por el cual la creaci贸n es pesada" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "usar colores simples de diff" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "notas" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "pasado a 'git log'" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "no .. en rango: '%s'" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "argumento 煤nico de formato debe ser un rango sim茅trico" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "se necesitan dos rangos de commits" @@ -17142,6 +17686,10 @@ msgstr "debug de 谩rboles-desempacados" msgid "suppress feedback messages" msgstr "suprimir mensajes de feedback" +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "Necesitas resolver tu 铆ndice actual primero" + #: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " @@ -17160,216 +17708,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilizable: '%s'" -#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#: 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:252 +#: builtin/rebase.c:271 msgid "no HEAD?" msgstr "驴Sin HEAD?" -#: builtin/rebase.c:279 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "no se pudo crear archivo temporal %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "no se pudo marcar como interactivo" -#: builtin/rebase.c:343 +#: builtin/rebase.c:362 msgid "could not generate todo list" msgstr "no se pudo generar lista de pendientes" -#: builtin/rebase.c:383 +#: builtin/rebase.c:402 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:438 +#: builtin/rebase.c:457 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opciones>]" -#: builtin/rebase.c:450 +#: builtin/rebase.c:469 msgid "keep empty commits" msgstr "mantener commits vac铆os" -#: builtin/rebase.c:452 builtin/revert.c:128 +#: builtin/rebase.c:471 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits con mensajes vac铆os" -#: builtin/rebase.c:453 +#: builtin/rebase.c:472 msgid "rebase merge commits" msgstr "rebasando commits de fusi贸n" -#: builtin/rebase.c:455 +#: builtin/rebase.c:474 msgid "keep original branch points of cousins" msgstr "mantener puntos originales de la rama de sus primos" -#: builtin/rebase.c:457 +#: builtin/rebase.c:476 msgid "move commits that begin with squash!/fixup!" msgstr "mover commits que comienzan con squash!/fixup!" -#: builtin/rebase.c:458 +#: builtin/rebase.c:477 msgid "sign commits" msgstr "firmar commits" -#: builtin/rebase.c:460 builtin/rebase.c:1427 +#: builtin/rebase.c:479 builtin/rebase.c:1455 msgid "display a diffstat of what changed upstream" msgstr "mostrar un diffstat de lo que cambi贸 en upstream" -#: builtin/rebase.c:462 +#: builtin/rebase.c:481 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:464 +#: builtin/rebase.c:483 msgid "skip commit" msgstr "saltar commit" -#: builtin/rebase.c:465 +#: builtin/rebase.c:484 msgid "edit the todo list" msgstr "editar la lista de pendientes" -#: builtin/rebase.c:467 +#: builtin/rebase.c:486 msgid "show the current patch" msgstr "mostrar el parche actual" -#: builtin/rebase.c:470 +#: builtin/rebase.c:489 msgid "shorten commit ids in the todo list" msgstr "ids de commits cortos en la lista de pendientes" -#: builtin/rebase.c:472 +#: builtin/rebase.c:491 msgid "expand commit ids in the todo list" msgstr "expandir ids de commits en la lista de pendientes" -#: builtin/rebase.c:474 +#: builtin/rebase.c:493 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase.c:476 +#: builtin/rebase.c:495 msgid "rearrange fixup/squash lines" msgstr "reorganizar l铆neas fixup/squash" -#: builtin/rebase.c:478 +#: builtin/rebase.c:497 msgid "insert exec commands in todo list" msgstr "insertar comando exec en la lista de pendientes" -#: builtin/rebase.c:479 +#: builtin/rebase.c:498 msgid "onto" msgstr "hacia" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict revision" msgstr "restringir revision" -#: builtin/rebase.c:484 +#: builtin/rebase.c:503 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:485 +#: builtin/rebase.c:504 msgid "squash onto" msgstr "squash hacia" -#: builtin/rebase.c:487 +#: builtin/rebase.c:506 msgid "the upstream commit" msgstr "el commit de upstream" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head name" msgstr "nombre de head" -#: builtin/rebase.c:494 +#: builtin/rebase.c:513 msgid "rebase strategy" msgstr "estrategia de rebase" -#: builtin/rebase.c:495 +#: builtin/rebase.c:514 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:496 +#: builtin/rebase.c:515 msgid "strategy options" msgstr "opciones de estrategia" -#: builtin/rebase.c:497 +#: builtin/rebase.c:516 msgid "switch-to" msgstr "cambiar a" -#: builtin/rebase.c:498 +#: builtin/rebase.c:517 msgid "the branch or commit to checkout" msgstr "la rama o commit para hacer checkout" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto-name" msgstr "hacia-nombre" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto name" msgstr "hacia nombre" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "the command to run" msgstr "el comando para ejecutar" -#: builtin/rebase.c:503 builtin/rebase.c:1510 +#: builtin/rebase.c:522 builtin/rebase.c:1540 msgid "automatically re-schedule any `exec` that fails" msgstr "reprogramar automaticamente cualquier `exec` que falle" -#: builtin/rebase.c:519 +#: builtin/rebase.c:540 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" -#: builtin/rebase.c:535 +#: builtin/rebase.c:556 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiere un rebase interactivo" -#: builtin/rebase.c:587 +#: builtin/rebase.c:608 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:602 +#: builtin/rebase.c:623 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head inv谩lido: '%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:648 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando inv谩lido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:703 +#: builtin/rebase.c:724 #, c-format msgid "Could not read '%s'" msgstr "No se pudo leer '%s'" -#: builtin/rebase.c:721 +#: builtin/rebase.c:742 #, c-format msgid "Cannot store %s" msgstr "No se puede guardar %s" -#: builtin/rebase.c:828 +#: builtin/rebase.c:849 msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisi贸n HEAD" -#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:972 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" @@ -17384,7 +17932,7 @@ msgstr "" "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:1032 +#: builtin/rebase.c:1060 #, c-format msgid "" "\n" @@ -17403,7 +17951,7 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1367 #, c-format msgid "" "%s\n" @@ -17420,7 +17968,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1383 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17433,131 +17981,143 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1413 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1417 msgid "empty exec command" msgstr "comando exec vac铆o" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1446 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:1420 +#: builtin/rebase.c:1448 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:1422 +#: builtin/rebase.c:1450 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1452 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1458 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambi贸 en upstream" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1461 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:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 -msgid "passed to 'git am'" -msgstr "pasado a 'git am'" +#: 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: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:1443 builtin/rebase.c:1445 +#: builtin/rebase.c:1470 builtin/rebase.c:1474 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:1447 builtin/rebase.c:1450 +#: builtin/rebase.c:1472 +msgid "ignore changes in whitespace" +msgstr "ignorar cambios en espacios en blanco" + +#: builtin/rebase.c:1476 builtin/rebase.c:1479 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1481 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1484 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1486 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:1460 +#: builtin/rebase.c:1489 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde est谩" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1490 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1464 +#: builtin/rebase.c:1493 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1467 +#: builtin/rebase.c:1496 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusi贸n para el rebase" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1500 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:1475 +#: builtin/rebase.c:1504 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1479 +#: builtin/rebase.c:1509 msgid "preserve empty commits during rebase" msgstr "preservar commits vac铆os durante el rebase" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1511 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1517 msgid "automatically stash/stash pop before and after" msgstr "ejecutar autom谩ticamente stash/stash pop antes y despu茅s" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1519 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:1493 +#: builtin/rebase.c:1523 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vac铆os" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1526 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1529 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1531 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1503 builtin/revert.c:115 +#: builtin/rebase.c:1533 builtin/revert.c:115 msgid "option" msgstr "opci贸n" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1534 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusi贸n" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1537 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:1524 +#: builtin/rebase.c:1554 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17565,38 +18125,38 @@ msgstr "" "el soporte para rebase.useBuiltin ha sido eliminado!\n" "Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1560 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:1571 +#: builtin/rebase.c:1601 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:1576 +#: builtin/rebase.c:1606 msgid "cannot combine '--keep-base' with '--onto'" msgstr "no se puede combinar '--keep-base' con '--onto'" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1608 msgid "cannot combine '--keep-base' with '--root'" msgstr "no se puede combinar '--keep-base' con '--root'" -#: builtin/rebase.c:1582 +#: builtin/rebase.c:1612 msgid "No rebase in progress?" msgstr "驴No hay rebase en progreso?" -#: builtin/rebase.c:1586 +#: builtin/rebase.c:1616 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:1609 +#: builtin/rebase.c:1639 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1621 +#: builtin/rebase.c:1651 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17604,16 +18164,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusi贸n y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1640 +#: builtin/rebase.c:1670 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del 谩rbol de trabajo" -#: builtin/rebase.c:1659 +#: builtin/rebase.c:1689 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1704 +#: builtin/rebase.c:1734 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17634,159 +18194,159 @@ msgstr "" "y ejec煤tame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ah铆.\n" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1757 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor num茅rico" -#: builtin/rebase.c:1766 +#: builtin/rebase.c:1798 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1788 +#: builtin/rebase.c:1820 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1860 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: builtin/rebase.c:1840 +#: 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:1859 +#: builtin/rebase.c:1891 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1863 +#: builtin/rebase.c:1895 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:1887 +#: builtin/rebase.c:1919 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inv谩lido '%s'" -#: builtin/rebase.c:1893 +#: builtin/rebase.c:1925 msgid "Could not create new root commit" msgstr "No se pudo crear commit ra铆z nuevo" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1951 #, 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:1922 +#: builtin/rebase.c:1954 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusi贸n" -#: builtin/rebase.c:1930 +#: builtin/rebase.c:1962 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit v谩lido '%s'" -#: builtin/rebase.c:1955 +#: builtin/rebase.c:1987 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1961 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2006 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisi贸n" -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2044 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: builtin/rebase.c:2015 +#: builtin/rebase.c:2047 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: builtin/rebase.c:2021 +#: builtin/rebase.c:2053 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: builtin/rebase.c:2024 +#: builtin/rebase.c:2056 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2059 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: builtin/rebase.c:2036 +#: builtin/rebase.c:2068 msgid "Please commit or stash them." msgstr "Por favor, conf铆rmalos o gu谩rdalos." -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2095 #, c-format msgid "could not parse '%s'" msgstr "no se puede analizar '%s'" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2108 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:2087 +#: builtin/rebase.c:2119 msgid "HEAD is up to date." msgstr "HEAD est谩 actualizado." -#: builtin/rebase.c:2089 +#: builtin/rebase.c:2121 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s est谩 actualizada.\n" -#: builtin/rebase.c:2097 +#: builtin/rebase.c:2129 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est谩 actualizado, rebase forzado." -#: builtin/rebase.c:2099 +#: builtin/rebase.c:2131 #, 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:2107 +#: builtin/rebase.c:2139 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechaz贸 el rebase." -#: builtin/rebase.c:2114 +#: builtin/rebase.c:2146 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2117 +#: builtin/rebase.c:2149 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2142 +#: builtin/rebase.c:2174 #, 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:2151 +#: builtin/rebase.c:2183 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2160 +#: builtin/rebase.c:2192 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance r谩pido de %s a %s.\n" @@ -18079,7 +18639,7 @@ msgstr "(concordando)" msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" @@ -18100,17 +18660,17 @@ msgstr "" "\t%s\n" "\tPor favor actualice la configuraci贸n manualmente si es necesario." -#: builtin/remote.c:702 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "borrando '%s' fall贸" -#: builtin/remote.c:736 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "creando '%s' fall贸" -#: builtin/remote.c:802 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18125,118 +18685,118 @@ msgstr[1] "" "eliminadas;\n" "para borrarlas, use:" -#: builtin/remote.c:816 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la secci贸n de configuraci贸n '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardar谩 en remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:919 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:922 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " viejo ( use 'git remote prune' para eliminar)" -#: builtin/remote.c:924 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "inv谩lido branch.%s.merge; no se puede rebasar en > 1 rama" -#: builtin/remote.c:974 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:976 +#: builtin/remote.c:975 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:979 +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:983 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:986 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:989 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1031 msgid "create" msgstr "crear" -#: builtin/remote.c:1035 +#: builtin/remote.c:1034 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1039 +#: builtin/remote.c:1038 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1042 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "puede realizar fast-forward" -#: builtin/remote.c:1045 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1052 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1157 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(sin URL)" @@ -18244,189 +18804,180 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Rama local configurada para 'git pull':" msgstr[1] " Ramas locales configuradas para 'git pull':" -#: builtin/remote.c:1215 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales ser谩n reflejadas por 'git push'" -#: builtin/remote.c:1221 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referencia local configurada para 'git push'%s:" msgstr[1] " Referencias locales configuradas para 'git push'%s:" -#: builtin/remote.c:1242 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1244 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "M煤ltiples ramas HEAD remotas. Por favor escoja una expl铆citamente con:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref v谩lido: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " 隆%s ser谩 colgado!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " 隆%s ha sido colgado!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [ejecutar谩 prune] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1453 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1461 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1478 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1480 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1508 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1534 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1536 +#: builtin/remote.c:1535 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1545 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1584 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patr贸n de URL viejo inv谩lido: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "No se encontr贸 URL: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "No borrar谩 todos los URLs de no-push" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "ser verboso; tiene que ser agregado antes de un subcomando" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Sub-comando desconocido: %s" - #: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<opciones>]" @@ -18443,111 +18994,111 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:230 builtin/repack.c:409 +#: builtin/repack.c:230 builtin/repack.c:416 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Esperando l铆neas de ID de objeto en full hex solo desde pack-objects." -#: builtin/repack.c:247 +#: builtin/repack.c:254 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no se puede finalizar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:285 +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "empaquetar todo en un 煤nico paquete" -#: builtin/repack.c:287 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y pierde objetos inaccesibles" -#: builtin/repack.c:290 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:292 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:294 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:296 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:299 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "escribir un 铆ndice de bitmap" -#: builtin/repack.c:303 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:304 +#: builtin/repack.c:311 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:305 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos m谩s antiguos que este" -#: builtin/repack.c:307 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:309 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "tama帽o de la ventana usado para la compresi贸n delta" -#: builtin/repack.c:310 builtin/repack.c:316 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:311 +#: builtin/repack.c:318 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "lo mismo que arriba, pero limita el tama帽o de memoria en lugar de contar " "entradas" -#: builtin/repack.c:313 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "limita la profundidad m谩xima del delta" -#: builtin/repack.c:315 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "limita el n煤mero m谩ximo de hilos" -#: builtin/repack.c:317 +#: builtin/repack.c:324 msgid "maximum size of each packfile" msgstr "tama帽o m谩ximo de cada paquete" -#: builtin/repack.c:319 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:321 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:331 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" -#: builtin/repack.c:335 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:418 +#: builtin/repack.c:425 msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#: builtin/repack.c:479 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18566,7 +19117,7 @@ msgstr "" "WARNING: tambi茅n fall贸.\n" "WARNING: Por favor renombralos en %s manualmente:\n" -#: builtin/repack.c:527 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "fall贸 al eliminar'%s'" @@ -18843,120 +19394,126 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<谩rbol-ismo>] [--] <rutas>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<谩rbol-ismo>] [--] <pathspec>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<谩rbol-ismo>] [--] [<rutas>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<谩rbol-ismo>]" -#: builtin/reset.c:40 +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "git reset --patch [<谩rbol-ismo>] [--] [<pathspec>...]" + +#: builtin/reset.c:41 msgid "mixed" msgstr "mezclado" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "suave" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "duro" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "fusionar" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "mantener" -#: builtin/reset.c:81 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "No hay un HEAD v谩lido." -#: builtin/reset.c:83 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "Fall贸 al encontrar el HEAD del 谩rbol." -#: builtin/reset.c:89 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "Fall贸 al encontrar 谩rbol de %s." -#: builtin/reset.c:114 +#: builtin/reset.c:115 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est谩 ahora en %s" -#: builtin/reset.c:193 +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "No se puede realziar un reset %s en medio de una fusi贸n." -#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" -#: builtin/reset.c:295 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "reiniciar HEAD e index" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "reiniciar solo HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "reiniciar HEAD, 铆ndice y 谩rbol de trabajo" -#: builtin/reset.c:302 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "reiniciar HEAD pero mantener cambios locales" -#: builtin/reset.c:308 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "" "grabar solo el hecho de que las rutas eliminadas ser谩n agregadas despu茅s" -#: builtin/reset.c:326 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Fall贸 al resolver '%s' como una revisi贸n v谩lida." -#: builtin/reset.c:334 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Fall贸 al resolver '%s' como un 谩rbol v谩lido." -#: builtin/reset.c:343 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch es incompatible con --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio." -#: builtin/reset.c:355 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "No se puede hacer un reset %s con rutas." -#: builtin/reset.c:370 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset no est谩 permitido en un repositorio vac铆o" -#: builtin/reset.c:374 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" msgstr "-N s贸lo puede ser usada con --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "Cambios fuera del 谩rea de stage tras el reset:" -#: builtin/reset.c:398 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -18970,12 +19527,12 @@ msgstr "" "usar '--quiet' para evitar esto. Configura la opci贸n reset.quiet a true\n" "para volverlo en el default.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "No se puede reiniciar el 铆ndice a la revisi贸n '%s'." -#: builtin/reset.c:412 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo 铆ndice." @@ -19437,6 +19994,57 @@ 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:61 +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 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "fall贸 al configurar opci贸n extensions.worktreeConfig" + +#: builtin/sparse-checkout.c:237 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:256 +msgid "initialize the sparse-checkout in cone mode" +msgstr "inicializa el sparse-checkout en modo cono" + +#: builtin/sparse-checkout.c:262 +msgid "initialize sparse-checkout" +msgstr "inicializar sparse-checkout" + +#: builtin/sparse-checkout.c:295 +#, 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:378 +msgid "read patterns from standard in" +msgstr "leer patrones de standard in" + +#: builtin/sparse-checkout.c:384 +msgid "set sparse-checkout patterns" +msgstr "configurar patrones de sparse-checkout" + +#: builtin/sparse-checkout.c:447 +msgid "disable sparse-checkout" +msgstr "deshabilitar sparse-checkout" + +#: builtin/sparse-checkout.c:459 +msgid "error while refreshing working directory" +msgstr "error al refrescar directorio de trabajo" + #: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<opciones>]" @@ -19501,7 +20109,7 @@ msgstr "'%s' no es un commit estilo stash" msgid "Too many revisions specified:%s" msgstr "Se especificaron demasiadas revisiones: %s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:161 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "No se encontraron entradas de stash." @@ -19540,51 +20148,51 @@ msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" msgid "Merging %s with %s" msgstr "Fusionando %s con %s" -#: builtin/stash.c:460 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "El 铆ndice no fue sacado de stash." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:521 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "intento de recrear el index" -#: builtin/stash.c:555 +#: builtin/stash.c:554 #, c-format msgid "Dropped %s (%s)" msgstr "Botado %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:557 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: No se pudo borrar entrada stash" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' no es una referencia stash" -#: builtin/stash.c:633 git-legacy-stash.sh:694 +#: builtin/stash.c:632 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "La entrada de stash se guard贸 en caso de ser necesario nuevamente." -#: builtin/stash.c:656 git-legacy-stash.sh:712 +#: builtin/stash.c:655 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "No se especific贸 el nombre de la rama" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:795 builtin/stash.c:832 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:824 +#: builtin/stash.c:823 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1046 git-legacy-stash.sh:217 +#: builtin/stash.c:1045 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "Sin cambios seleccionados" @@ -19600,16 +20208,16 @@ msgstr "No se puede guardar el estado actual del 铆ndice" 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:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1192 builtin/stash.c:1201 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:233 +#: builtin/stash.c:1229 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:337 +#: builtin/stash.c:1278 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" @@ -19617,15 +20225,15 @@ msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" msgid "Did you forget to 'git add'?" msgstr "驴Olvidaste 'git add'?" -#: builtin/stash.c:1309 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 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:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1331 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" @@ -19634,7 +20242,7 @@ msgstr "No se puede guardar el estado actual" 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:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del 谩rbol de trabajo" @@ -19680,40 +20288,40 @@ 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:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "subomdule--helper print-default-remote no toma argumentos" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontr贸 url para la ruta del subm贸dulo '%s' en .gitmodules" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Entrando '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19722,7 +20330,7 @@ msgstr "" "run_command devolvi贸 estado no-cero para %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19733,19 +20341,19 @@ msgstr "" "anidados de %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Suprime la salida al inicializar cada comando de subm贸dulo" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 msgid "Recurse into nested submodules" msgstr "Recursar en subm贸dulos anidados" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19754,57 +20362,57 @@ msgstr "" "no se pudo encontrar configuraci贸n '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Fall贸 al registrar el url para la ruta del subm贸dulo '%s'" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Subm贸dulo '%s' (%s) registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "peligro: modo de actualizaci贸n de comandos sugerido para el subm贸dulo '%s'\n" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Error al registrar el modo de actualizaci贸n para la ruta del subm贸dulo '%s'" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "Suprime la salida para inicializar un subm贸dulo" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 #, 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:824 +#: builtin/submodule--helper.c:827 #, 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:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "fall贸 al recursar en el subm贸dulo '%s'" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 msgid "Suppress submodule status output" msgstr "Suprimir output del estado del subm贸dulo" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:879 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -19812,47 +20420,47 @@ msgstr "" "Usar el commit guardado en el 铆ndice en lugar del guardado en el subm贸dulo " "HEAD" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:880 msgid "recurse into nested submodules" msgstr "recursar en subm贸dulos anidados" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:885 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:909 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:973 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del subm贸dulo para '%s'\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:979 #, 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:990 +#: builtin/submodule--helper.c:993 #, 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:1001 +#: builtin/submodule--helper.c:1004 #, 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:1048 +#: builtin/submodule--helper.c:1051 msgid "Suppress output of synchronizing submodule url" msgstr "Suprime la salida del url del subm贸dulo que se sincroniza" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1058 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1112 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19861,7 +20469,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:1121 +#: builtin/submodule--helper.c:1124 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -19870,81 +20478,99 @@ msgstr "" "El 谩rbol de trabajo del subm贸dulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1132 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1134 #, 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:1142 +#: builtin/submodule--helper.c:1145 #, 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:1158 +#: builtin/submodule--helper.c:1161 #, 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:1187 +#: builtin/submodule--helper.c:1190 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:1188 +#: builtin/submodule--helper.c:1191 msgid "Unregister all submodules" msgstr "Quitar todos los subm贸dulos" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1196 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1210 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:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1275 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" +"Una alternativa calculada a partir de la alternativa de un superproyecto no " +"es v谩lida.\n" +"Para permitir que Git clone sin una alternativa en ese caso, establezca\n" +"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clonar " +"con\n" +"'--reference-if-able' en lugar de '--reference'." + +#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "subm贸dulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1353 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1360 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1383 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo subm贸dulo ser谩 clonado" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1386 msgid "name of the new submodule" msgstr "nombre del nuevo subm贸dulo" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1389 msgid "url where to clone the submodule from" msgstr "url de d贸nde clonar el subm贸dulo" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1397 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 +msgid "disallow cloning into non-empty directory" +msgstr "no permitir clonar en directorios no vac铆os" + +#: builtin/submodule--helper.c:1407 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -19953,94 +20579,104 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " "<ruta>" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1431 +#, 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 #, 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:1438 +#: builtin/submodule--helper.c:1446 +#, c-format +msgid "directory not empty: '%s'" +msgstr "directorio no est谩 vac铆o: '%s'" + +#: builtin/submodule--helper.c:1458 #, 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:1474 +#: builtin/submodule--helper.c:1494 #, 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:1478 +#: builtin/submodule--helper.c:1498 #, 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:1571 +#: builtin/submodule--helper.c:1594 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de subm贸dulo '%s' no inicializada" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1598 msgid "Maybe you want to use 'update --init'?" msgstr "驴Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1628 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando subm贸dulo %s no fusionado" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:1657 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando subm贸dulo '%s'" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:1803 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fall贸 al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1814 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Fall贸 al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 msgid "path into the working tree" msgstr "ruta hacia el 谩rbol de trabajo" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1879 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:1858 +#: builtin/submodule--helper.c:1883 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1889 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:1867 +#: builtin/submodule--helper.c:1892 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1894 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:1870 +#: builtin/submodule--helper.c:1895 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1904 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1917 msgid "bad value for update parameter" msgstr "mal valor para par谩metro update" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1965 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20049,51 +20685,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:2061 +#: builtin/submodule--helper.c:2088 #, 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:2094 +#: builtin/submodule--helper.c:2121 msgid "recurse into submodules" msgstr "recurrir a subm贸dulos" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2127 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2183 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:2159 +#: builtin/submodule--helper.c:2186 msgid "unset the config in the .gitmodules file" msgstr "desconfigura la opci贸n en elarchivo .gitmodules" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2191 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2192 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2193 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2212 git-submodule.sh:173 #, 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:2235 git.c:433 git.c:683 +#: builtin/submodule--helper.c:2262 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:2241 +#: builtin/submodule--helper.c:2268 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper v谩lido" @@ -20347,207 +20983,211 @@ msgstr "el tag '%s' ya existe" msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:501 msgid "Unpacking objects" msgstr "Desempaquetando objetos" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "fall贸 al crear directorio %s" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "fall贸 al crear el archivo %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "fall贸 al eliminar el archivo %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "fall贸 al eliminar directorio %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Probando mtime en '%s' " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" "info de estado del directorio no cambia tras agregar un nuevo directorio" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "info de estado del directorio cambia tras actualizar un archivo" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "info de estado del directorio cambia tras agregar un archivo dentro del " "subdirectorio" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "info de estado del directorio no cambia tras borrar un archivo" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "info de estado del directorio no cambia tras borrar un directorio" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opciones>] [--] [<archivo>...]" -#: builtin/update-index.c:972 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "continuar refresh (Actualizaci贸n) incluso cuando el 铆ndice necesita " "actualizaci贸n" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: ignora subm贸dulos" -#: builtin/update-index.c:978 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "no ignorar archivos nuevos" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "permitir que archivos remplacen directorios y vice-versa" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "avisar de archivos faltando en el 谩rbol de trabajo" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "ejecutar refresh incluso si el 铆ndice contiene entradas sin cambios" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "refresh informaci贸n de estado" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, pero ignora configuraci贸n assume-unchanged" -#: builtin/update-index.c:995 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<ruta>" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "agregar la entrada especificada al 铆ndice" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "marcar archivos como \"not changing\"" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "limpiar bit assumed-unchanged" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "marcar archivos como \"index-only\"" -#: builtin/update-index.c:1015 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "limpiar bit skip-worktree" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "no tocar entradas index-only" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "" "agregar solo al 铆ndice; no agregar contenido a la base de datos de objetos" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "" "eliminar rutas nombradas incluso si est谩n presentes en el 谩rbol de trabajo" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "con --stdin: las l铆neas de entrada son terminadas con bytes nulos" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "leer la lista de rutas para ser actualizada desde standard input" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "agregar entradas de standard input al 铆ndice" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repoblar stages #2 y #3 para las rutas listadas" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "solo actualizar entradas que difieren de HEAD" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorar archivos faltantes en el 谩rbol de trabajo" -#: builtin/update-index.c:1043 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "reportar acciones por standard output" -#: builtin/update-index.c:1045 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "escribir 铆ndice en este formato" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "activar o desactivar 铆ndice dividido" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "habilitar o deshabilitar cach茅 no rastreado" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "probar si el filesystem soporta cach茅 no rastreado" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "habilitar cach茅 no rastreado sin probar el filesystem" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "escribir el 铆ndice incluso si no est谩 marcado como cambiado" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "activar o desactivar monitor de sistema de archivos" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "marcar archivos como v谩lidos para fsmonitor" -#: builtin/update-index.c:1066 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "limpia el bit de validaci贸n fsmonitor" -#: builtin/update-index.c:1169 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20555,7 +21195,7 @@ msgstr "" "core.splitIndex est谩 configurado en false; remu茅velo o c谩mbialo, si " "realmente quieres habilitar el 铆ndice partido" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20563,7 +21203,7 @@ msgstr "" "core.splitIndex est谩 configurado en true; remu茅velo o c谩mbialo, si realmente " "quieres deshabilitar el 铆ndice partido" -#: builtin/update-index.c:1190 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20571,11 +21211,11 @@ msgstr "" "core.untrackedCache est谩 configurado en true; remu茅velo o c谩mbialo, si " "realmente quieres deshabilitar el chach茅 no rastreado" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Cach茅 no rastreado deshabilitado" -#: builtin/update-index.c:1202 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20583,29 +21223,29 @@ msgstr "" "core.untrackedCache est谩 configurado en false; remu茅velo o c谩mbialo, si " "realmente quieres habilitar el cach茅 no rastreado" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cach茅 no rastreado habilitado para '%s'" -#: builtin/update-index.c:1214 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor no est谩 configurado; act铆valo si realmente quieres habilitar " "fsmonitor" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor activado" -#: builtin/update-index.c:1221 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor est谩 configurado; remu茅velo si realmente quieres deshabilitar " "el fsmonitor" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor desactivado" @@ -21006,15 +21646,20 @@ msgstr "escribir objeto de 谩rbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "s贸lo 煤til para depurar" -#: fast-import.c:3118 +#: fast-import.c:3125 #, c-format msgid "Expected 'mark' command, got %s" -msgstr "se esperaba comando 'mark', se obtuvo %s" +msgstr "Se esperaba comando 'mark', se obtuvo %s" -#: fast-import.c:3123 +#: fast-import.c:3130 #, c-format msgid "Expected 'to' command, got %s" -msgstr "se esperaba comando 'to', se obtuvo %s" +msgstr "Se esperaba comando 'to', se obtuvo %s" + +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "caracter铆stica '%s' prohibida en input sin --allow-unsafe-features" #: credential-cache--daemon.c:223 #, c-format @@ -21150,17 +21795,17 @@ msgstr "error desconocido de escritura en standard output" msgid "close failed on standard output" msgstr "cierre fall贸 en standard output" -#: git.c:792 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "bucle de alias detectado: expansi贸n de '%s' no termina: %s" -#: git.c:842 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "no se puede manejar %s como un builtin" -#: git.c:855 +#: git.c:856 #, c-format msgid "" "usage: %s\n" @@ -21171,12 +21816,12 @@ msgstr "" "\n" "\n" -#: git.c:875 +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "expansi贸n del alias '%s' fall贸; '%s' no es un comando de git\n" -#: git.c:887 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "fall贸 al ejecutar comando '%s': %s\n" @@ -21194,32 +21839,32 @@ msgstr "Delegaci贸n de control no es soportada con cURL < 7.22.0" msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fijaci贸n de llave p煤blica no es soportada con cURL < 7.44.0" -#: http.c:878 +#: http.c:876 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0" -#: http.c:951 +#: http.c:949 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Restricci贸n de protocolo no soportada con cURL < 7.19.4" -#: http.c:1088 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:" -#: http.c:1095 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "No se pudo configurar backend SSL a '%s': cURL fue construido sin backends " "SSL" -#: http.c:1099 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "No se pudo configurar backend SSL para '%s': ya configurado" -#: http.c:1968 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21350,30 +21995,41 @@ msgstr "args" msgid "object filtering" msgstr "filtrado de objeto" -#: parse-options.h:179 +#: parse-options.h:183 msgid "expiry-date" msgstr "fecha de expiraci贸n" -#: parse-options.h:193 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "no-op (compatibilidad con versiones anteriores)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "ser m谩s verboso" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "ser m谩s discreto" -#: parse-options.h:313 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> d铆gitos para mostrar SHA-1s" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "c贸mo quitar espacios y #comentarios de mensajes" +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "leer pathspec de archivo" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" +"con --pathspec-from-file, elementos de pathspec son separados con caracter " +"NUL" + #: ref-filter.h:101 msgid "key" msgstr "clave" @@ -21892,167 +22548,175 @@ msgid "Common Git shell script setup code" msgstr "C贸digo de configuraci贸n de script de shell com煤n de Git" #: command-list.h:171 +msgid "Initialize and modify the sparse-checkout" +msgstr "Inicializa y modifica el sparse-checkout" + +#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "" "Poner en un stash los cambios en un directorio de trabajo sucio de todas " "maneras" -#: command-list.h:172 +#: command-list.h:173 msgid "Add file contents to the staging area" msgstr "Agrega contenidos de un archivo al 谩rea de staging" -#: command-list.h:173 +#: command-list.h:174 msgid "Show the working tree status" msgstr "Muestra el estado del 谩rbol de trabajo" -#: command-list.h:174 +#: command-list.h:175 msgid "Remove unnecessary whitespace" msgstr "Eliminar el espacio en blanco innecesario" -#: command-list.h:175 +#: command-list.h:176 msgid "Initialize, update or inspect submodules" msgstr "Inicializa, actualiza o inspecciona subm贸dulos" -#: command-list.h:176 +#: command-list.h:177 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operaci贸n bidireccional entre un repositorio Subversion y Git" -#: command-list.h:177 +#: command-list.h:178 msgid "Switch branches" msgstr "Cambiar branches" -#: command-list.h:178 +#: command-list.h:179 msgid "Read, modify and delete symbolic refs" msgstr "Lee, modifica y borra referencias simb贸licas" -#: command-list.h:179 +#: command-list.h:180 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" -#: command-list.h:180 +#: command-list.h:181 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un archivo temporal con contenidos de un blob" -#: command-list.h:181 +#: command-list.h:182 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objetos de un archivo empaquetado" -#: command-list.h:182 +#: command-list.h:183 msgid "Register file contents in the working tree to the index" msgstr "Registra contenidos de archivos en el 谩rbol de trabajo al 铆ndice" -#: command-list.h:183 +#: command-list.h:184 msgid "Update the object name stored in a ref safely" msgstr "" "Actualiza el nombre del objeto almacenado en una referencia de forma segura" -#: command-list.h:184 +#: command-list.h:185 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Actualiza el archivo de informaci贸n auxiliar para ayudar a los servidores " "dumb" -#: command-list.h:185 +#: command-list.h:186 msgid "Send archive back to git-archive" msgstr "Enviar archivo a git-archive" -#: command-list.h:186 +#: command-list.h:187 msgid "Send objects packed back to git-fetch-pack" msgstr "Enviar objetos empaquetados a git-fetch-pack" -#: command-list.h:187 +#: command-list.h:188 msgid "Show a Git logical variable" msgstr "Mostrar una variable l贸gica de Git" -#: command-list.h:188 +#: command-list.h:189 msgid "Check the GPG signature of commits" msgstr "Verificar firma GPG de commits" -#: command-list.h:189 +#: command-list.h:190 msgid "Validate packed Git archive files" msgstr "Valida archivos Git empaquetados" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG de etiquetas" -#: command-list.h:191 +#: command-list.h:192 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaz web Git (interfaz web para repositorios Git)" -#: command-list.h:192 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "Muestra logs con las diferencias que cada commit introduce" -#: command-list.h:193 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "Gestiona m煤ltiples 谩rboles de trabajo" -#: command-list.h:194 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "Crea un objeto 谩rbol del 铆ndice actual" -#: command-list.h:195 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "Definiendo atributos por ruta" -#: command-list.h:196 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Interfaz y convenciones de l铆nea de comandos de Git" -#: command-list.h:197 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "Un tutorial b谩sico de Git para desarrolladores" -#: command-list.h:198 +#: command-list.h:199 msgid "Git for CVS users" msgstr "Git para usuarios CVS" -#: command-list.h:199 +#: command-list.h:200 msgid "Tweaking diff output" msgstr "Afinar la salida de diff" -#: command-list.h:200 +#: command-list.h:201 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunto m铆nimo 煤til de comandos diarios de Git" -#: command-list.h:201 +#: command-list.h:202 msgid "A Git Glossary" msgstr "Un Glosario de Git" -#: command-list.h:202 +#: command-list.h:203 msgid "Hooks used by Git" msgstr "Hooks utilizados por Git" -#: command-list.h:203 +#: command-list.h:204 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" -#: command-list.h:204 +#: command-list.h:205 msgid "Defining submodule properties" msgstr "Definiendo las propiedades del subm贸dulo" -#: command-list.h:205 +#: command-list.h:206 msgid "Git namespaces" msgstr "Namespaces de Git" -#: command-list.h:206 +#: command-list.h:207 msgid "Git Repository Layout" msgstr "Disposici贸n del repositorio Git" -#: command-list.h:207 +#: command-list.h:208 msgid "Specifying revisions and ranges for Git" msgstr "Especificando revisiones y rangos para Git" -#: command-list.h:208 +#: command-list.h:209 +msgid "Mounting one repository inside another" +msgstr "Montando un repositorio dentro de otro" + +#: command-list.h:210 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial de introducci贸n a Git: parte dos" -#: command-list.h:209 +#: command-list.h:211 msgid "A tutorial introduction to Git" msgstr "Un tutorial de introducci贸n para Git" -#: command-list.h:210 +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "Una visi贸n general de flujos de trabajo recomendados con Git" @@ -22179,115 +22843,115 @@ msgstr "Intentando fusi贸n simple con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Fusi贸n simple no funcion贸, intentando fusi贸n autom谩tica." -#: git-legacy-stash.sh:220 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "No se puede eliminar el 铆ndice temporal (no puede suceder)" -#: git-legacy-stash.sh:271 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No se puede actualizar $ref_stash con $w_commit" -#: git-legacy-stash.sh:323 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "error: opci贸n desconocida para 'stash pus': $option" -#: git-legacy-stash.sh:355 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Directorio de trabajo guardado y estado de 铆ndice $stash_msg" -#: git-legacy-stash.sh:535 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "opci贸n desconocida: $opt" -#: git-legacy-stash.sh:555 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Se especificaron demasiadas revisiones: $REV" -#: git-legacy-stash.sh:570 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no es una referencia v谩lida" -#: git-legacy-stash.sh:598 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no es un commit estilo stash" -#: git-legacy-stash.sh:609 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no es una referencia stash" -#: git-legacy-stash.sh:617 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "incapaz de refrescar el 铆ndice" -#: git-legacy-stash.sh:621 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "No se puede aplicar un stash en medio de una fusi贸n" -#: git-legacy-stash.sh:629 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "Conflictos en 铆ndice. Intente sin --index." -#: git-legacy-stash.sh:631 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "No se puede guardar el 铆ndice del 谩rbol" -#: git-legacy-stash.sh:640 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" -#: git-legacy-stash.sh:665 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "No se puede sacar de stage archivos modificados" -#: git-legacy-stash.sh:703 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Botado ${REV} ($s)" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No se pudo borrar entrada stash" -#: git-legacy-stash.sh:791 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "(Para restaurarlos, escribe \"git stash apply\")" -#: git-submodule.sh:200 +#: git-submodule.sh:202 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:210 +#: git-submodule.sh:212 #, 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:229 +#: git-submodule.sh:231 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ya existe en el 铆ndice" -#: git-submodule.sh:232 +#: git-submodule.sh:234 #, 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:239 +#: git-submodule.sh:241 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' no tiene un commit checked out" -#: git-submodule.sh:245 +#: git-submodule.sh:247 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -22298,24 +22962,24 @@ msgstr "" "$sm_path\n" "Usa -f si en verdad quieres agregarlo." -#: git-submodule.sh:268 +#: git-submodule.sh:270 #, 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:270 +#: git-submodule.sh:272 #, 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:278 +#: git-submodule.sh:280 #, 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:280 +#: git-submodule.sh:282 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22332,39 +22996,39 @@ msgstr "" "o no est谩s seguro de lo que esto significa, escoge otro nombre con la opci贸n " "'--name'." -#: git-submodule.sh:286 +#: git-submodule.sh:288 #, 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:298 +#: git-submodule.sh:300 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No es posible hacer checkout al subm贸dulo '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:305 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Fall贸 al agregar el subm贸dulo '$sm_path'" -#: git-submodule.sh:312 +#: git-submodule.sh:314 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fall贸 al registrar el subm贸dulo '$sm_path'" -#: git-submodule.sh:573 +#: git-submodule.sh:580 #, 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:583 +#: git-submodule.sh:590 #, 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:588 +#: git-submodule.sh:595 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22373,7 +23037,7 @@ msgstr "" "No es posible encontrar revisi贸n actual ${remote_name}/${branch} en la ruta " "de subm贸dulo '$sm_path'" -#: git-submodule.sh:606 +#: git-submodule.sh:613 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22382,7 +23046,7 @@ msgstr "" "No es posible realizar fetch en la ruta de subm贸dulo '$displaypath'; " "intentando hacer un fetch directo $sha1:" -#: git-submodule.sh:612 +#: git-submodule.sh:619 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22391,75 +23055,75 @@ msgstr "" "Fetch realizado en ruta de subm贸dulo '$displaypath', pero no conten铆a $sha1. " "Fetch directo del commit fall贸." -#: git-submodule.sh:619 +#: git-submodule.sh:626 #, 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:620 +#: git-submodule.sh:627 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de subm贸dulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:631 #, 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:625 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de subm贸dulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:637 #, 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:631 +#: git-submodule.sh:638 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de subm贸dulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:643 #, 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:637 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de subm贸dulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:675 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fall贸 al recurrir en la ruta de subm贸dulo '$displaypath'" -#: git-submodule.sh:830 +#: git-submodule.sh:886 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:882 +#: git-submodule.sh:938 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:902 +#: git-submodule.sh:958 #, 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:905 +#: git-submodule.sh:961 #, 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:908 +#: git-submodule.sh:964 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -22855,81 +23519,19 @@ msgid "Unable to determine absolute path of git directory" msgstr "Incapaz de determinar la ruta absoluta del directorio git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:211 -msgid "staged" -msgstr "rastreado" - -#: git-add--interactive.perl:211 -msgid "unstaged" -msgstr "no rastreado" - -#: git-add--interactive.perl:267 git-add--interactive.perl:292 -msgid "binary" -msgstr "binario" - -#: git-add--interactive.perl:276 git-add--interactive.perl:330 -msgid "nothing" -msgstr "nada" - -#: git-add--interactive.perl:312 git-add--interactive.perl:327 -msgid "unchanged" -msgstr "sin cambios" - -#: git-add--interactive.perl:623 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "agregada %d ruta\n" -msgstr[1] "agregadas %d rutas\n" - -#: git-add--interactive.perl:626 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "actualizada %d ruta\n" -msgstr[1] "actualizadas %d rutas\n" - -#: git-add--interactive.perl:629 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "revertida %d ruta\n" -msgstr[1] "revertidas %d rutas\n" - -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "touch hecho a %d ruta\n" msgstr[1] "touch hecho a %d rutas\n" -#: git-add--interactive.perl:641 -msgid "Update" -msgstr "Actualizar" - -#: git-add--interactive.perl:653 -msgid "Revert" -msgstr "Revertir" - -#: git-add--interactive.perl:676 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "nota: %s no es rastreado ahora.\n" - -#: git-add--interactive.perl:687 -msgid "Add untracked" -msgstr "Agregar no rastreados" - -#: git-add--interactive.perl:693 -msgid "No untracked files.\n" -msgstr "No hay archivos sin rastrear.\n" - -#: git-add--interactive.perl:1051 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -22937,7 +23539,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el 谩rea de stage." -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -22945,7 +23547,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -22953,8 +23555,8 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del 谩rea de stage." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -22962,8 +23564,8 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -22971,16 +23573,12 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "fall贸 al abrir el archivo de adici贸n del hunk para escritura: %s" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Modo de edici贸n manual de hunk -- vea abajo para una gu铆a r谩pida.\n" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -22993,36 +23591,12 @@ msgstr "" "Para eliminar '%s' l铆neas, b贸rrelas.\n" "Lineas comenzando con %s ser谩n eliminadas.\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1124 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Si esto no aplica de manera limpia, se te da la oportunidad de \n" -"editar nuevamente. Si todas las l铆neas del hunk son eliminadas, entonces \n" -"la edici贸n es abortada y el hunk queda sin cambios.\n" - -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "fall贸 al abrir el archivo de edici贸n del hunk para lectura: %s" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1237 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Tu hunk editado no aplica. 驴Editar nuevamente (隆decir \"no\" descarta!) [y/" -"n]? " - -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23037,7 +23611,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23051,7 +23625,7 @@ msgstr "" "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23066,7 +23640,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23080,7 +23654,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunko ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23094,7 +23668,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23108,7 +23682,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23122,7 +23696,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1296 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23136,7 +23710,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23158,230 +23732,202 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" msgstr "隆Los hunks seleccionados no aplican al 铆ndice!\n" -#: git-add--interactive.perl:1341 +#: 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:1344 +#: git-add--interactive.perl:1346 msgid "Nothing was applied.\n" msgstr "Nada fue aplicado.\n" -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1364 -msgid "Only binary files changed.\n" -msgstr "Solo cambiaron archivos binarios.\n" - -#: git-add--interactive.perl:1366 -msgid "No changes.\n" -msgstr "Sin cambios.\n" - -#: git-add--interactive.perl:1374 -msgid "Patch update" -msgstr "Actualizaci贸n del parche" - -#: git-add--interactive.perl:1426 +#: 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:1427 +#: 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:1428 +#: 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:1431 +#: 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:1432 +#: 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:1433 +#: 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:1436 +#: 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:1437 +#: 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:1438 +#: 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:1441 +#: 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:1442 +#: 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:1443 +#: 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:1446 git-add--interactive.perl:1461 +#: 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:1447 git-add--interactive.perl:1462 +#: 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:1448 git-add--interactive.perl:1463 +#: 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:1451 +#: 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:1452 +#: 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:1453 +#: 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:1456 +#: 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:1457 +#: 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:1458 +#: 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:1466 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "驴Aplicar cambio de modo para el 谩rbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1469 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "驴Aplicar borrado al 谩rbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1470 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "驴Aplicar este hunk al 谩rbol de trabajo [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1570 msgid "No other hunks to goto\n" msgstr "No hay m谩s pedazos para el ir\n" -#: git-add--interactive.perl:1575 -msgid "go to which hunk (<ret> to see more)? " -msgstr "驴a que hunk ir (<enter> para ver m谩s)? " - -#: git-add--interactive.perl:1577 -msgid "go to which hunk? " -msgstr "驴a que hunk ir? " - -#: git-add--interactive.perl:1586 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero inv谩lido: '%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1593 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lo siento, solo %d hunk disponible.\n" msgstr[1] "Lo siento, solo %d hunks disponibles.\n" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "No hay m谩s pedazos para buscar\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "驴buscar para regexp? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp para la b煤squeda mal formado %s: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patr贸n entregado.\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "Perd贸n, no se puede dividir este pedazo\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1698 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Cortar en %d hunk.\n" msgstr[1] "Cortar en %d hunks.\n" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "Perd贸n, no se puede editar este pedazo\n" -#: git-add--interactive.perl:1752 -msgid "Review diff" -msgstr "Revisi贸n de diff" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1771 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23401,19 +23947,19 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 -#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 -#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 -#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 +#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 +#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 +#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 +#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento inv谩lido %s, se esperaba --" @@ -23784,6 +24330,19 @@ msgstr "Saltando %s con el sufijo de backup '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "驴Realmente deseas mandar %s?[y|N]: " +#, c-format +#~ msgid "unable to get tree for %s" +#~ msgstr "no se pudo obtener 谩rbol para %s" + +#~ msgid "Use an experimental heuristic to improve diffs" +#~ msgstr "Usar un heur铆stico experimental para mejorar los diffs" + +#~ msgid "git commit-graph [--object-dir <objdir>]" +#~ msgstr "git commit-graph [--object-dir <objdir>]" + +#~ msgid "git commit-graph read [--object-dir <objdir>]" +#~ msgstr "git commit-graph read [--object-dir <objdir>]" + #~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" #~ msgstr "" #~ "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " @@ -23858,9 +24417,6 @@ msgstr "驴Realmente deseas mandar %s?[y|N]: " #~ msgid "cannot be interactive without stdin connected to a terminal." #~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal." -#~ msgid "failed to open '%s'" -#~ msgstr "fall贸 al abrir '%s'" - #~ msgid "failed to stat %s\n" #~ msgstr "fall贸 al analizar %s\n" |