diff options
| author |  Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> | 2021-10-10 13:28:14 +0200 |
|---|---|---|
| committer | Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> | 2021-11-07 19:13:01 -0500 |
| commit | 09fb894a5f40be943fa06519b21ba44a1ee69307 (patch) | |
| tree | f1f020d3d9d8035b0b7d3bbe8d8d31af6e87e72b /po | |
| parent | l10n: Update Catalan translation (diff) | |
| download | tgif-09fb894a5f40be943fa06519b21ba44a1ee69307.tar.xz | |
l10n: es: 2.34.0 round 2
Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
Signed-off-by: Omar Olivares <omar@olivares.cl>
Signed-off-by: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Diffstat (limited to 'po')
| -rw-r--r-- | po/es.po | 9583 |
1 files changed, 5004 insertions, 4579 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: 2021-08-14 07:56+0800\n" -"PO-Revision-Date: 2021-08-14 11:37-0500\n" +"POT-Creation-Date: 2021-11-04 08:34+0800\n" +"PO-Revision-Date: 2021-11-07 18:53-0500\n" "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -18,214 +18,214 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.0\n" -#: add-interactive.c:376 +#: add-interactive.c:380 #, c-format msgid "Huh (%s)?" msgstr "¿Ahh (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 -#: builtin/rebase.c:1953 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 +#: builtin/rebase.c:1642 msgid "could not read index" msgstr "no se pudo leer índice" -#: add-interactive.c:584 git-add--interactive.perl:269 +#: add-interactive.c:588 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binario" -#: add-interactive.c:642 git-add--interactive.perl:278 +#: add-interactive.c:646 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "nada" -#: add-interactive.c:643 git-add--interactive.perl:314 +#: add-interactive.c:647 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "sin cambios" -#: add-interactive.c:680 git-add--interactive.perl:641 +#: add-interactive.c:684 git-add--interactive.perl:641 msgid "Update" msgstr "Actualizar" -#: add-interactive.c:697 add-interactive.c:885 +#: add-interactive.c:701 add-interactive.c:889 #, c-format msgid "could not stage '%s'" msgstr "no se pudo poner en stage '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 msgid "could not write index" msgstr "no se pudo escribir índice" -#: add-interactive.c:706 git-add--interactive.perl:626 +#: add-interactive.c:710 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualizada %d ruta\n" msgstr[1] "actualizadas %d rutas\n" -#: add-interactive.c:724 git-add--interactive.perl:676 +#: add-interactive.c:728 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s no es rastreado ahora.\n" -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 -#: builtin/reset.c:145 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 +#: builtin/reset.c:151 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry falló para la ruta '%s'" -#: add-interactive.c:759 git-add--interactive.perl:653 +#: add-interactive.c:763 git-add--interactive.perl:653 msgid "Revert" msgstr "Revertir" -#: add-interactive.c:775 +#: add-interactive.c:779 msgid "Could not parse HEAD^{tree}" msgstr "No se pudo analizar HEAD^{tree}" -#: add-interactive.c:813 git-add--interactive.perl:629 +#: add-interactive.c:817 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertida %d ruta\n" msgstr[1] "revertidas %d rutas\n" -#: add-interactive.c:864 git-add--interactive.perl:693 +#: add-interactive.c:868 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "No hay archivos sin rastrear.\n" -#: add-interactive.c:868 git-add--interactive.perl:687 +#: add-interactive.c:872 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Agregar no rastreados" -#: add-interactive.c:895 git-add--interactive.perl:623 +#: add-interactive.c:899 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "agregada %d ruta\n" msgstr[1] "agregadas %d rutas\n" -#: add-interactive.c:925 +#: add-interactive.c:929 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorando lo no fusionado: %s" -#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Solo cambiaron archivos binarios.\n" -#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Sin cambios.\n" -#: add-interactive.c:943 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Actualización del parche" -#: add-interactive.c:982 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Revisión de diff" -#: add-interactive.c:1010 +#: add-interactive.c:1014 msgid "show paths with changes" msgstr "mostrar rutas con cambios" -#: add-interactive.c:1012 +#: add-interactive.c:1016 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:1014 +#: add-interactive.c:1018 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:1016 +#: add-interactive.c:1020 msgid "pick hunks and update selectively" msgstr "elegir fragmentos y actualizar de forma selectiva" -#: add-interactive.c:1018 +#: add-interactive.c:1022 msgid "view diff between HEAD and index" msgstr "ver diff entre HEAD e index" -#: add-interactive.c:1020 +#: add-interactive.c:1024 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:1028 add-interactive.c:1077 +#: add-interactive.c:1032 add-interactive.c:1081 msgid "Prompt help:" msgstr "Mostrar ayuda:" -#: add-interactive.c:1030 +#: add-interactive.c:1034 msgid "select a single item" -msgstr "selecciona un único objeto" +msgstr "seleccionar un único objeto" -#: add-interactive.c:1032 +#: add-interactive.c:1036 msgid "select a range of items" -msgstr "selecciona un rango de objetos" +msgstr "seleccionar un rango de objetos" -#: add-interactive.c:1034 +#: add-interactive.c:1038 msgid "select multiple ranges" -msgstr "selecciona múltiples rangos" +msgstr "seleccionar múltiples rangos" -#: add-interactive.c:1036 add-interactive.c:1081 +#: add-interactive.c:1040 add-interactive.c:1085 msgid "select item based on unique prefix" msgstr "seleccionar objeto basado en prefijo único" -#: add-interactive.c:1038 +#: add-interactive.c:1042 msgid "unselect specified items" msgstr "quitar objetos especificados" -#: add-interactive.c:1040 +#: add-interactive.c:1044 msgid "choose all items" msgstr "escoger todos los objetos" -#: add-interactive.c:1042 +#: add-interactive.c:1046 msgid "(empty) finish selecting" msgstr "(vacío) finalizar selección" -#: add-interactive.c:1079 +#: add-interactive.c:1083 msgid "select a numbered item" -msgstr "selecciona un objeto numerado" +msgstr "seleccionar un objeto numerado" -#: add-interactive.c:1083 +#: add-interactive.c:1087 msgid "(empty) select nothing" -msgstr "(vacío) selecciona nada" +msgstr "(vacío) no seleccionar nada" -#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "Ahora qué" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "staged" msgstr "rastreado" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "unstaged" msgstr "no rastreado" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 -#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 #: git-add--interactive.perl:213 msgid "path" msgstr "ruta" -#: add-interactive.c:1151 +#: add-interactive.c:1155 msgid "could not refresh index" msgstr "no se pudo refrescar el índice" -#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" @@ -255,8 +255,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "" -"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente " -"para el área de stage." +"Si el parche aplica limpiamente, el fragmento editado será marcado " +"inmediatamente para el área de stage." #: add-patch.c:42 msgid "" @@ -298,8 +298,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "" -"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente " -"para hacer stash." +"Si el parche aplica limpiamente, el fragmento editado será marcado " +"inmediatamente para hacer stash." #: add-patch.c:64 msgid "" @@ -313,7 +313,8 @@ msgstr "" "n - no hacer stash a este fragmento\n" "q - quit; no hacer stash a este fragmento o a ninguno de los restantes\n" "a - hacer stash a este fragmento y a todos los posteriores en el archivo\n" -"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo\n" +"d - no hacer stash a este fragmento ni ninguno de los posteriores en el " +"archivo\n" #: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format @@ -340,8 +341,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "" -"Si el parche aplica limpiamente, el fragmento editado será marcado inmediatamente " -"para sacar del área de stage." +"Si el parche aplica limpiamente, el fragmento editado será marcado " +"inmediatamente para sacar del área de stage." #: add-patch.c:88 msgid "" @@ -353,10 +354,12 @@ msgid "" msgstr "" "y - sacar desde hunk del área de stage\n" "n - no sacar este fragmento del area de stage\n" -"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n" -"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n" -"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el " +"q - quit; no sacar del area de stage este fragmento ni ninguno de los " +"restantes\n" +"a - sacar del area de stage este fragmento y todos los posteriores en el " "archivo\n" +"d - no sacar del area de stage este fragmento ni ninguno de los posteriores " +"en el archivo\n" #: add-patch.c:103 git-add--interactive.perl:1449 #, c-format, perl-format @@ -376,7 +379,7 @@ msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? " #: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este fragmetno al índice [y,n,q,a,d%s,?]? " +msgstr "¿Aplicar este fragmento al índice [y,n,q,a,d%s,?]? " #: add-patch.c:108 add-patch.c:176 add-patch.c:221 msgid "" @@ -502,7 +505,8 @@ msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "" +"¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " #: add-patch.c:179 msgid "" @@ -591,7 +595,7 @@ msgstr "" #: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" +msgstr "Modo de edición manual de hunk -- mira abajo para una guía rápida.\n" #: add-patch.c:1086 #, c-format @@ -614,7 +618,8 @@ msgid "" "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 fragmento son eliminadas, entonces\n" +"editar nuevamente. Si todas las líneas del fragmento son eliminadas, " +"entonces\n" "la edición es abortada y el fragmento queda sin cambios.\n" #: add-patch.c:1133 @@ -668,11 +673,12 @@ msgid "" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" -"j - deja este fragmento sin decidir, ver el siguiente fragmento sin decisión\n" -"J - deja este fragmento sin decidir, ver siguiente fragmento \n" -"k - deja este fragmento sin decidir, ver fragmento previo sin decidir\n" -"K - deja este fragmento sin decidir, ver fragmento anterior\n" -"g - selecciona un fragmento a dónde ir\n" +"j - dejar este fragmento sin decidir, ver el siguiente fragmento sin " +"decisión\n" +"J - dejar este fragmento sin decidir, ver siguiente fragmento \n" +"k - dejar este fragmento sin decidir, ver fragmento previo sin decidir\n" +"K - dejar este fragmento sin decidir, ver fragmento anterior\n" +"g - seleccionar un fragmento a dónde ir\n" "/ - buscar un fragmento que cumpla con el regex dado\n" "s - separar el fragmento actual en más pequeños\n" "e - editar manualmente el fragmento actual\n" @@ -744,7 +750,7 @@ msgstr "Perdón, no se puede editar este pedazo" msgid "'git apply' failed" msgstr "falló 'git apply'" -#: advice.c:145 +#: advice.c:78 #, c-format msgid "" "\n" @@ -753,38 +759,38 @@ msgstr "" "\n" "Desactivar este mensaje con \"git config advice.%s false\"" -#: advice.c:161 +#: advice.c:94 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:252 +#: advice.c:178 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:254 +#: advice.c:180 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:256 +#: advice.c:182 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:258 +#: advice.c:184 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:260 +#: advice.c:186 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:262 +#: advice.c:188 #, 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:270 +#: advice.c:196 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." @@ -792,41 +798,48 @@ 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:278 +#: advice.c:204 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:283 builtin/merge.c:1375 +#: advice.c:209 builtin/merge.c:1379 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:285 +#: advice.c:211 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:286 +#: advice.c:212 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:296 +#: advice.c:217 +msgid "Not possible to fast-forward, aborting." +msgstr "No es posible hacer fast-forward, abortando." + +#: advice.c:227 #, c-format msgid "" -"The following pathspecs didn't match any eligible path, but they do match " -"index\n" -"entries outside the current sparse checkout:\n" +"The following paths and/or pathspecs matched paths that exist\n" +"outside of your sparse-checkout definition, so will not be\n" +"updated in the index:\n" msgstr "" -"El siguiente pathspecs no concuerda con ninguna ruta elegible, pero " -"concuerda con\n" -"entradas del índice fuera del checkout sparse actual:\n" +"La siguiente ruta y/o pathspecs coinciden con rutas existentes\n" +"fuera de su definición para sparse-checkout, por lo que no\n" +"se actualizarán en el índice:\n" -#: advice.c:303 +#: advice.c:234 msgid "" -"Disable or modify the sparsity rules if you intend to update such entries." +"If you intend to update such entries, try one of the following:\n" +"* Use the --sparse option.\n" +"* Disable or modify the sparsity rules." msgstr "" -"Deshabilitar o modificar las reglas de escasez si intenta actualizar dichas " -"entradas." +"Si desea actualizar esa entrada, intente lo siguiente:\n" +"* Use la opción --sparse.\n" +"* Deshabilite o modifique las reglas de escasez." -#: advice.c:310 +#: advice.c:242 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1015,49 +1028,49 @@ msgstr "el archivo borrado %s todavía tiene contenido" msgid "** warning: file %s becomes empty but is not deleted" msgstr "** peligro: el archivo %s está vacío pero no es borrado" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "parche binario corrupto en la línea %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "parche binario no reconocido en la línea %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "parche que solo contiene basura en la línea %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "no es posible leer el enlace simbólico %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2935 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "comienzo inválido de línea: '%c'" -#: apply.c:3056 +#: 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:3068 +#: 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:3074 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -1066,23 +1079,24 @@ msgstr "" "mientras se buscaba:\n" "%.*s" -#: apply.c:3096 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3104 +#: 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 fragmento revertido a '%s'" +"no se puede revertir-aplicar un parche binario sin el fragmento revertido a " +"'%s'" -#: apply.c:3151 +#: 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:3162 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1090,289 +1104,290 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3170 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el parche aplica a un '%s' vacío, pero este no lo esta" -#: apply.c:3188 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "la postimagen necesaria %s para '%s' no se puede leer" -#: apply.c:3201 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3208 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el parche binario para '%s' crea un resultado incorrecto (esperando %s, se " "obtuvo %s)" -#: apply.c:3229 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche falló: %s:%ld" -#: apply.c:3352 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3412 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simbólico" -#: apply.c:3441 apply.c:3687 +#: apply.c:3442 apply.c:3709 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3527 apply.c:3702 +#: apply.c:3549 apply.c:3724 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el índice" -#: apply.c:3536 apply.c:3710 apply.c:3954 +#: apply.c:3558 apply.c:3732 apply.c:3976 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el índice" -#: apply.c:3571 +#: apply.c:3593 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "" "el repositorio carece del blob necesario para realizar un merge de tres vías." -#: apply.c:3574 +#: apply.c:3596 #, c-format msgid "Performing three-way merge...\n" msgstr "Realizando un merge de tres vías...\n" -#: apply.c:3590 apply.c:3594 +#: apply.c:3612 apply.c:3616 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3606 +#: apply.c:3628 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "Falló en realizar fusión de tres vías...\n" -#: apply.c:3620 +#: apply.c:3642 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3625 +#: apply.c:3647 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3642 +#: apply.c:3664 #, c-format msgid "Falling back to direct application...\n" msgstr "Retrocediendo a la aplicación...\n" -#: apply.c:3654 +#: apply.c:3676 msgid "removal patch leaves file contents" msgstr "parche de eliminación deja contenidos en el archivo" -#: apply.c:3727 +#: apply.c:3749 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3729 +#: apply.c:3751 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 -#: read-cache.c:1353 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 +#: read-cache.c:1368 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" -#: apply.c:3952 +#: apply.c:3974 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el índice" -#: apply.c:3956 +#: apply.c:3978 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3976 +#: apply.c:3998 #, 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:3981 +#: apply.c:4003 #, 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:4001 +#: apply.c:4023 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' está tras un enlace simbólico" -#: apply.c:4005 +#: apply.c:4027 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4020 +#: apply.c:4042 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4112 +#: apply.c:4134 #, 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:4119 +#: apply.c:4141 #, 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:4122 +#: apply.c:4144 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4131 +#: apply.c:4153 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo añadir %s al índice temporal" -#: apply.c:4141 +#: apply.c:4163 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4279 +#: apply.c:4301 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del índice" -#: apply.c:4313 +#: apply.c:4335 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submódulo %s" -#: apply.c:4319 +#: apply.c:4341 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible hacer stat en el archivo recién creado '%s'" -#: apply.c:4327 +#: apply.c:4349 #, 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:4333 apply.c:4478 +#: apply.c:4355 apply.c:4500 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4376 builtin/bisect--helper.c:525 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 +#: builtin/gc.c:2276 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir a '%s'" -#: apply.c:4380 +#: apply.c:4402 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4450 +#: apply.c:4472 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4548 +#: apply.c:4570 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4556 +#: apply.c:4578 msgid "internal error" msgstr "error interno" -#: apply.c:4559 +#: apply.c:4581 #, 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:4570 +#: apply.c:4592 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4592 +#: apply.c:4614 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4596 +#: apply.c:4618 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4725 +#: apply.c:4747 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4733 +#: apply.c:4755 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4753 +#: apply.c:4775 msgid "unable to read index file" msgstr "no es posible leer el archivo índice" -#: apply.c:4910 +#: apply.c:4932 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4937 +#: apply.c:4959 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco silenciado" msgstr[1] "%d errores de espacios en blanco silenciados" -#: apply.c:4943 apply.c:4958 +#: apply.c:4965 apply.c:4980 #, 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:4951 +#: apply.c:4973 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1381,139 +1396,139 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4995 +#: apply.c:5017 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4998 +#: apply.c:5020 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:5000 builtin/am.c:2318 +#: apply.c:5022 builtin/am.c:2320 msgid "num" msgstr "num" -#: apply.c:5001 +#: apply.c:5023 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:5004 +#: apply.c:5026 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:5006 +#: apply.c:5028 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:5010 +#: apply.c:5032 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar el número de líneas agregadas y eliminadas en notación decimal" -#: apply.c:5012 +#: apply.c:5034 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:5014 +#: apply.c:5036 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:5016 +#: apply.c:5038 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche sea aplicable al índice actual" -#: apply.c:5018 +#: apply.c:5040 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:5020 +#: apply.c:5042 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:5022 +#: apply.c:5044 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toque fuera del área de trabajo" -#: apply.c:5025 +#: apply.c:5047 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche (usar con --stat/--summary/--check)" -#: apply.c:5027 +#: apply.c:5049 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "intentar merge de tres vías, regresar al parche normal si el parche no aplica" -#: apply.c:5029 +#: apply.c:5051 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información de índice incrustada" -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 +#: apply.c:5054 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL" -#: apply.c:5034 +#: apply.c:5056 msgid "ensure at least <n> lines of context match" msgstr "asegurar que al menos <n> líneas del contexto concuerden" -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 -#: builtin/rebase.c:1347 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 +#: builtin/rebase.c:1051 msgid "action" msgstr "acción" -#: apply.c:5036 +#: apply.c:5058 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:5039 apply.c:5042 +#: apply.c:5061 apply.c:5064 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5045 +#: apply.c:5067 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5047 +#: apply.c:5069 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:5049 +#: apply.c:5071 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5051 +#: apply.c:5073 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5054 +#: apply.c:5076 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:5057 +#: apply.c:5079 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del fragmento" -#: apply.c:5059 builtin/am.c:2306 +#: apply.c:5081 builtin/am.c:2308 msgid "root" msgstr "raíz" -#: apply.c:5060 +#: apply.c:5082 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -1585,152 +1600,151 @@ msgstr "git archive --remote <repo> [--exec <comando>] --list" msgid "cannot read %s" msgstr "no se puede leer %s" -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 -#: builtin/merge.c:1144 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 +#: builtin/merge.c:1145 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concordó con ningún archivo" -#: archive.c:451 +#: archive.c:450 #, c-format msgid "no such ref: %.*s" msgstr "no existe el ref: %.*s" -#: archive.c:457 +#: archive.c:456 #, c-format msgid "not a valid object name: %s" msgstr "nombre de objeto no válido: %s" -#: archive.c:470 +#: archive.c:469 #, c-format msgid "not a tree object: %s" msgstr "no es un objeto tree: %s" -#: archive.c:482 +#: archive.c:481 msgid "current working directory is untracked" msgstr "directorio de trabajo actual no rastreado" -#: archive.c:523 +#: archive.c:522 #, c-format msgid "File not found: %s" msgstr "Archivo no encontrado: %s" -#: archive.c:525 +#: archive.c:524 #, c-format msgid "Not a regular file: %s" msgstr "No es un archivo regular: %s" -#: archive.c:552 +#: archive.c:551 msgid "fmt" msgstr "fmt" -#: archive.c:552 +#: archive.c:551 msgid "archive format" msgstr "formato de crónica" -#: archive.c:553 builtin/log.c:1775 +#: archive.c:552 builtin/log.c:1775 msgid "prefix" msgstr "prefijo" -#: archive.c:554 +#: archive.c:553 msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en la crónica" -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 -#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "archivo" -#: archive.c:556 +#: archive.c:555 msgid "add untracked file to archive" msgstr "incluir archivos sin seguimiento a la crónica" -#: archive.c:559 builtin/archive.c:90 +#: archive.c:558 builtin/archive.c:88 msgid "write the archive to this file" msgstr "escribe la crónica en este archivo" -#: archive.c:561 +#: archive.c:560 msgid "read .gitattributes in working directory" msgstr "leer .gitattributes en el directorio de trabajo" -#: archive.c:562 +#: archive.c:561 msgid "report archived files on stderr" msgstr "reportar archivos en la crónica por stderr" -#: archive.c:564 +#: archive.c:563 msgid "set compression level" msgstr "configurar nivel de compresión" -#: archive.c:567 +#: archive.c:566 msgid "list supported archive formats" msgstr "listar los formatos de crónica soportados" -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 -#: builtin/submodule--helper.c:2902 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 msgid "repo" msgstr "repo" -#: archive.c:570 builtin/archive.c:92 +#: archive.c:569 builtin/archive.c:90 msgid "retrieve the archive from remote repository <repo>" msgstr "obtener la crónica del repositorio remoto <repo>" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 -#: builtin/notes.c:498 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 +#: builtin/notes.c:496 msgid "command" msgstr "comando" -#: archive.c:572 builtin/archive.c:94 +#: archive.c:571 builtin/archive.c:92 msgid "path to the remote git-upload-archive command" msgstr "ruta para el comando git-upload-archive remoto" -#: archive.c:579 +#: archive.c:578 msgid "Unexpected option --remote" msgstr "Opción inesperada --remote" -#: archive.c:581 +#: archive.c:580 msgid "Option --exec can only be used together with --remote" msgstr "Opción --exec solo puede ser utilizada con --remote" -#: archive.c:583 +#: archive.c:582 msgid "Unexpected option --output" msgstr "Opción inesperada --output" -#: archive.c:585 +#: archive.c:584 msgid "Options --add-file and --remote cannot be used together" msgstr "Opciones --add-file y --remote no pueden ser usadas juntas" -#: archive.c:607 +#: archive.c:606 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de crónica desconocido '%s'" -#: archive.c:616 +#: archive.c:615 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" -#: attr.c:202 +#: attr.c:203 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no es un nombre de atributo válido" -#: attr.c:363 +#: attr.c:364 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no permitido: %s:%d" -#: attr.c:403 +#: attr.c:404 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1738,22 +1752,22 @@ msgstr "" "Los patrones negativos son ignorados en los atributos de git\n" "Usa '\\!' para comenzar literalmente con exclamación." -#: bisect.c:489 +#: bisect.c:488 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Revisa las comillas en el archivo '%s': %s" -#: bisect.c:699 +#: bisect.c:698 #, c-format msgid "We cannot bisect more!\n" msgstr "¡No podemos biseccionar más!\n" -#: bisect.c:766 +#: bisect.c:764 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit válido %s" -#: bisect.c:791 +#: bisect.c:789 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1762,7 +1776,7 @@ msgstr "" "La base de fusión %s está mal.\n" "Esto quiere decir que el bug ha sido corregido entre %s y [%s].\n" -#: bisect.c:796 +#: bisect.c:794 #, c-format msgid "" "The merge base %s is new.\n" @@ -1771,7 +1785,7 @@ msgstr "" "La base de fusión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:801 +#: bisect.c:799 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1780,7 +1794,7 @@ msgstr "" "La base de fusión %s es %s.\n" "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n" -#: bisect.c:809 +#: bisect.c:807 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1791,7 +1805,7 @@ msgstr "" "git bisect no puede trabajar bien en este caso.\n" "¿Tal vez confundiste las revisiones %s y %s?\n" -#: bisect.c:822 +#: bisect.c:820 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1803,36 +1817,36 @@ msgstr "" "%s.\n" "Vamos a continuar de todas maneras." -#: bisect.c:861 +#: bisect.c:859 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Biseccionando: una base de fusión debe ser probada\n" -#: bisect.c:911 +#: bisect.c:909 #, c-format msgid "a %s revision is needed" msgstr "una revisión %s es necesaria" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 +#: bisect.c:939 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:987 builtin/merge.c:153 +#: bisect.c:985 builtin/merge.c:154 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:1027 +#: bisect.c:1025 msgid "reading bisect refs failed" msgstr "falló leer las refs de bisect" -#: bisect.c:1057 +#: bisect.c:1055 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:1066 +#: bisect.c:1064 #, c-format msgid "" "No testable commit found.\n" @@ -1841,7 +1855,7 @@ msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:1095 +#: bisect.c:1093 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1851,7 +1865,7 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1101 +#: bisect.c:1099 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1871,11 +1885,12 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 -#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 -#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "falló la configuración del recorrido de revisiones" @@ -2065,8 +2080,8 @@ msgstr "'%s' no se ve como un archivo bundle v2 o v3" msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 -#: builtin/commit.c:861 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 +#: builtin/commit.c:862 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" @@ -2124,7 +2139,7 @@ msgstr "versión de bundle no soportada %d" msgid "cannot write bundle version %d with algorithm %s" msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s" -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" @@ -2166,7 +2181,7 @@ msgstr "chunk final tiene un id distinto de cero %<PRIx32>" msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit-graph.c:204 midx.c:47 +#: commit-graph.c:204 midx.c:51 msgid "invalid hash version" msgstr "versión de hash inválida" @@ -2211,192 +2226,192 @@ msgstr "cadena de commit-graph inválida: línea '%s' no es un hash" msgid "unable to find all commit-graph files" msgstr "no es posible encontrar los archivos commit-graph" -#: commit-graph.c:745 commit-graph.c:782 +#: commit-graph.c:746 commit-graph.c:783 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "posición de commit inválida. commit-graph está probablemente corrupto" -#: commit-graph.c:766 +#: commit-graph.c:767 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:799 +#: commit-graph.c:800 msgid "commit-graph requires overflow generation data but has none" msgstr "" "commit-graph requiere datos de generación de desbordamiento pero no tiene " "ninguno" -#: commit-graph.c:1075 builtin/am.c:1341 +#: commit-graph.c:1105 builtin/am.c:1342 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: commit-graph.c:1337 builtin/pack-objects.c:3057 +#: commit-graph.c:1367 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:1368 +#: commit-graph.c:1398 msgid "Loading known commits in commit graph" msgstr "Cargando commits conocidos en commit graph" -#: commit-graph.c:1385 +#: commit-graph.c:1415 msgid "Expanding reachable commits in commit graph" msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:1405 +#: commit-graph.c:1435 msgid "Clearing commit marks in commit graph" msgstr "Limpiando marcas de commits en commit graph" -#: commit-graph.c:1424 +#: commit-graph.c:1454 msgid "Computing commit graph topological levels" msgstr "Calculando niveles topológicos de commit graph" -#: commit-graph.c:1477 +#: commit-graph.c:1507 msgid "Computing commit graph generation numbers" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1558 +#: commit-graph.c:1588 msgid "Computing commit changed paths Bloom filters" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1635 +#: commit-graph.c:1665 msgid "Collecting referenced commits" msgstr "Recolectando commits referenciados" -#: commit-graph.c:1660 +#: commit-graph.c:1690 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Encontrando commits para commit graph en %d pack" msgstr[1] "Encontrando commits para commit graph en %d packs" -#: commit-graph.c:1673 +#: commit-graph.c:1703 #, c-format msgid "error adding pack %s" msgstr "error al agregar pack %s" -#: commit-graph.c:1677 +#: commit-graph.c:1707 #, c-format msgid "error opening index for %s" msgstr "error al abrir index para %s" -#: commit-graph.c:1714 +#: commit-graph.c:1744 msgid "Finding commits for commit graph among packed objects" msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:1732 +#: commit-graph.c:1762 msgid "Finding extra edges in commit graph" msgstr "Encontrando esquinas extra en commit graph" -#: commit-graph.c:1781 +#: commit-graph.c:1811 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:1812 midx.c:911 +#: commit-graph.c:1842 midx.c:1146 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1825 +#: commit-graph.c:1855 msgid "unable to create temporary graph layer" msgstr "no es posible crear una capa de gráfico temporal" -#: commit-graph.c:1830 +#: commit-graph.c:1860 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "no se pudo poner permisos compartidos a '%s'" -#: commit-graph.c:1887 +#: commit-graph.c:1917 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Escribiendo commit graph en %d paso" msgstr[1] "Escribiendo commit graph en %d pasos" -#: commit-graph.c:1923 +#: commit-graph.c:1953 msgid "unable to open commit-graph chain file" msgstr "no se pudo abrir la cadena de archivos commit-graph" -#: commit-graph.c:1939 +#: commit-graph.c:1969 msgid "failed to rename base commit-graph file" msgstr "no se pudo renombrar el archivo base commit-graph" -#: commit-graph.c:1959 +#: commit-graph.c:1989 msgid "failed to rename temporary commit-graph file" msgstr "falló al renombrar el archivo temporal commit-graph" -#: commit-graph.c:2092 +#: commit-graph.c:2122 msgid "Scanning merged commits" msgstr "Escaneando commits fusionados" -#: commit-graph.c:2136 +#: commit-graph.c:2166 msgid "Merging commit-graph" msgstr "Fusionando commit-graph" -#: commit-graph.c:2244 +#: commit-graph.c:2274 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "intentando escribir un commit-graph, pero 'core.commitGraph' está " "deshabilitado" -#: commit-graph.c:2351 +#: commit-graph.c:2381 msgid "too many commits to write graph" msgstr "demasiados commits para escribir el gráfico" -#: commit-graph.c:2449 +#: commit-graph.c:2479 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el archivo de commit-graph tiene checksums incorrectos y probablemente está " "corrupto" -#: commit-graph.c:2459 +#: commit-graph.c:2489 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s" -#: commit-graph.c:2469 commit-graph.c:2484 +#: commit-graph.c:2499 commit-graph.c:2514 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u" -#: commit-graph.c:2476 +#: commit-graph.c:2506 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "falló al analizar commit %s para commit-graph" -#: commit-graph.c:2494 +#: commit-graph.c:2524 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:2509 +#: commit-graph.c:2539 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "falló al analizar el commit %s de la base de datos de objetos para commit-" "graph" -#: commit-graph.c:2516 +#: commit-graph.c:2546 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "OID del árbol raíz para commit %s en commit-graph es %s != %s" -#: commit-graph.c:2526 +#: commit-graph.c:2556 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "lista padre de commit-graph para commit %s es demasiada larga" -#: commit-graph.c:2535 +#: commit-graph.c:2565 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:2549 +#: commit-graph.c:2579 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "lista de padres de commit-graph para commit %s termina prematuramente" -#: commit-graph.c:2554 +#: commit-graph.c:2584 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2404,7 +2419,7 @@ msgstr "" "commit-graph tiene número de generación cero para %s, pero no cero en otro " "lugar" -#: commit-graph.c:2558 +#: commit-graph.c:2588 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2412,29 +2427,29 @@ msgstr "" "commit-graph tiene número de generación no cero para %s, pero cero en otro " "lugar" -#: commit-graph.c:2575 +#: commit-graph.c:2605 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2581 +#: commit-graph.c:2611 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" -#: commit.c:54 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "¡%s %s no es un commit!" -#: commit.c:194 +#: commit.c:196 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2448,33 +2463,33 @@ msgstr "" "El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n" "y será eliminado en una versión futura de Git.\n" "\n" -"Por favor use \"git replace --convert-graft-file\"\n" +"Por favor usa \"git replace --convert-graft-file\"\n" "para convertir los grafts en refs.\n" "\n" -"Apapa este mensaje ejecutando\n" +"Apaga este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1237 +#: commit.c:1239 #, 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:1241 +#: commit.c:1243 #, 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:1244 +#: commit.c:1246 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1247 +#: commit.c:1249 #, 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:1501 +#: commit.c:1503 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" @@ -2489,7 +2504,7 @@ msgstr "" msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:126 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2504,36 +2519,36 @@ msgstr "" "\t%s\n" "Esto puede ser causado por inclusiones circulares." -#: config.c:142 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "no se pudo expandir rutas de inclusión '%s'" -#: config.c:153 +#: config.c:152 msgid "relative config includes must come from files" msgstr "inclusiones de configuración relativas tienen que venir de archivos" -#: config.c:199 +#: config.c:201 msgid "relative config include conditionals must come from files" msgstr "" "la configuración relativa incluye condicionales que deben venir de archivos" -#: config.c:396 +#: config.c:398 #, c-format msgid "invalid config format: %s" msgstr "formato config inválido: %s" -#: config.c:400 +#: config.c:402 #, c-format msgid "missing environment variable name for configuration '%.*s'" msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'" -#: config.c:405 +#: config.c:407 #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" msgstr "falta la variable de entorno '%s' para la configuración '%.*s'" -#: config.c:442 +#: config.c:443 #, c-format msgid "key does not contain a section: %s" msgstr "llave no contiene una sección: %s" @@ -2543,298 +2558,298 @@ 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:472 sequencer.c:2785 +#: config.c:470 sequencer.c:2804 #, c-format msgid "invalid key: %s" msgstr "llave inválida: %s" -#: config.c:478 +#: config.c:475 #, c-format msgid "invalid key (newline): %s" msgstr "llave inválida (nueva línea): %s" -#: config.c:511 +#: config.c:495 msgid "empty config key" msgstr "clave de config vacía" -#: config.c:529 config.c:541 +#: config.c:513 config.c:525 #, c-format msgid "bogus config parameter: %s" msgstr "parámetro de configuración malogrado: %s" -#: config.c:555 config.c:572 config.c:579 config.c:588 +#: config.c:539 config.c:556 config.c:563 config.c:572 #, c-format msgid "bogus format in %s" msgstr "formato malogrado en %s" -#: config.c:622 +#: config.c:606 #, c-format msgid "bogus count in %s" msgstr "conteo malogrado en %s" -#: config.c:626 +#: config.c:610 #, c-format msgid "too many entries in %s" msgstr "demasiadas entradas en %s" -#: config.c:636 +#: config.c:620 #, c-format msgid "missing config key %s" msgstr "llave de configuración faltante %s" -#: config.c:644 +#: config.c:628 #, c-format msgid "missing config value %s" msgstr "valor de config faltante para %s" -#: config.c:995 +#: config.c:979 #, c-format msgid "bad config line %d in blob %s" msgstr "mala línea de config %d en el blob %s" -#: config.c:999 +#: config.c:983 #, c-format msgid "bad config line %d in file %s" msgstr "mala línea de config %d en el archivo %s" -#: config.c:1003 +#: config.c:987 #, c-format msgid "bad config line %d in standard input" msgstr "mala línea de config %d en la entrada standard" -#: config.c:1007 +#: config.c:991 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "mala línea de config %d en el submódulo-blob %s" -#: config.c:1011 +#: config.c:995 #, c-format msgid "bad config line %d in command line %s" msgstr "mala línea de config %d en la línea de comando %s" -#: config.c:1015 +#: config.c:999 #, c-format msgid "bad config line %d in %s" msgstr "mala línea de config %d en %s" -#: config.c:1152 +#: config.c:1136 msgid "out of range" msgstr "fuera de rango" -#: config.c:1152 +#: config.c:1136 msgid "invalid unit" msgstr "unidad inválida" -#: config.c:1153 +#: config.c:1137 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "mal valor de config numérico '%s' para '%s': %s" -#: config.c:1163 +#: config.c:1147 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "mal valor de config numérico '%s' para '%s' en el blob %s: %s" -#: config.c:1166 +#: config.c:1150 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "mal valor de config numérico '%s' para '%s' en el archivo %s: %s" -#: config.c:1169 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "mal valor de config numérico '%s' para '%s' en la entrada standard: %s" -#: config.c:1172 +#: config.c:1156 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "mal valor de config numérico '%s' para '%s' en el submódulo-blob %s: %s" -#: config.c:1175 +#: config.c:1159 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "mal valor de config numérico '%s' para '%s' en la línea de comando %s: %s" -#: config.c:1178 +#: config.c:1162 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "mal valor de config numérico '%s' para '%s' en %s: %s" -#: config.c:1257 +#: config.c:1241 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "mal valor de config booleano '%s' para '%s'" -#: config.c:1275 +#: config.c:1259 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falló al expandir el directorio de usuario en: '%s'" -#: config.c:1284 +#: config.c:1268 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' para '%s' no es una marca de tiempo válida" -#: config.c:1377 +#: config.c:1361 #, c-format msgid "abbrev length out of range: %d" msgstr "largo de abreviatura fuera de rango: %d" -#: config.c:1391 config.c:1402 +#: config.c:1375 config.c:1386 #, c-format msgid "bad zlib compression level %d" msgstr "nivel de compresión de zlib erróneo %d" -#: config.c:1494 +#: config.c:1476 msgid "core.commentChar should only be one character" -msgstr "core.commentChar debería tener solo un caracter" +msgstr "core.commentChar debería tener solo un carácter" -#: config.c:1527 +#: config.c:1509 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido de creación de objetos: %s" -#: config.c:1599 +#: config.c:1581 #, c-format msgid "malformed value for %s" msgstr "valor malformado para %s" -#: config.c:1625 +#: config.c:1607 #, c-format msgid "malformed value for %s: %s" msgstr "valor malformado para %s: %s" -#: config.c:1626 +#: config.c:1608 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1687 builtin/pack-objects.c:4084 +#: config.c:1669 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" -#: config.c:1809 +#: config.c:1792 #, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz de cargar configuración de objeto blob '%s'" -#: config.c:1812 +#: config.c:1795 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referencia '%s' no apunta a un blob" -#: config.c:1829 +#: config.c:1813 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no es posible resolver configuración de blob '%s'" -#: config.c:1874 +#: config.c:1858 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1930 +#: config.c:1914 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2294 +#: config.c:2282 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2468 +#: config.c:2456 #, c-format msgid "Invalid %s: '%s'" msgstr "%s inválido: '%s'" -#: config.c:2513 +#: config.c:2501 #, 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:2559 +#: config.c:2547 #, 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:2561 +#: config.c:2549 #, 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:2645 +#: config.c:2633 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2677 +#: config.c:2665 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2706 +#: config.c:2694 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2958 config.c:3285 +#: config.c:2946 config.c:3273 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2969 +#: config.c:2957 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:3006 builtin/config.c:361 +#: config.c:2994 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:3031 +#: config.c:3019 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:3044 config.c:3298 +#: config.c:3032 config.c:3286 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:3055 +#: config.c:3043 #, c-format msgid "unable to mmap '%s'%s" msgstr "no es posible hacer mmap '%s'%s" -#: config.c:3065 config.c:3303 +#: config.c:3053 config.c:3291 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:3150 config.c:3400 +#: config.c:3138 config.c:3388 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:3184 +#: config.c:3172 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3276 +#: config.c:3264 #, c-format msgid "invalid section name: %s" msgstr "nombre de sección inválido: %s" -#: config.c:3443 +#: config.c:3431 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2869,72 +2884,72 @@ msgstr "servidor no soporta feature '%s'" msgid "expected flush after capabilities" msgstr "se espera flush tras capacidades" -#: connect.c:263 +#: connect.c:265 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "ignorando capacidades tras primera línea '%s'" -#: connect.c:284 +#: connect.c:286 msgid "protocol error: unexpected capabilities^{}" msgstr "error de protocolo: capacidades imprevistas^{}" -#: connect.c:306 +#: connect.c:308 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'" -#: connect.c:308 +#: connect.c:310 msgid "repository on the other end cannot be shallow" msgstr "el repositorio en el otro lado no puede ser superficial" -#: connect.c:347 +#: connect.c:349 msgid "invalid packet" msgstr "paquete inválido" -#: connect.c:367 +#: connect.c:369 #, c-format msgid "protocol error: unexpected '%s'" msgstr "error de protocolo: '%s' inesperado" -#: connect.c:497 +#: connect.c:499 #, c-format msgid "unknown object format '%s' specified by server" msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor" -#: connect.c:526 +#: connect.c:528 #, c-format msgid "invalid ls-refs response: %s" msgstr "respuesta de ls-refs inválida: %s" -#: connect.c:530 +#: connect.c:532 msgid "expected flush after ref listing" msgstr "flush esperado tras listado de refs" -#: connect.c:533 +#: connect.c:535 msgid "expected response end packet after ref listing" msgstr "se esperaba un paquete final luego del ref listing" -#: connect.c:666 +#: connect.c:670 #, c-format msgid "protocol '%s' is not supported" msgstr "protocolo '%s' no es soportado" -#: connect.c:717 +#: connect.c:721 msgid "unable to set SO_KEEPALIVE on socket" msgstr "no es posible configurar SO_KEEPALIVE en el socket" -#: connect.c:757 connect.c:820 +#: connect.c:761 connect.c:824 #, c-format msgid "Looking up %s ... " msgstr "Revisando %s... " -#: connect.c:761 +#: connect.c:765 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "no se puede revisar %s (puerto %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:765 connect.c:836 +#: connect.c:769 connect.c:840 #, c-format msgid "" "done.\n" @@ -2943,7 +2958,7 @@ msgstr "" "hecho.\n" "Conectando a %s (puerto %s) ... " -#: connect.c:787 connect.c:864 +#: connect.c:791 connect.c:868 #, c-format msgid "" "unable to connect to %s:\n" @@ -2953,78 +2968,78 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:793 connect.c:870 +#: connect.c:797 connect.c:874 msgid "done." msgstr "hecho." -#: connect.c:824 +#: connect.c:828 #, c-format msgid "unable to look up %s (%s)" msgstr "no es posible revisar %s (%s)" -#: connect.c:830 +#: connect.c:834 #, c-format msgid "unknown port %s" msgstr "puerto desconocido %s" -#: connect.c:967 connect.c:1299 +#: connect.c:971 connect.c:1303 #, c-format msgid "strange hostname '%s' blocked" msgstr "hostname extraño '%s' bloqueado" -#: connect.c:969 +#: connect.c:973 #, c-format msgid "strange port '%s' blocked" msgstr "puerto extraño '%s' bloqueado" -#: connect.c:979 +#: connect.c:983 #, c-format msgid "cannot start proxy %s" msgstr "no se puede comenzar proxy %s" -#: connect.c:1050 +#: connect.c:1054 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -"no hay ruta especificada; vea 'git help pull' para sintaxis válida de url" +"no hay ruta especificada; mira 'git help pull' para sintaxis válida de url" -#: connect.c:1190 +#: connect.c:1194 msgid "newline is forbidden in git:// hosts and repo paths" msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio" -#: connect.c:1247 +#: connect.c:1251 msgid "ssh variant 'simple' does not support -4" msgstr "variante 'simple' de ssh no soporta -4" -#: connect.c:1259 +#: connect.c:1263 msgid "ssh variant 'simple' does not support -6" msgstr "variante 'simple' de ssh no soporta -6" -#: connect.c:1276 +#: connect.c:1280 msgid "ssh variant 'simple' does not support setting port" msgstr "variante ssh 'simple' no soporta configurar puerto" -#: connect.c:1388 +#: connect.c:1392 #, c-format msgid "strange pathname '%s' blocked" msgstr "ruta extraña '%s' bloqueada" -#: connect.c:1436 +#: connect.c:1440 msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:120 +#: connected.c:122 msgid "Could not run 'git rev-list'" msgstr "No se pudo ejecutar 'git rev-list'" -#: connected.c:144 +#: connected.c:146 msgid "failed write to rev-list" msgstr "falló escribir a rev-list" -#: connected.c:149 +#: connected.c:151 msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" @@ -3169,17 +3184,17 @@ msgstr "rehusando trabajar con campo host faltante en la credencial" msgid "refusing to work with credential missing protocol field" msgstr "rehusando trabajar con campo protocolo faltante en la credencial" -#: credential.c:394 +#: credential.c:395 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "url contiene una nueva línea en su componente %s: %s" -#: credential.c:438 +#: credential.c:439 #, c-format msgid "url has no scheme: %s" msgstr "url no tiene scheme: %s" -#: credential.c:511 +#: credential.c:512 #, c-format msgid "credential url cannot be parsed: %s" msgstr "url de credencial no puede ser analizada: %s" @@ -3281,23 +3296,23 @@ msgstr "%d islas marcadas, listo.\n" msgid "unknown value for --diff-merges: %s" msgstr "valor desconocido para --diff-merges: %s" -#: diff-lib.c:557 +#: diff-lib.c:561 msgid "--merge-base does not work with ranges" msgstr "--merge-base no funciona con rangos" -#: diff-lib.c:559 +#: diff-lib.c:563 msgid "--merge-base only works with commits" msgstr "--merge-base solo funciona con confirmaciones" -#: diff-lib.c:576 +#: diff-lib.c:580 msgid "unable to get HEAD" msgstr "no es posible obtener HEAD" -#: diff-lib.c:583 +#: diff-lib.c:587 msgid "no merge base found" msgstr "no se encontró base de fusión" -#: diff-lib.c:585 +#: diff-lib.c:589 msgid "multiple merge bases found" msgstr "múltiples bases de fusión encontradas" @@ -3310,20 +3325,20 @@ msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "" -"No es un repositorio git. Use --no-index para comparar dos paths fuera del " +"No es un repositorio git. Usa --no-index para comparar dos paths fuera del " "árbol de trabajo" -#: diff.c:156 +#: diff.c:157 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Falló al analizar porcentaje de corte de dirstat '%s'\n" -#: diff.c:161 +#: diff.c:162 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parámetro '%s' de dirstat desconocido\n" -#: diff.c:297 +#: diff.c:298 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -3331,7 +3346,7 @@ msgstr "" "opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" -#: diff.c:325 +#: diff.c:326 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3341,7 +3356,7 @@ msgstr "" "change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" -#: diff.c:333 +#: diff.c:334 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -3349,13 +3364,13 @@ msgstr "" "color-moved-ws: allow-indentation-change no puede ser combinado con otros " "modos de espacios en blanco" -#: diff.c:410 +#: diff.c:411 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valor para la variable de configuración 'diff.submodule' desconocido: '%s'" -#: diff.c:470 +#: diff.c:471 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3364,49 +3379,49 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4282 +#: diff.c:4290 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4634 +#: diff.c:4642 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4637 +#: diff.c:4645 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4640 +#: diff.c:4648 msgid "" "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" msgstr "" -"-G y --pickaxe-regex son mutuamente exclusivos, use --pickaxe-regex con -S" +"-G y --pickaxe-regex son mutuamente exclusivos, usa --pickaxe-regex con -S" -#: diff.c:4643 +#: diff.c:4651 msgid "" "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " "with -G and -S" msgstr "" -"--pickaxe-all y --find-object son mutuamente exclusivas, use --pickaxe-all " +"--pickaxe-all y --find-object son mutuamente exclusivas, usa --pickaxe-all " "con -G y -S" -#: diff.c:4722 +#: diff.c:4730 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4770 +#: diff.c:4778 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat inválido: %s" -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 +#: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numérico" -#: diff.c:4807 +#: diff.c:4815 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3415,42 +3430,42 @@ msgstr "" "Falló al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4892 +#: diff.c:4900 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4916 +#: diff.c:4924 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4930 +#: diff.c:4938 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4980 diff.c:4986 +#: diff.c:4988 diff.c:4994 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4998 +#: diff.c:5006 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:5019 +#: diff.c:5027 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:5038 +#: diff.c:5046 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo inválido '%s' en --color-moved-ws" -#: diff.c:5078 +#: diff.c:5086 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3458,159 +3473,159 @@ msgstr "" "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5114 diff.c:5134 +#: diff.c:5122 diff.c:5142 #, c-format msgid "invalid argument to %s" msgstr "argumento inválido para %s" -#: diff.c:5238 +#: diff.c:5246 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex inválido para -I: '%s'" -#: diff.c:5287 +#: diff.c:5295 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "falló al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5343 +#: diff.c:5351 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5379 +#: diff.c:5387 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5381 diff.c:5387 +#: diff.c:5389 diff.c:5395 msgid "generate patch" msgstr "generar parche" -#: diff.c:5384 builtin/log.c:179 +#: diff.c:5392 builtin/log.c:179 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5389 diff.c:5503 diff.c:5510 +#: diff.c:5397 diff.c:5511 diff.c:5518 msgid "<n>" msgstr "<n>" -#: diff.c:5390 diff.c:5393 +#: diff.c:5398 diff.c:5401 msgid "generate diffs with <n> lines context" -msgstr "genera diffs con <n> líneas de contexto" +msgstr "generar diffs con <n> líneas de contexto" -#: diff.c:5395 +#: diff.c:5403 msgid "generate the diff in raw format" -msgstr "genera el diff en formato raw" +msgstr "generar el diff en formato raw" -#: diff.c:5398 +#: diff.c:5406 msgid "synonym for '-p --raw'" msgstr "sinónimo para '-p --raw'" -#: diff.c:5402 +#: diff.c:5410 msgid "synonym for '-p --stat'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5406 +#: diff.c:5414 msgid "machine friendly --stat" msgstr "--stat amigable para máquina" -#: diff.c:5409 +#: diff.c:5417 msgid "output only the last line of --stat" msgstr "mostrar solo la última línea para --stat" -#: diff.c:5411 diff.c:5419 +#: diff.c:5419 diff.c:5427 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5412 +#: diff.c:5420 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -"muestra la distribución de cantidades de cambios relativas para cada " +"mostrar la distribución de cantidades de cambios relativas para cada " "subdirectorio" -#: diff.c:5416 +#: diff.c:5424 msgid "synonym for --dirstat=cumulative" msgstr "sinónimo para --dirstat=cumulative" -#: diff.c:5420 +#: diff.c:5428 msgid "synonym for --dirstat=files,param1,param2..." -msgstr "sinonimo para --dirstat=archivos,param1,param2..." +msgstr "sinónimo para --dirstat=archivos,param1,param2..." -#: diff.c:5424 +#: diff.c:5432 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -"advierte si cambios introducen conflictos de markers o errores de espacios " +"advertir si cambios introducen conflictos de markers o errores de espacios " "en blanco" -#: diff.c:5427 +#: diff.c:5435 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5430 +#: diff.c:5438 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5433 +#: diff.c:5441 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5435 +#: diff.c:5443 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]" -#: diff.c:5436 +#: diff.c:5444 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5438 diff.c:5441 diff.c:5444 +#: diff.c:5446 diff.c:5449 diff.c:5452 msgid "<width>" msgstr "<ancho>" -#: diff.c:5439 +#: diff.c:5447 msgid "generate diffstat with a given width" -msgstr "genera diffstat con un ancho dado" +msgstr "generar diffstat con un ancho dado" -#: diff.c:5442 +#: diff.c:5450 msgid "generate diffstat with a given name width" -msgstr "genera diffstat con un ancho de nombre dado" +msgstr "generar diffstat con un ancho de nombre dado" -#: diff.c:5445 +#: diff.c:5453 msgid "generate diffstat with a given graph width" -msgstr "genera diffstat con un ancho de graph dado" +msgstr "generar diffstat con un ancho de graph dado" -#: diff.c:5447 +#: diff.c:5455 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5448 +#: diff.c:5456 msgid "generate diffstat with limited lines" -msgstr "genera diffstat con líneas limitadas" +msgstr "generar diffstat con líneas limitadas" -#: diff.c:5451 +#: diff.c:5459 msgid "generate compact summary in diffstat" -msgstr "genera un resumen compacto de diffstat" +msgstr "generar un resumen compacto de diffstat" -#: diff.c:5454 +#: diff.c:5462 msgid "output a binary diff that can be applied" -msgstr "muestra un diff binario que puede ser aplicado" +msgstr "mostrar un diff binario que puede ser aplicado" -#: diff.c:5457 +#: diff.c:5465 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:5459 +#: diff.c:5467 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5460 +#: diff.c:5468 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5461 +#: diff.c:5469 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3618,7 +3633,7 @@ msgstr "" "resaltar errores de espacios en blanco en las líneas 'context', 'old' o " "'new' del diff" -#: diff.c:5464 +#: diff.c:5472 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3626,330 +3641,330 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5468 +#: diff.c:5476 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5471 +#: diff.c:5479 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostrar el prefijo de destino dado en lugar de \"b/\"" -#: diff.c:5474 +#: diff.c:5482 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada línea mostrada" -#: diff.c:5477 +#: diff.c:5485 msgid "do not show any source or destination prefix" msgstr "no mostrar ningún prefijo de fuente o destino" -#: diff.c:5480 +#: diff.c:5488 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 " +"mostrar el contexto entre hunks de diff hasta el número especificado de " "líneas" -#: diff.c:5484 diff.c:5489 diff.c:5494 +#: diff.c:5492 diff.c:5497 diff.c:5502 msgid "<char>" msgstr "<char>" -#: diff.c:5485 +#: diff.c:5493 msgid "specify the character to indicate a new line instead of '+'" -msgstr "especifica el char para indicar una nueva línea en lugar de '+'" +msgstr "especificar el char para indicar una nueva línea en lugar de '+'" -#: diff.c:5490 +#: diff.c:5498 msgid "specify the character to indicate an old line instead of '-'" -msgstr "especifica el char para indicar una línea vieja en lugar de '-'" +msgstr "especificar el char para indicar una línea vieja en lugar de '-'" -#: diff.c:5495 +#: diff.c:5503 msgid "specify the character to indicate a context instead of ' '" -msgstr "especifica el char para indicar un contexto en lugar de ' '" +msgstr "especificar el char para indicar un contexto en lugar de ' '" -#: diff.c:5498 +#: diff.c:5506 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5499 +#: diff.c:5507 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5500 +#: diff.c:5508 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:5504 +#: diff.c:5512 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5508 +#: diff.c:5516 msgid "omit the preimage for deletes" -msgstr "omite la preimage para borrados" +msgstr "omitir la preimage para borrados" -#: diff.c:5511 +#: diff.c:5519 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5515 +#: diff.c:5523 msgid "use unmodified files as source to find copies" -msgstr "usa archivos no modificados como fuente para encontrar copias" +msgstr "usar archivos no modificados como fuente para encontrar copias" -#: diff.c:5517 +#: diff.c:5525 msgid "disable rename detection" -msgstr "deshabilita detección de renombrados" +msgstr "deshabilitar detección de renombrados" -#: diff.c:5520 +#: diff.c:5528 msgid "use empty blobs as rename source" -msgstr "usa blobs vacíos como fuente de renombramiento" +msgstr "usar blobs vacíos como fuente de renombramiento" -#: diff.c:5522 +#: diff.c:5530 msgid "continue listing the history of a file beyond renames" msgstr "" -"continua listando el historial de un archivo más allá de renombramientos" +"continuar listando el historial de un archivo más allá de renombramientos" -#: diff.c:5525 +#: diff.c:5533 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -"previene detección de renombramientos/copias si el número de destinos para " +"prevenir detección de renombramientos/copias si el número de destinos para " "renombramientos/copias excede el límite dado" -#: diff.c:5527 +#: diff.c:5535 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5529 +#: diff.c:5537 msgid "produce the smallest possible diff" -msgstr "produce el diff más pequeño posible" +msgstr "producir el diff más pequeño posible" -#: diff.c:5532 +#: diff.c:5540 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando líneas" -#: diff.c:5535 +#: diff.c:5543 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de líneas en blanco" -#: diff.c:5538 +#: diff.c:5546 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5541 +#: diff.c:5549 msgid "ignore carrier-return at the end of line" -msgstr "ignora carrier-return al final de la línea" +msgstr "ignorar carrier-return al final de la línea" -#: diff.c:5544 +#: diff.c:5552 msgid "ignore changes whose lines are all blank" -msgstr "ignora cambios cuyas líneas son todas en blanco" +msgstr "ignorar cambios cuyas líneas son todas en blanco" -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 msgid "<regex>" msgstr "<regex>" -#: diff.c:5547 +#: diff.c:5555 msgid "ignore changes whose all lines match <regex>" -msgstr "ignora cambios cuyas líneas concuerdan con <regex>" +msgstr "ignorar cambios cuyas líneas concuerdan con <regex>" -#: diff.c:5550 +#: diff.c:5558 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:5553 +#: diff.c:5561 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5557 +#: diff.c:5565 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5559 +#: diff.c:5567 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5560 +#: diff.c:5568 msgid "choose a diff algorithm" -msgstr "escoge un algoritmo para diff" +msgstr "escoger un algoritmo para diff" -#: diff.c:5562 +#: diff.c:5570 msgid "<text>" msgstr "<texto>" -#: diff.c:5563 +#: diff.c:5571 msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "genera un diff usando algoritmo \"anchored diff\"" +msgstr "generar un diff usando algoritmo \"anchored diff\"" -#: diff.c:5565 diff.c:5574 diff.c:5577 +#: diff.c:5573 diff.c:5582 diff.c:5585 msgid "<mode>" msgstr "<modo>" -#: diff.c:5566 +#: diff.c:5574 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" +"mostrar diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5569 +#: diff.c:5577 msgid "use <regex> to decide what a word is" -msgstr "usa <regex> para decidir qué es una palabra" +msgstr "usar <regex> para decidir qué es una palabra" -#: diff.c:5572 +#: diff.c:5580 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5575 +#: diff.c:5583 msgid "moved lines of code are colored differently" msgstr "líneas movidas de código están coloreadas diferente" -#: diff.c:5578 +#: diff.c:5586 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5581 +#: diff.c:5589 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5583 +#: diff.c:5591 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra " +"cuando ejecutado desde un subdir, excluir cambios del exterior y muestra " "paths relativos" -#: diff.c:5587 +#: diff.c:5595 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5589 +#: diff.c:5597 msgid "swap two inputs, reverse the diff" -msgstr "cambia dos inputs, invierte el diff" +msgstr "cambiar dos inputs, invierte el diff" -#: diff.c:5591 +#: diff.c:5599 msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" +msgstr "terminar con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5593 +#: diff.c:5601 msgid "disable all output of the program" -msgstr "deshabilita todo el salida del programa" +msgstr "deshabilitar toda la salida del programa" -#: diff.c:5595 +#: diff.c:5603 msgid "allow an external diff helper to be executed" -msgstr "permite la ejecución de un diff helper externo" +msgstr "permitir la ejecución de un diff helper externo" -#: diff.c:5597 +#: diff.c:5605 msgid "run external text conversion filters when comparing binary files" msgstr "" -"ejecuta filtros de conversión de texto externos cuando comparando binarios" +"ejecutar filtros de conversión de texto externos cuando comparando binarios" -#: diff.c:5599 +#: diff.c:5607 msgid "<when>" msgstr "<cuando>" -#: diff.c:5600 +#: diff.c:5608 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a submódulos en la generación de diff" -#: diff.c:5603 +#: diff.c:5611 msgid "<format>" msgstr "<formato>" -#: diff.c:5604 +#: diff.c:5612 msgid "specify how differences in submodules are shown" -msgstr "especifica como son mostradas las diferencias en submódulos" +msgstr "especificar como son mostradas las diferencias en submódulos" -#: diff.c:5608 +#: diff.c:5616 msgid "hide 'git add -N' entries from the index" msgstr "ocultar entradas 'git add -N' del índice" -#: diff.c:5611 +#: diff.c:5619 msgid "treat 'git add -N' entries as real in the index" -msgstr "trata entradas 'git add -N' como reales en el índice" +msgstr "tratar entradas 'git add -N' como reales en el índice" -#: diff.c:5613 +#: diff.c:5621 msgid "<string>" msgstr "<string>" -#: diff.c:5614 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -"busca diferencias que cambien el número de ocurrencias del string " +"buscar diferencias que cambien el número de ocurrencias del string " "especificado" -#: diff.c:5617 +#: diff.c:5625 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -"busca por diferencias que cambien el número de ocurrencias del regex " +"buscar diferencias que cambien el número de ocurrencias del regex " "especificado" -#: diff.c:5620 +#: diff.c:5628 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:5623 +#: diff.c:5631 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:5626 +#: diff.c:5634 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:5627 diff.c:5630 +#: diff.c:5635 diff.c:5638 msgid "<path>" msgstr "<ruta>" -#: diff.c:5628 +#: diff.c:5636 msgid "show the change in the specified path first" msgstr "mostrar el cambio en la ruta especificada primero" -#: diff.c:5631 +#: diff.c:5639 msgid "skip the output to the specified path" -msgstr "saltar el salida de la ruta especificada" +msgstr "saltar la salida de la ruta especificada" -#: diff.c:5633 +#: diff.c:5641 msgid "<object-id>" msgstr "<id-de-objeto>" -#: diff.c:5634 +#: diff.c:5642 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -"busca diferencias que cambien el número de ocurrencias para el objeto " +"buscar diferencias que cambien el número de ocurrencias para el objeto " "especificado" -#: diff.c:5636 +#: diff.c:5644 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5637 +#: diff.c:5645 msgid "select files by diff type" -msgstr "selecciona archivos por tipo de diff" +msgstr "seleccionar archivos por tipo de diff" -#: diff.c:5639 +#: diff.c:5647 msgid "<file>" msgstr "<archivo>" -#: diff.c:5640 +#: diff.c:5648 msgid "Output to a specific file" msgstr "Output a un archivo específico" -#: diff.c:6298 +#: diff.c:6306 msgid "exhaustive rename detection was skipped due to too many files." msgstr "" "detección exhaustiva de cambio de nombre fue saltada por haber demasiados " "archivos." -#: diff.c:6301 +#: diff.c:6309 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber demasiados " "archivos." -#: diff.c:6304 +#: diff.c:6312 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3962,7 +3977,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "falló al leer archivo de orden '%s'" -#: diffcore-rename.c:1514 +#: diffcore-rename.c:1564 msgid "Performing inexact rename detection" msgstr "Realizando una detección de cambios de nombre inexacta" @@ -4001,339 +4016,416 @@ msgstr "deshabilitar coincidencia de patrónes cónica" msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusión" -#: dir.c:2351 +#: dir.c:2464 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2653 +#: dir.c:2766 msgid "failed to get kernel name and information" msgstr "falló al conseguir el nombre y la información del kernel" -#: dir.c:2777 +#: dir.c:2890 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache está desactivado en este sistema o ubicación" -#: dir.c:3610 +#: dir.c:3158 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +msgstr "" +"No se pudo adivinar ningún nombre de directorio.\n" +"Por favor especifica un directorio en la línea de comando" + +#: dir.c:3837 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo índice corrompido en repositorio %s" -#: dir.c:3657 dir.c:3662 +#: dir.c:3884 dir.c:3889 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3691 +#: dir.c:3918 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" -#: editor.c:74 +#: editor.c:77 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c" -#: entry.c:176 +#: entry.c:177 msgid "Filtering content" msgstr "Filtrando contenido" -#: entry.c:497 +#: entry.c:498 #, c-format msgid "could not stat file '%s'" msgstr "no se pudo hacer stat en el archivo '%s'" -#: environment.c:152 +#: environment.c:143 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:334 -#, c-format -msgid "could not set GIT_DIR to '%s'" -msgstr "no se pudo configurar GIT_DIR a '%s'" - #: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "demasiados argumentos para ejecutar %s" -#: fetch-pack.c:182 +#: fetch-pack.c:193 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: lista de superficiales esperada" -#: fetch-pack.c:185 +#: fetch-pack.c:196 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack: se esperaba un flush packet luego de la lista de " "superficiales" -#: fetch-pack.c:196 +#: fetch-pack.c:207 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet" -#: fetch-pack.c:216 +#: fetch-pack.c:227 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'" -#: fetch-pack.c:227 +#: fetch-pack.c:238 msgid "unable to write to remote" msgstr "no se puede escribir al remoto" -#: fetch-pack.c:288 +#: fetch-pack.c:299 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:383 fetch-pack.c:1423 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "invalid shallow line: %s" msgstr "línea shallow inválida: %s" -#: fetch-pack.c:389 fetch-pack.c:1429 +#: fetch-pack.c:400 fetch-pack.c:1440 #, c-format msgid "invalid unshallow line: %s" msgstr "línea unshallow inválida: %s" -#: fetch-pack.c:391 fetch-pack.c:1431 +#: fetch-pack.c:402 fetch-pack.c:1442 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:394 fetch-pack.c:1434 +#: fetch-pack.c:405 fetch-pack.c:1445 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:396 fetch-pack.c:1436 +#: fetch-pack.c:407 fetch-pack.c:1447 #, c-format msgid "no shallow found: %s" msgstr "shallow no encontrado: %s" -#: fetch-pack.c:399 fetch-pack.c:1440 +#: fetch-pack.c:410 fetch-pack.c:1451 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" -#: fetch-pack.c:439 +#: fetch-pack.c:450 #, c-format msgid "got %s %d %s" msgstr "se obtuvo %s %d %s" -#: fetch-pack.c:456 +#: fetch-pack.c:467 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:487 +#: fetch-pack.c:498 msgid "giving up" msgstr "rindiéndose" -#: fetch-pack.c:500 progress.c:339 +#: fetch-pack.c:511 progress.c:339 msgid "done" msgstr "listo" -#: fetch-pack.c:512 +#: fetch-pack.c:523 #, c-format msgid "got %s (%d) %s" msgstr "se obtuvo %s (%d) %s" -#: fetch-pack.c:548 +#: fetch-pack.c:559 #, c-format msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:763 +#: fetch-pack.c:774 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:849 +#: fetch-pack.c:860 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede ejecutar un demultiplexor de banda lateral" -#: fetch-pack.c:857 +#: fetch-pack.c:868 msgid "protocol error: bad pack header" msgstr "error de protocolo: header de paquete erróneo" -#: fetch-pack.c:951 +#: fetch-pack.c:962 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede ejecutar %s" -#: fetch-pack.c:957 +#: fetch-pack.c:968 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack: salida de index-pack no válida" -#: fetch-pack.c:974 +#: fetch-pack.c:985 #, c-format msgid "%s failed" msgstr "%s falló" -#: fetch-pack.c:976 +#: fetch-pack.c:987 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:1019 +#: fetch-pack.c:1030 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 #, c-format msgid "Server supports %s" msgstr "El servidor soporta %s" -#: fetch-pack.c:1029 +#: fetch-pack.c:1040 msgid "Server does not support shallow clients" msgstr "El servidor no soporta clientes superficiales" -#: fetch-pack.c:1089 +#: fetch-pack.c:1100 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shallow-since" -#: fetch-pack.c:1094 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shallow-exclude" -#: fetch-pack.c:1098 +#: fetch-pack.c:1109 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:1100 +#: fetch-pack.c:1111 msgid "Server does not support this repository's object format" msgstr "El servidor no soporta el formato de objetos de este repositorio" -#: fetch-pack.c:1113 +#: fetch-pack.c:1124 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130 msgid "source repository is shallow, reject to clone." msgstr "el repositorio fuente es superficial, rechazando clonado." -#: fetch-pack.c:1128 fetch-pack.c:1660 +#: fetch-pack.c:1139 fetch-pack.c:1671 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch falló." -#: fetch-pack.c:1242 +#: fetch-pack.c:1253 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "algoritmos no compatibles: cliente %s; servidor %s" -#: fetch-pack.c:1246 +#: fetch-pack.c:1257 #, c-format msgid "the server does not support algorithm '%s'" msgstr "el servidor no soporta el algoritmo '%s'" -#: fetch-pack.c:1279 +#: fetch-pack.c:1290 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1286 +#: fetch-pack.c:1297 msgid "Server supports filter" msgstr "El servidor soporta filtración" -#: fetch-pack.c:1329 fetch-pack.c:2043 +#: fetch-pack.c:1340 fetch-pack.c:2053 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" -#: fetch-pack.c:1347 +#: fetch-pack.c:1358 #, c-format msgid "error reading section header '%s'" msgstr "error al leer header de sección '%s'" -#: fetch-pack.c:1353 +#: fetch-pack.c:1364 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibió '%s'" -#: fetch-pack.c:1387 +#: fetch-pack.c:1398 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "línea de confirmación inesperada: '%s'" -#: fetch-pack.c:1392 +#: fetch-pack.c:1403 #, c-format msgid "error processing acks: %d" msgstr "error al procesar acks: %d" -#: fetch-pack.c:1402 +#: fetch-pack.c:1413 msgid "expected packfile to be sent after 'ready'" msgstr "se esperaba que el packfile fuera enviado luego del 'listo'" -#: fetch-pack.c:1404 +#: fetch-pack.c:1415 msgid "expected no other sections to be sent after no 'ready'" msgstr "se esperaba que ninguna otra sección fuera enviada luego del 'listo'" -#: fetch-pack.c:1445 +#: fetch-pack.c:1456 #, c-format msgid "error processing shallow info: %d" msgstr "error al procesar información de superficiales: %d" -#: fetch-pack.c:1494 +#: fetch-pack.c:1505 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1499 +#: fetch-pack.c:1510 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1504 +#: fetch-pack.c:1515 #, c-format msgid "error processing wanted refs: %d" msgstr "error al procesar refs deseadas: %d" -#: fetch-pack.c:1534 +#: fetch-pack.c:1545 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: se esperaba un paquete final de respuesta" -#: fetch-pack.c:1939 +#: fetch-pack.c:1949 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1962 builtin/clone.c:697 +#: fetch-pack.c:1972 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "remoto no mandó todos los objetos necesarios" -#: fetch-pack.c:2065 +#: fetch-pack.c:2075 msgid "unexpected 'ready' from remote" msgstr "'listo' inesperado del remoto" -#: fetch-pack.c:2088 +#: fetch-pack.c:2098 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:2091 +#: fetch-pack.c:2101 #, 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:273 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 +#: gpg-interface.c:918 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:276 +#: gpg-interface.c:332 gpg-interface.c:454 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falló al escribir la firma separada para '%s'" -#: gpg-interface.c:470 +#: gpg-interface.c:445 +msgid "" +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " +"signature verification" +msgstr "" +"gpg.ssh.allowedSignersFile necesita ser configurado y existe para " +"verificación de firmas ssh" + +#: gpg-interface.c:469 +msgid "" +"ssh-keygen -Y find-principals/verify is needed for ssh signature " +"verification (available in openssh version 8.2p1+)" +msgstr "" +"ssh-keygen -Y find-principals/verify se necesita para la verficación de ssh " +"(disponible en openssh versión 8.2p1+)" + +#: gpg-interface.c:523 +#, c-format +msgid "ssh signing revocation file configured but not found: %s" +msgstr "archivo de revocación de firmas ssh configurado pero no encontrado: %s" + +#: gpg-interface.c:576 +#, c-format +msgid "bad/incompatible signature '%s'" +msgstr "firma mala/incompatible '%s'" + +#: gpg-interface.c:735 gpg-interface.c:740 +#, c-format +msgid "failed to get the ssh fingerprint for key '%s'" +msgstr "error al conseguir la huella de ssh para la llave '%s'" + +#: gpg-interface.c:762 +msgid "" +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" +msgstr "user.signingkey o gpg.ssh.defaultKeyCommand necesitan ser configurados" + +#: gpg-interface.c:780 +#, c-format +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" +msgstr "gpg.ssh.defaultKeyCommand exitoso pero no retornó ninguna llave: %s %s" + +#: gpg-interface.c:786 +#, c-format +msgid "gpg.ssh.defaultKeyCommand failed: %s %s" +msgstr "gpg.ssh.defaultKeyCommand falló: %s %s" + +#: gpg-interface.c:874 msgid "gpg failed to sign the data" msgstr "gpg falló al firmar los datos" +#: gpg-interface.c:895 +msgid "user.signingkey needs to be set for ssh signing" +msgstr "user.signingkey necesita ser configurado para firmar con ssh" + +#: gpg-interface.c:906 +#, c-format +msgid "failed writing ssh signing key to '%s'" +msgstr "falló al escribir la llave de firma para '%s'" + +#: gpg-interface.c:924 +#, c-format +msgid "failed writing ssh signing key buffer to '%s'" +msgstr "falló al escribir el buffer para lla llave de firma para '%s'" + +#: gpg-interface.c:942 +msgid "" +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version " +"8.2p1+)" +msgstr "" +"ssh-keygen -Y signs se necesita para el firmado con ssh (disponible en " +"openssh versión 8.2p1+)" + +#: gpg-interface.c:954 +#, c-format +msgid "failed reading ssh signing data buffer from '%s'" +msgstr "falló al leer la firma ssh desde '%s'" + #: graph.c:98 #, c-format msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "ignorado color inválido '%.*s' en log.graphColors" -#: grep.c:531 +#: grep.c:533 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4341,109 +4433,109 @@ msgstr "" "el patrón provisto contiene bytes NULL (vía -f <archivo>). Esto solo es " "soportado con -P bajo PCRE v2" -#: grep.c:1895 +#: grep.c:1928 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "falló al hacer stat en '%s'" -#: grep.c:1923 +#: grep.c:1956 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" -#: help.c:23 +#: help.c:24 msgid "start a working area (see also: git help tutorial)" -msgstr "comienza un área de trabajo (ver también: git help tutorial)" +msgstr "comenzar un área de trabajo (mira también: git help tutorial)" -#: help.c:24 +#: help.c:25 msgid "work on the current change (see also: git help everyday)" -msgstr "trabaja en los cambios actuales (ver también: git help everyday)" +msgstr "trabajar en los cambios actuales (mira también: git help everyday)" -#: help.c:25 +#: help.c:26 msgid "examine the history and state (see also: git help revisions)" -msgstr "examina el historial y el estado (ver también: git help revisions)" +msgstr "examinar el historial y el estado (mira también: git help revisions)" -#: help.c:26 +#: help.c:27 msgid "grow, mark and tweak your common history" -msgstr "crece, marca y ajusta tu historial común" +msgstr "crecer, marcar y ajustar tu historial común" -#: help.c:27 +#: help.c:28 msgid "collaborate (see also: git help workflows)" -msgstr "colabora (mira también: git help workflows)" +msgstr "colaborar (mira también: git help workflows)" -#: help.c:31 +#: help.c:32 msgid "Main Porcelain Commands" msgstr "Comandos de Porcelana principales" -#: help.c:32 +#: help.c:33 msgid "Ancillary Commands / Manipulators" msgstr "Comandos auxiliares / Manipuladores" -#: help.c:33 +#: help.c:34 msgid "Ancillary Commands / Interrogators" msgstr "Comandos auxiliares / Interrogadores" -#: help.c:34 +#: help.c:35 msgid "Interacting with Others" -msgstr "Interactuando con Otros" +msgstr "Interactuar con Otros" -#: help.c:35 +#: help.c:36 msgid "Low-level Commands / Manipulators" msgstr "Comandos de bajo nivel / Manipuladores" -#: help.c:36 +#: help.c:37 msgid "Low-level Commands / Interrogators" msgstr "Comandos de bajo nivel / Interrogadores" -#: help.c:37 +#: help.c:38 msgid "Low-level Commands / Syncing Repositories" msgstr "Comandos de bajo nivel / Sincronización de repositorios" -#: help.c:38 +#: help.c:39 msgid "Low-level Commands / Internal Helpers" msgstr "Comandos de bajo nivel / Auxiliares internos" -#: help.c:300 +#: help.c:313 #, c-format msgid "available git commands in '%s'" msgstr "comandos disponibles de git en '%s'" -#: help.c:307 +#: help.c:320 msgid "git commands available from elsewhere on your $PATH" msgstr "comandos disponibles de git desde otro lugar en tu $PATH" -#: help.c:316 +#: help.c:329 msgid "These are common Git commands used in various situations:" msgstr "Estos son comandos comunes de Git usados en varias situaciones:" -#: help.c:365 git.c:100 +#: help.c:378 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "tipo de listado de comandos no soportado '%s'" -#: help.c:405 +#: help.c:418 msgid "The Git concept guides are:" msgstr "Las guías de conceptos de Git son:" -#: help.c:429 +#: help.c:442 msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos" +msgstr "Mira 'git help <comando>' para leer sobre los subcomandos específicos" -#: help.c:434 +#: help.c:447 msgid "External commands" msgstr "Comandos externos" -#: help.c:449 +#: help.c:462 msgid "Command aliases" msgstr "Aliases de comando" -#: help.c:527 +#: help.c:543 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4452,31 +4544,36 @@ msgstr "" "'%s' parece ser un comando de git, pero no hemos\n" "podido ejecutarlo. ¿Tal vez git-%s se ha roto?" -#: help.c:543 help.c:631 +#: help.c:565 help.c:662 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' no es un comando de git. Mira 'git --help'." -#: help.c:591 +#: help.c:613 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh oh. Tu sistema no reporta ningún comando de Git." -#: help.c:613 +#: help.c:635 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe." -#: help.c:618 +#: help.c:640 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuando asumiendo que quisiste decir '%s'." -#: help.c:623 +#: help.c:646 +#, c-format +msgid "Run '%s' instead? (y/N)" +msgstr "Ejecutar '%s' en su lugar? (y/N)" + +#: help.c:654 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Continuando en %0.1f segundos, asumiendo que quisiste decir '%s'." -#: help.c:635 +#: help.c:666 msgid "" "\n" "The most similar command is" @@ -4490,16 +4587,16 @@ msgstr[1] "" "\n" "Los comandos más similares son" -#: help.c:675 +#: help.c:706 msgid "git version [<options>]" msgstr "git version [<opciones>]" -#: help.c:730 +#: help.c:761 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:734 +#: help.c:765 msgid "" "\n" "Did you mean this?" @@ -4513,6 +4610,15 @@ msgstr[1] "" "\n" "¿Quisiste decir alguno de estos?" +#: hook.c:27 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n" +"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`." + #: ident.c:353 msgid "Author identity unknown\n" msgstr "Identidad del autor desconocido\n" @@ -4575,7 +4681,7 @@ msgstr "no se puede tener un nombre de identidad vacío (para <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:454 builtin/commit.c:647 +#: ident.c:454 builtin/commit.c:648 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inválido: %s" @@ -4656,7 +4762,7 @@ msgstr "" "No se puede crear '%s.lock': %s.\n" "\n" "Otro proceso git parece estar ejecutando en el repositorio, es decir\n" -"un editor abierto con 'git commit'. Por favor asegúrese de que todos los " +"un editor abierto con 'git commit'. Por favor asegúrate de que todos los " "procesos\n" "estén terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n" "puede haber roto el repositorio antes:\n" @@ -4672,7 +4778,12 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "invalid value '%s' for lsrefs.unborn" msgstr "valor inválido '%s' para lsrefs.unborn" -#: ls-refs.c:167 +#: ls-refs.c:174 +#, c-format +msgid "unexpected line: '%s'" +msgstr "línea inesperada: '%s'" + +#: ls-refs.c:178 msgid "expected flush after ls-refs arguments" msgstr "se esperaba un flush luego de argumentos ls-refs" @@ -4680,37 +4791,37 @@ msgstr "se esperaba un flush luego de argumentos ls-refs" msgid "quoted CRLF detected" msgstr "CRLF con comillas detectado" -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "mala acción '%s' para '%s'" -#: merge-ort.c:1569 merge-recursive.c:1201 +#: merge-ort.c:1584 merge-recursive.c:1211 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Falló al fusionar el submódulo %s (no revisado)" -#: merge-ort.c:1578 merge-recursive.c:1208 +#: merge-ort.c:1593 merge-recursive.c:1218 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Falló al fusionar el submódulo %s (commits no presentes)" -#: merge-ort.c:1587 merge-recursive.c:1215 +#: merge-ort.c:1602 merge-recursive.c:1225 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Falló el fusionar submódulo %s (commits no siguen la base de fusión)" -#: merge-ort.c:1597 merge-ort.c:1604 +#: merge-ort.c:1612 merge-ort.c:1620 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Nota: Fast-forward de submódulo %s a %s" -#: merge-ort.c:1625 +#: merge-ort.c:1642 #, c-format msgid "Failed to merge submodule %s" msgstr "Falló al fusionar el submódulo %s" -#: merge-ort.c:1632 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4720,7 +4831,7 @@ msgstr "" "fusión:\n" "%s\n" -#: merge-ort.c:1636 merge-recursive.c:1269 +#: merge-ort.c:1653 merge-recursive.c:1281 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4737,30 +4848,31 @@ msgstr "" "\n" "el cual aceptará esta sugerencia.\n" -#: merge-ort.c:1649 +#: merge-ort.c:1666 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" -"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n" +"Falló al fusionar el submódulo %s, pero existen múltiples fusiones " +"posibles:\n" "%s" -#: merge-ort.c:1868 merge-recursive.c:1358 +#: merge-ort.c:1887 merge-recursive.c:1372 msgid "Failed to execute internal merge" msgstr "Falló al ejecutar la fusión interna" -#: merge-ort.c:1873 merge-recursive.c:1363 +#: merge-ort.c:1892 merge-recursive.c:1377 #, c-format msgid "Unable to add %s to database" msgstr "No es posible agregar %s a la base de datos" -#: merge-ort.c:1880 merge-recursive.c:1396 +#: merge-ort.c:1899 merge-recursive.c:1410 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-ort.c:2019 merge-recursive.c:2118 +#: merge-ort.c:2038 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4770,7 +4882,7 @@ msgstr "" "existente en %s se interpone con el cambio de nombres implícito, poniendo " "la(s) siguiente(s) ruta(s) aquí: %s." -#: merge-ort.c:2029 merge-recursive.c:2128 +#: merge-ort.c:2048 merge-recursive.c:2142 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4779,7 +4891,7 @@ msgstr "" "CONFLICTO (cambio de nombre de directorio implícito): No se puede mapear más " "de una ruta para %s; cambio de nombre implícito intentó poner estas rutas: %s" -#: merge-ort.c:2087 +#: merge-ort.c:2106 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4790,7 +4902,7 @@ msgstr "" "cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, " "sin que ningún destino obtuviera la mayoría de los archivos." -#: merge-ort.c:2241 merge-recursive.c:2464 +#: merge-ort.c:2260 merge-recursive.c:2478 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4799,7 +4911,7 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-ort.c:2385 merge-recursive.c:3247 +#: merge-ort.c:2400 merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4808,7 +4920,7 @@ msgstr "" "Path actualizado: %s agregado en %s dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-ort.c:2392 merge-recursive.c:3254 +#: merge-ort.c:2407 merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4817,7 +4929,7 @@ msgstr "" "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-ort.c:2405 merge-recursive.c:3250 +#: merge-ort.c:2420 merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4826,7 +4938,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-ort.c:2413 merge-recursive.c:3257 +#: merge-ort.c:2428 merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4836,13 +4948,13 @@ msgstr "" "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " "movido a %s." -#: merge-ort.c:2569 +#: merge-ort.c:2584 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s." -#: merge-ort.c:2664 +#: merge-ort.c:2679 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4853,24 +4965,24 @@ msgstr "" "->%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede " "resultar en marcadores de conflicto anidados." -#: merge-ort.c:2683 merge-ort.c:2707 +#: merge-ort.c:2698 merge-ort.c:2722 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado " "en %s." -#: merge-ort.c:3182 merge-recursive.c:3008 +#: merge-ort.c:3212 merge-recursive.c:3022 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-ort.c:3185 merge-recursive.c:3011 +#: merge-ort.c:3215 merge-recursive.c:3025 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-ort.c:3613 +#: merge-ort.c:3644 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4879,7 +4991,7 @@ msgstr "" "CONFLICTO (archivo / directorio): directorio en el camino de %s de %s; " "moviéndolo a %s en su lugar." -#: merge-ort.c:3689 +#: merge-ort.c:3721 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4889,7 +5001,7 @@ msgstr "" "fueron renombrados para que cada uno pueda ser grabado en algún lugar " "diferente." -#: merge-ort.c:3696 +#: merge-ort.c:3728 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4899,24 +5011,24 @@ msgstr "" "ellos fue renombrado para que cada uno pueda ser grabado en algún lugar " "diferente." -#: merge-ort.c:3796 merge-recursive.c:3087 +#: merge-ort.c:3819 merge-recursive.c:3101 msgid "content" msgstr "contenido" -#: merge-ort.c:3798 merge-recursive.c:3091 +#: merge-ort.c:3821 merge-recursive.c:3105 msgid "add/add" msgstr "agregar/agregar" -#: merge-ort.c:3800 merge-recursive.c:3136 +#: merge-ort.c:3823 merge-recursive.c:3150 msgid "submodule" msgstr "submódulo" -#: merge-ort.c:3802 merge-recursive.c:3137 +#: merge-ort.c:3825 merge-recursive.c:3151 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusión en %s" -#: merge-ort.c:3833 +#: merge-ort.c:3856 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4925,7 +5037,7 @@ msgstr "" "CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. " "Versión %s de %s restante en el árbol." -#: merge-ort.c:4120 +#: merge-ort.c:4152 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4937,13 +5049,13 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4487 +#: merge-ort.c:4521 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" "la recopilación de información de fusión falló para los árboles %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3702 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4953,106 +5065,106 @@ msgstr "" "merge:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 msgid "Already up to date." msgstr "Ya está actualizado." -#: merge-recursive.c:352 +#: merge-recursive.c:353 msgid "(bad commit)\n" msgstr "(commit erróneo)\n" -#: merge-recursive.c:375 +#: merge-recursive.c:381 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión." -#: merge-recursive.c:384 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo falló al refrescar la ruta '%s'; abortando fusión." -#: merge-recursive.c:872 +#: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "falló al crear la ruta '%s'%s" -#: merge-recursive.c:883 +#: merge-recursive.c:892 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Quitando %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:897 merge-recursive.c:916 +#: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr ": ¿tal vez un conflicto D/F?" -#: merge-recursive.c:906 +#: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "rehusando perder el archivo no rastreado en '%s'" -#: merge-recursive.c:947 builtin/cat-file.c:41 +#: merge-recursive.c:956 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:952 +#: merge-recursive.c:961 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:977 +#: merge-recursive.c:986 #, c-format msgid "failed to open '%s': %s" msgstr "falló al abrir '%s': %s" -#: merge-recursive.c:988 +#: merge-recursive.c:997 #, c-format msgid "failed to symlink '%s': %s" msgstr "falló al crear el enlace simbólico '%s': %s" -#: merge-recursive.c:993 +#: merge-recursive.c:1002 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no sé qué hacer con %06o %s '%s'" -#: merge-recursive.c:1223 merge-recursive.c:1235 +#: merge-recursive.c:1233 merge-recursive.c:1246 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Haciendo fast-forward a submódulo %s hasta el siguiente commit:" -#: merge-recursive.c:1226 merge-recursive.c:1238 +#: merge-recursive.c:1236 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rápido en submódulo %s" -#: merge-recursive.c:1261 +#: merge-recursive.c:1273 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)" -#: merge-recursive.c:1265 +#: merge-recursive.c:1277 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Falló al fusionar el submódulo %s (avance rápido no es posible)" -#: merge-recursive.c:1266 +#: merge-recursive.c:1278 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" -#: merge-recursive.c:1278 +#: merge-recursive.c:1290 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Falló al fusionar el submódulo %s (múltiples fusiones encontradas)" -#: merge-recursive.c:1420 +#: merge-recursive.c:1434 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en " "cambio." -#: merge-recursive.c:1492 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5061,7 +5173,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Se dejó la versión %s de " "%s en el árbol." -#: merge-recursive.c:1497 +#: merge-recursive.c:1511 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5070,7 +5182,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol." -#: merge-recursive.c:1504 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5079,7 +5191,7 @@ msgstr "" "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " "dejada en el árbol, en %s." -#: merge-recursive.c:1509 +#: merge-recursive.c:1523 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5088,44 +5200,44 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol en %s." -#: merge-recursive.c:1544 +#: merge-recursive.c:1558 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1544 +#: merge-recursive.c:1558 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" -#: merge-recursive.c:1605 +#: merge-recursive.c:1619 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Rehusando perder el archivo no rastreado en %s, incluso aunque se está " "interponiendo." -#: merge-recursive.c:1663 +#: merge-recursive.c:1677 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" -#: merge-recursive.c:1694 +#: merge-recursive.c:1708 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s es un directorio en %s agregando como %s más bien" -#: merge-recursive.c:1699 +#: merge-recursive.c:1713 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio" -#: merge-recursive.c:1726 +#: merge-recursive.c:1740 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5134,18 +5246,18 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1731 +#: merge-recursive.c:1745 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1823 +#: merge-recursive.c:1837 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:2086 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5156,7 +5268,7 @@ msgstr "" "colocar %s porque el directorio %s fue renombrado a múltiples otros " "directorios, sin ningún que contenga la mayoría de archivos." -#: merge-recursive.c:2220 +#: merge-recursive.c:2234 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5165,81 +5277,81 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:3075 +#: merge-recursive.c:3089 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3075 +#: merge-recursive.c:3089 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3114 +#: merge-recursive.c:3128 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3167 +#: merge-recursive.c:3181 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:3371 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3394 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3399 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3406 +#: 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:3415 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3424 +#: 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:3477 +#: 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:3571 +#: merge-recursive.c:3585 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3584 +#: merge-recursive.c:3598 #, 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:3634 +#: merge-recursive.c:3648 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3799 +#: merge-recursive.c:3816 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 -#: builtin/stash.c:473 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 +#: builtin/stash.c:489 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -5247,196 +5359,228 @@ msgstr "Incapaz de escribir el índice." msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 -#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 -#: builtin/stash.c:267 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 +#: builtin/stash.c:269 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" -#: midx.c:74 +#: midx.c:78 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "" "el abanico de OID de índice de paquetes múltiples es del tamaño incorrecto" -#: midx.c:105 +#: midx.c:109 #, c-format msgid "multi-pack-index file %s is too small" msgstr "el archivo multi-pack-index %s es demasiado pequeño" -#: midx.c:121 +#: midx.c:125 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x" -#: midx.c:126 +#: midx.c:130 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versión %d de multi-pack-index no reconocida" -#: midx.c:131 +#: midx.c:135 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" "la versión de hash de índice de paquetes múltiples %u no coincide con la " "versión %u" -#: midx.c:148 +#: midx.c:152 msgid "multi-pack-index missing required pack-name chunk" msgstr "a multi-pack-index le falta el conjunto pack-name requerido" -#: midx.c:150 +#: midx.c:154 msgid "multi-pack-index missing required OID fanout chunk" msgstr "a multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:152 +#: midx.c:156 msgid "multi-pack-index missing required OID lookup chunk" msgstr "a multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:154 +#: midx.c:158 msgid "multi-pack-index missing required object offsets chunk" msgstr "a multi-pack-index le falta el conjunto de offset del objeto requerido" -#: midx.c:170 +#: midx.c:174 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "nombres de paquete de multi-pack-index fuera de orden: '%s' antes de '%s'" -#: midx.c:214 +#: midx.c:221 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mal pack-int-id: %u (%u paquetes totales)" -#: midx.c:264 +#: midx.c:271 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index guarda un offset de 64-bit, pero off_t es demasiado pequeño" -#: midx.c:490 +#: midx.c:502 #, c-format msgid "failed to add packfile '%s'" msgstr "falló al agregar packfile '%s'" -#: midx.c:496 +#: midx.c:508 #, c-format msgid "failed to open pack-index '%s'" msgstr "falló al abrir pack-index '%s'" -#: midx.c:564 +#: midx.c:576 #, c-format msgid "failed to locate object %d in packfile" msgstr "falló al ubicar objeto %d en packfile" -#: midx.c:880 builtin/index-pack.c:1533 +#: midx.c:892 msgid "cannot store reverse index file" msgstr "no se puede almacenar el archivo de índice inverso" -#: midx.c:920 +#: midx.c:990 +#, c-format +msgid "could not parse line: %s" +msgstr "no se puede analizar línea: %s" + +#: midx.c:992 +#, c-format +msgid "malformed line: %s" +msgstr "línea mal formada: %s" + +#: midx.c:1159 msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "ignorando el actual multi-pack-index; checksum no concuerda" -#: midx.c:943 -msgid "Adding packfiles to multi-pack-index" -msgstr "Agregando packfiles a multi-pack-index" +#: midx.c:1184 +msgid "could not load pack" +msgstr "no se pudo cargar pack" -#: midx.c:989 +#: midx.c:1190 #, c-format -msgid "did not see pack-file %s to drop" -msgstr "no se vió el pack-file que abandonar %s" +msgid "could not open index for %s" +msgstr "no se puede abrir index para %s" + +#: midx.c:1201 +msgid "Adding packfiles to multi-pack-index" +msgstr "Agregando packfiles a multi-pack-index" -#: midx.c:1034 +#: midx.c:1244 #, c-format msgid "unknown preferred pack: '%s'" msgstr "pack preferido desconocido: '%s'" -#: midx.c:1039 +#: midx.c:1289 +#, c-format +msgid "cannot select preferred pack %s with no objects" +msgstr "no se pueden seleccionar el paquete preferido %s sin objetos" + +#: midx.c:1321 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "no se vió el pack-file que abandonar %s" + +#: midx.c:1367 #, c-format msgid "preferred pack '%s' is expired" msgstr "pack de referencia '% s' ha expirado" -#: midx.c:1055 +#: midx.c:1380 msgid "no pack files to index." msgstr "no hay archivos pack para indexar." -#: midx.c:1135 builtin/clean.c:37 +#: midx.c:1417 +msgid "could not write multi-pack bitmap" +msgstr "no se pudo escribir bitmap multi-paquete" + +#: midx.c:1427 +msgid "could not write multi-pack-index" +msgstr "no se pudo escribir multi-pack-index" + +#: midx.c:1486 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "falló al borrar %s" -#: midx.c:1166 +#: midx.c:1517 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falló al limpiar multi-pack-index en %s" -#: midx.c:1225 +#: midx.c:1577 msgid "multi-pack-index file exists, but failed to parse" msgstr "" "el archivo de índice de paquetes múltiples existe, pero no se pudo analizar" -#: midx.c:1233 +#: midx.c:1585 msgid "incorrect checksum" msgstr "checksum incorrecto" -#: midx.c:1236 +#: midx.c:1588 msgid "Looking for referenced packfiles" msgstr "Buscando packfiles referidos" -#: midx.c:1251 +#: midx.c:1603 #, 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:1256 +#: midx.c:1608 msgid "the midx contains no oid" msgstr "el midx no contiene oid" -#: midx.c:1265 +#: midx.c:1617 msgid "Verifying OID order in multi-pack-index" msgstr "Verificando orden de OID en multi-pack-index" -#: midx.c:1274 +#: midx.c:1626 #, 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:1294 +#: midx.c:1646 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1301 +#: midx.c:1653 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1317 +#: midx.c:1669 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1323 +#: midx.c:1675 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "falló al cargar el pack-index para packfile %s" -#: midx.c:1332 +#: midx.c:1684 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1357 +#: midx.c:1709 msgid "Counting referenced objects" msgstr "Contando objetos no referenciados" -#: midx.c:1367 +#: midx.c:1719 msgid "Finding and deleting unreferenced packfiles" msgstr "Encontrando y borrando packfiles sin referencias" -#: midx.c:1558 +#: midx.c:1911 msgid "could not start pack-objects" msgstr "no se pudo iniciar pack-objects" -#: midx.c:1578 +#: midx.c:1931 msgid "could not finish pack-objects" msgstr "no se pudo finalizar pack-objects" @@ -5462,7 +5606,7 @@ msgid "" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" -"No has concluido tu fusión preia de notas (%s existe).\n" +"No has concluido tu fusión previa de notas (%s existe).\n" "Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para " "confirmar/abortar la fusión previa antes de comenzar una nueva fusión de " "notas." @@ -5496,262 +5640,262 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor erróneo para %s: '%s'" -#: object-file.c:526 +#: object-file.c:459 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "directorio de objetos %s no existe; revisa .git/objects/info/alternates" -#: object-file.c:584 +#: object-file.c:517 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "incapaz de normalizar la ruta de objeto alterno: %s" -#: object-file.c:658 +#: object-file.c:591 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorando espacios de objetos alternos, anidado demasiado profundo" -#: object-file.c:665 +#: object-file.c:598 #, c-format msgid "unable to normalize object directory: %s" msgstr "incapaz de normalizar directorio de objetos: %s" -#: object-file.c:708 +#: object-file.c:641 msgid "unable to fdopen alternates lockfile" msgstr "no es posible hacer fdopen en lockfile alternos" -#: object-file.c:726 +#: object-file.c:659 msgid "unable to read alternates file" msgstr "no es posible leer el archivo de alternativos" -#: object-file.c:733 +#: object-file.c:666 msgid "unable to move new alternates file into place" msgstr "no es posible mover el nuevo archivo de alternativos al lugar" -#: object-file.c:768 +#: object-file.c:701 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: object-file.c:789 +#: object-file.c:722 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "repositorio de referencia '%s' como un checkout vinculado no es soportado " "todavía." -#: object-file.c:795 +#: object-file.c:728 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: object-file.c:801 +#: object-file.c:734 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: object-file.c:809 +#: object-file.c:742 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" -#: object-file.c:869 +#: object-file.c:773 +#, c-format +msgid "could not find object directory matching %s" +msgstr "no se pudo encontrar el directorio de objetos concordante con %s" + +#: object-file.c:823 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "línea inválida mientras se analizaban refs alternas: %s" -#: object-file.c:1019 +#: object-file.c:973 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" -#: object-file.c:1054 +#: object-file.c:1008 #, c-format msgid "mmap failed%s" msgstr "mmap falló %s" -#: object-file.c:1218 +#: object-file.c:1174 #, c-format msgid "object file %s is empty" msgstr "archivo de objeto %s está vacío" -#: object-file.c:1353 object-file.c:2548 +#: object-file.c:1293 object-file.c:2499 #, c-format msgid "corrupt loose object '%s'" msgstr "objeto suelto corrupto '%s'" -#: object-file.c:1355 object-file.c:2552 +#: object-file.c:1295 object-file.c:2503 #, c-format msgid "garbage at end of loose object '%s'" msgstr "basura al final del objeto suelto '%s'" -#: object-file.c:1397 +#: object-file.c:1417 +#, c-format +msgid "unable to parse %s header" +msgstr "incapaz de analizar header %s" + +#: object-file.c:1419 msgid "invalid object type" msgstr "tipo de objeto inválido" -#: object-file.c:1481 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "no es posible desempacar header %s con --allow-unknown-type" - -#: object-file.c:1484 +#: object-file.c:1430 #, c-format msgid "unable to unpack %s header" msgstr "incapaz de desempaquetar header %s" -#: object-file.c:1490 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "no es posible analizar header %s con --allow-unknown-type" - -#: object-file.c:1493 +#: object-file.c:1434 #, c-format -msgid "unable to parse %s header" -msgstr "incapaz de analizar header %s" +msgid "header for %s too long, exceeds %d bytes" +msgstr "cabecera para %s es muy larga, excede %d bytes" -#: object-file.c:1717 +#: object-file.c:1664 #, c-format msgid "failed to read object %s" msgstr "falló al leer objeto %s" -#: object-file.c:1721 +#: object-file.c:1668 #, c-format msgid "replacement %s not found for %s" msgstr "reemplazo %s no encontrado para %s" -#: object-file.c:1725 +#: object-file.c:1672 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "objeto suelto %s (guardado en %s) está corrompido" -#: object-file.c:1729 +#: object-file.c:1676 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "objeto empaquetado %s (guardado en %s) está corrompido" -#: object-file.c:1834 +#: object-file.c:1781 #, c-format msgid "unable to write file %s" msgstr "no es posible escribir archivo %s" -#: object-file.c:1841 +#: object-file.c:1788 #, c-format msgid "unable to set permission to '%s'" msgstr "no se pudo poner permisos a '%s'" -#: object-file.c:1848 +#: object-file.c:1795 msgid "file write error" msgstr "falló de escritura" -#: object-file.c:1868 +#: object-file.c:1815 msgid "error when closing loose object file" msgstr "error al cerrar el archivo de objeto suelto" -#: object-file.c:1933 +#: object-file.c:1882 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permisos insuficientes para agregar un objeto a la base de datos del " "repositorio %s" -#: object-file.c:1935 +#: object-file.c:1884 msgid "unable to create temporary file" msgstr "no es posible crear un archivo temporal" -#: object-file.c:1959 +#: object-file.c:1908 msgid "unable to write loose object file" msgstr "no es posible escribir el archivo de objeto suelto" -#: object-file.c:1965 +#: object-file.c:1914 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no es posible desinflar el objeto nuevo %s (%d)" -#: object-file.c:1969 +#: object-file.c:1918 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd en objeto %s falló (%d)" -#: object-file.c:1973 +#: object-file.c:1922 #, c-format msgid "confused by unstable object source data for %s" msgstr "confundido por fuente de data de objetos inestable para %s" -#: object-file.c:1983 builtin/pack-objects.c:1237 +#: object-file.c:1933 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "falló utime() en %s" -#: object-file.c:2060 +#: object-file.c:2011 #, c-format msgid "cannot read object for %s" msgstr "no se pudo leer el objeto para %s" -#: object-file.c:2111 +#: object-file.c:2062 msgid "corrupt commit" msgstr "commit corrupto" -#: object-file.c:2119 +#: object-file.c:2070 msgid "corrupt tag" msgstr "tag corrupto" -#: object-file.c:2219 +#: object-file.c:2170 #, c-format msgid "read error while indexing %s" msgstr "error de lectura al indexar %s" -#: object-file.c:2222 +#: object-file.c:2173 #, c-format msgid "short read while indexing %s" msgstr "lectura corta al indexar %s" -#: object-file.c:2295 object-file.c:2305 +#: object-file.c:2246 object-file.c:2256 #, c-format msgid "%s: failed to insert into database" msgstr "%s: falló al insertar en la base de datos" -#: object-file.c:2311 +#: object-file.c:2262 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo de archivo no soportado" -#: object-file.c:2335 +#: object-file.c:2286 builtin/fetch.c:1445 #, c-format msgid "%s is not a valid object" msgstr "%s no es objeto válido" -#: object-file.c:2337 +#: object-file.c:2288 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no es un objeto '%s' válido" -#: object-file.c:2364 builtin/index-pack.c:192 +#: object-file.c:2315 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: object-file.c:2559 object-file.c:2612 +#: object-file.c:2510 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash no concuerda para %s (se esperaba %s)" -#: object-file.c:2583 +#: object-file.c:2533 #, c-format msgid "unable to mmap %s" msgstr "no es posible hacer mmap a %s" -#: object-file.c:2588 +#: object-file.c:2539 #, c-format msgid "unable to unpack header of %s" msgstr "incapaz de desempaquetar header de %s" -#: object-file.c:2594 +#: object-file.c:2544 #, c-format msgid "unable to parse header of %s" msgstr "incapaz de analizar header de %s" -#: object-file.c:2605 +#: object-file.c:2555 #, c-format msgid "unable to unpack contents of %s" msgstr "no es posible desempaquetar contenidos de %s" @@ -5880,12 +6024,25 @@ msgstr "incapaz de analizar objeto: %s" msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 +#: pack-bitmap.c:348 +msgid "multi-pack bitmap is missing required reverse index" +msgstr "a multi-pack-index le falta un índice reveretido" + +#: pack-bitmap.c:424 +msgid "load_reverse_index: could not open pack" +msgstr "load_reverse_index: no se pudo abrir el paquete" + +#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "no se pudo obtener el tamaño de %s" -#: pack-bitmap.c:1571 builtin/rev-list.c:92 +#: pack-bitmap.c:1916 +#, c-format +msgid "could not find %s in pack %s at offset %<PRIuMAX>" +msgstr "no se pudo encontrar %s en paquete %s en el offset %<PRIuMAX>" + +#: pack-bitmap.c:1952 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "no se puede obtener el uso de disco de %s" @@ -5915,47 +6072,47 @@ msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>" msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>" -#: pack-write.c:250 +#: pack-write.c:251 msgid "cannot both write and verify reverse index" msgstr "no puede escribir y verificar el índice inverso" -#: pack-write.c:271 +#: pack-write.c:270 #, c-format msgid "could not stat: %s" msgstr "no se pudo hacer stat: %s" -#: pack-write.c:283 +#: pack-write.c:282 #, c-format msgid "failed to make %s readable" msgstr "no pudo hacer %s legible" -#: pack-write.c:522 +#: pack-write.c:520 #, c-format msgid "could not write '%s' promisor file" msgstr "no se pudo escribir el archivo promisor '%s'" -#: packfile.c:625 +#: packfile.c:626 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (¿.idx roto?)" -#: packfile.c:655 +#: packfile.c:656 #, c-format msgid "packfile %s cannot be mapped%s" msgstr "objeto %s no puede ser mapeado %s" -#: packfile.c:1934 +#: packfile.c:1923 #, 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:1938 +#: packfile.c:1927 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset más allá del índice de fin de paquete para %s (¿índice truncado?)" -#: parse-options-cb.c:20 parse-options-cb.c:24 +#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "opción `%s' espera un valor numérico" @@ -5975,71 +6132,71 @@ msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\"" msgid "malformed object name '%s'" msgstr "nombre de objeto mal formado '%s'" -#: parse-options.c:38 +#: parse-options.c:58 #, c-format msgid "%s requires a value" msgstr "%s requiere un valor" -#: parse-options.c:73 +#: parse-options.c:93 #, c-format msgid "%s is incompatible with %s" msgstr "%s es incompatible con %s" -#: parse-options.c:78 +#: parse-options.c:98 #, c-format msgid "%s : incompatible with something else" msgstr "%s : incompatible con otra cosa" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:112 parse-options.c:116 #, c-format msgid "%s takes no value" msgstr "%s no toma valores" -#: parse-options.c:94 +#: parse-options.c:114 #, c-format msgid "%s isn't available" msgstr "%s no está disponible" -#: parse-options.c:217 +#: parse-options.c:237 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g" -#: parse-options.c:386 +#: parse-options.c:393 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:427 parse-options.c:435 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "¿quisiste decir `--%s` (con dos guiones)?" -#: parse-options.c:668 parse-options.c:988 +#: parse-options.c:677 parse-options.c:1053 #, c-format msgid "alias of --%s" msgstr "alias de --%s" -#: parse-options.c:879 +#: parse-options.c:891 #, c-format msgid "unknown option `%s'" msgstr "opción `%s' desconocida" -#: parse-options.c:881 +#: parse-options.c:893 #, c-format msgid "unknown switch `%c'" msgstr "switch desconocido `%c'" -#: parse-options.c:883 +#: parse-options.c:895 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opción desconocida en string no ascii: `%s'" -#: parse-options.c:907 +#: parse-options.c:919 msgid "..." msgstr "..." -#: parse-options.c:926 +#: parse-options.c:933 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -6047,49 +6204,73 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:932 +#: parse-options.c:948 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:935 +#. TRANSLATORS: You should only need to translate this format +#. string if your language is a RTL language (e.g. Arabic, +#. Hebrew etc.), not if it's a LTR language (e.g. German, +#. Russian, Chinese etc.). +#. * +#. When a translated usage string has an embedded "\n" it's +#. because options have wrapped to the next line. The line +#. after the "\n" will then be padded to align with the +#. command name, such as N_("git cmd [opt]\n<8 +#. spaces>[opt2]"), where the 8 spaces are the same length as +#. "git cmd ". +#. * +#. This format string prints out that already-translated +#. line. The "%*s" is whitespace padding to account for the +#. padding at the start of the line that we add in this +#. function. The "%s" is a line in the (hopefully already +#. translated) N_() usage string, which contained embedded +#. newlines before we split it up. +#. +#: parse-options.c:969 +#, c-format +msgid "%*s%s" +msgstr "%*s%s" + +#: parse-options.c:992 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:974 +#: parse-options.c:1039 msgid "-NUM" msgstr "-NUM" -#: path.c:915 +#: path.c:922 #, c-format msgid "Could not make %s writable by group" msgstr "No se pudo hacer que %s fuera escribible por el grupo" -#: pathspec.c:151 +#: pathspec.c:150 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:169 +#: pathspec.c:168 msgid "Only one 'attr:' specification is allowed." msgstr "Solo se permite una única especificación 'attr'." -#: pathspec.c:172 +#: pathspec.c:171 msgid "attr spec must not be empty" msgstr "la especificación attr no puede estar vacía" -#: pathspec.c:215 +#: pathspec.c:214 #, c-format msgid "invalid attribute name %s" msgstr "nombre de atributo %s inválido" -#: pathspec.c:280 +#: pathspec.c:279 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles" -#: pathspec.c:287 +#: pathspec.c:286 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -6097,54 +6278,54 @@ 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:327 +#: pathspec.c:326 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parámetro no válido para la magia de pathspec 'prefix'" -#: pathspec.c:348 +#: pathspec.c:347 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magia de pathspec inválida '%.*s' en '%s'" -#: pathspec.c:353 +#: pathspec.c:352 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta ')' al final de la magia de pathspec en '%s'" -#: pathspec.c:391 +#: pathspec.c:390 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magia de pathspec '%c' no implementada en '%s'" -#: pathspec.c:450 +#: pathspec.c:449 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' y 'glob' son incompatibles" -#: pathspec.c:466 +#: pathspec.c:465 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: '%s' está fuera del repositorio en '%s'" -#: pathspec.c:542 +#: pathspec.c:541 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (nemotécnico: '%c')" -#: pathspec.c:552 +#: pathspec.c:551 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magia de pathspec no soportada por este comando: %s" -#: pathspec.c:619 +#: pathspec.c:618 #, 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:664 +#: pathspec.c:663 #, c-format msgid "line is badly quoted: %s" -msgstr "la línea está mál entrecomillada: %s" +msgstr "la línea está mal entrecomillada: %s" #: pkt-line.c:92 msgid "unable to write flush packet" @@ -6162,7 +6343,7 @@ msgstr "no es posible escribir paquete de respuesta final" msgid "flush packet write failed" msgstr "limpieza de escritura de paquetes falló" -#: pkt-line.c:153 pkt-line.c:265 +#: pkt-line.c:153 msgid "protocol error: impossibly long line" msgstr "error de protocolo: línea imposiblemente larga" @@ -6170,7 +6351,7 @@ msgstr "error de protocolo: línea imposiblemente larga" msgid "packet write with format failed" msgstr "escritura de paquetes con formato falló" -#: pkt-line.c:204 +#: pkt-line.c:204 pkt-line.c:252 msgid "packet write failed - data exceeds max packet size" msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete" @@ -6179,25 +6360,25 @@ msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete msgid "packet write failed: %s" msgstr "escritura de paquetes falló: %s" -#: pkt-line.c:328 pkt-line.c:329 +#: pkt-line.c:349 pkt-line.c:350 msgid "read error" msgstr "error de lectura" -#: pkt-line.c:339 pkt-line.c:340 +#: pkt-line.c:360 pkt-line.c:361 msgid "the remote end hung up unexpectedly" msgstr "el remoto se colgó de manera inesperada" -#: pkt-line.c:369 pkt-line.c:371 +#: pkt-line.c:390 pkt-line.c:392 #, c-format msgid "protocol error: bad line length character: %.4s" -msgstr "error de protocolo: mal caracter de largo de línea: %.4s" +msgstr "error de protocolo: mal carácter de largo de línea: %.4s" -#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 +#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 #, c-format msgid "protocol error: bad line length %d" msgstr "error de protocolo: mal largo de línea %d" -#: pkt-line.c:413 sideband.c:165 +#: pkt-line.c:434 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "error remoto: %s" @@ -6211,21 +6392,21 @@ msgstr "Refrescando index" msgid "unable to create threaded lstat: %s" msgstr "no es posible crear lstat hilado: %s" -#: pretty.c:988 +#: pretty.c:1051 msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato de --pretty" #: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación" +msgstr "promisor-remote: no se puede bifurcar el subproceso de fetch" #: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" -msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso" +msgstr "promisor-remote: no se pudo escribir al subproceso de fetch" #: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso" +msgstr "promisor-remote: no se pudo cerrar stdin al subproceso de fetch" #: promisor-remote.c:54 #, c-format @@ -6240,20 +6421,20 @@ msgstr "info de objeto: se espera flush tras argumentos" msgid "Removing duplicate objects" msgstr "Quitando objetos duplicados" -#: range-diff.c:78 +#: range-diff.c:67 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:80 +#: range-diff.c:69 msgid "could not read `log` output" msgstr "no se pudo leer salida de `log`" -#: range-diff.c:101 sequencer.c:5550 +#: range-diff.c:97 sequencer.c:5605 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:115 +#: range-diff.c:111 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -6262,12 +6443,12 @@ msgstr "" "no se pudo leer la primera línea de salida de `log`: no comienza con 'commit " "': '%s'" -#: range-diff.c:140 +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "no se puede analizar git header '%.*s'" -#: range-diff.c:307 +#: range-diff.c:304 msgid "failed to generate diff" msgstr "falló al generar diff" @@ -6296,7 +6477,7 @@ msgstr "" "%s: solo se pueden agregar archivos regulares, symbolic links o git-" "directories" -#: read-cache.c:753 +#: read-cache.c:753 builtin/submodule--helper.c:3241 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' no tiene un commit checked out" @@ -6316,16 +6497,16 @@ msgstr "no es posible agregar '%s' al index" msgid "unable to stat '%s'" msgstr "incapaz de hacer stat en '%s'" -#: read-cache.c:1358 +#: read-cache.c:1373 #, 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:1573 +#: read-cache.c:1588 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1705 +#: read-cache.c:1720 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6334,7 +6515,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1715 +#: read-cache.c:1730 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6343,143 +6524,143 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1771 +#: read-cache.c:1786 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1774 +#: read-cache.c:1789 #, c-format msgid "bad index version %d" msgstr "mala versión de índice %d" -#: read-cache.c:1783 +#: read-cache.c:1798 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1817 +#: read-cache.c:1832 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index usa la extensión %.4s, cosa que no entendemos" -#: read-cache.c:1819 +#: read-cache.c:1834 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensión %.4s" -#: read-cache.c:1856 +#: read-cache.c:1871 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de índice desconocido 0x%08x" -#: read-cache.c:1872 +#: read-cache.c:1887 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nombre malformado en el índice, cerca de ruta '%s'" -#: read-cache.c:1929 +#: read-cache.c:1944 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1932 +#: read-cache.c:1947 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "múltiples entradas de stage para archivo fusionado '%s'" -#: read-cache.c:1935 +#: read-cache.c:1950 #, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" -#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 -#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:333 +#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 +#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 +#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 msgid "index file corrupt" msgstr "archivo índice corrompido" -#: read-cache.c:2185 +#: read-cache.c:2209 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2198 +#: read-cache.c:2222 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entries: %s" -#: read-cache.c:2231 +#: read-cache.c:2255 #, c-format msgid "%s: index file open failed" msgstr "%s: falló al abrir el archivo index" -#: read-cache.c:2235 +#: read-cache.c:2259 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: no se puede hacer stat en el índice abierto" -#: read-cache.c:2239 +#: read-cache.c:2263 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index más pequeño de lo esperado" -#: read-cache.c:2243 +#: read-cache.c:2267 #, c-format msgid "%s: unable to map index file%s" msgstr "%s: no se pudo mapear el archivo index %s" -#: read-cache.c:2286 +#: read-cache.c:2310 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2313 +#: read-cache.c:2337 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2351 +#: read-cache.c:2375 #, c-format msgid "could not freshen shared index '%s'" msgstr "no se pudo refrescar el índice compartido '%s'" -#: read-cache.c:2398 +#: read-cache.c:2434 #, 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:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 +#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3075 +#: read-cache.c:3108 msgid "failed to convert to a sparse-index" msgstr "falló al convertir a un índice sparse" -#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 +#: read-cache.c:3179 #, c-format msgid "could not stat '%s'" msgstr "no se pudo hacer stat en '%s'" -#: read-cache.c:3159 +#: read-cache.c:3192 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3171 +#: read-cache.c:3204 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3200 +#: read-cache.c:3233 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3349 +#: read-cache.c:3390 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: no se puede eliminar hasta stage #0" @@ -6536,13 +6717,13 @@ msgstr "" "\t, a menos que se use -C, en cuyo caso\n" "\tmantiene solo el mensaje del commit; -c es lo mismo que -C\n" "\tpero abre el editor\n" -"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n" +"x, exec <commit> = ejecutar comando (el resto de la línea) usando un shell\n" "b, break = parar aquí (continuar rebase luego con 'git rebase --continue')\n" "d, drop <commit> = eliminar commit\n" "l, label <label> = poner label al HEAD actual con un nombre\n" "t, reset <label> = reiniciar HEAD al label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". crea un commit de fusión usando el mensaje original de\n" +". crear un commit de fusión usando el mensaje original de\n" ". fusión (o la línea de oneline, si no se especifica un mensaje\n" ". de commit). Use -c <commit> para reescribir el mensaje del commit.\n" "\n" @@ -6556,7 +6737,7 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase %s en %s (%d comando)" msgstr[1] "Rebase %s en %s (%d comandos)" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -6564,7 +6745,7 @@ msgstr "" "\n" "No elimines ninguna línea. Usa 'drop' explícitamente para borrar un commit.\n" -#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -6572,7 +6753,7 @@ msgstr "" "\n" "Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n" -#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6586,7 +6767,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -6596,14 +6777,14 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 -#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 +#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 +#: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" -#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 -#: builtin/rebase.c:253 +#: rebase-interactive.c:119 #, c-format msgid "could not write '%s'." msgstr "no se pudo escribir '%s'." @@ -6627,20 +6808,18 @@ msgid "" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" -"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un " +"Para evitar este mensaje, usa \"drop\" para eliminar de forma explícita un " "commit.\n" "\n" -"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de " +"Usa 'git config rebase.missingCommitsCheck' para cambiar el nivel de " "advertencias.\n" "Los posibles comportamientos son: ignore, warn, error.\n" "\n" -#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 -#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 -#: builtin/rebase.c:265 +#: rebase.c:29 #, c-format -msgid "could not read '%s'." -msgstr "no se puede leer '%s'." +msgid "%s: 'preserve' superseded by 'merges'" +msgstr "%s: 'preserve' es supercedido por 'merges'" #: ref-filter.c:42 wt-status.c:2036 msgid "gone" @@ -6661,132 +6840,142 @@ msgstr "detrás %d" msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:230 +#: ref-filter.c:235 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:232 +#: ref-filter.c:237 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:254 +#: ref-filter.c:259 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:258 +#: ref-filter.c:263 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:260 +#: ref-filter.c:265 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento %%(%s) no reconocido: %s" -#: ref-filter.c:315 +#: ref-filter.c:320 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningún argumento" -#: ref-filter.c:339 +#: ref-filter.c:344 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argumento %%(objectsize) no reconocido: %s" -#: ref-filter.c:347 +#: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) no toma argumentos" -#: ref-filter.c:359 +#: ref-filter.c:364 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:372 +#: ref-filter.c:377 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "argumento %%(subject) no reconocido: %s" -#: ref-filter.c:391 +#: ref-filter.c:396 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "se esperaba %%(trailers:key=<value>)" -#: ref-filter.c:393 +#: ref-filter.c:398 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argumento %%(trailers) desconocido: %s" -#: ref-filter.c:424 +#: ref-filter.c:429 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:426 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %%(contents) no reconocido: %s" -#: ref-filter.c:441 +#: ref-filter.c:443 +#, c-format +msgid "unrecognized %%(raw) argument: %s" +msgstr "argumento %%(raw) no reconocido: %s" + +#: ref-filter.c:458 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "valor positivo esperado '%s' en %%(%s)" -#: ref-filter.c:445 +#: ref-filter.c:462 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "argumento '%s' no reconocido en %%(%s)" -#: ref-filter.c:459 +#: ref-filter.c:476 #, c-format msgid "unrecognized email option: %s" msgstr "opción de email desconocida: %s" -#: ref-filter.c:489 +#: ref-filter.c:506 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:501 +#: ref-filter.c:518 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:508 +#: ref-filter.c:525 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:517 +#: ref-filter.c:534 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:525 +#: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:543 +#: ref-filter.c:560 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento %%(if) no reconocido: %s" -#: ref-filter.c:645 +#: ref-filter.c:568 +#, c-format +msgid "%%(rest) does not take arguments" +msgstr "%%(rest) no toma ningún argumento" + +#: ref-filter.c:680 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:672 +#: ref-filter.c:707 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:676 +#: ref-filter.c:711 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -6794,126 +6983,136 @@ msgstr "" "no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos " "de objeto" -#: ref-filter.c:801 +#: ref-filter.c:844 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:865 +#: ref-filter.c:910 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:867 +#: ref-filter.c:912 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: átomo %%(then) usado más de una vez" -#: ref-filter.c:869 +#: ref-filter.c:914 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:897 +#: ref-filter.c:946 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:899 +#: ref-filter.c:948 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" -#: ref-filter.c:901 +#: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: átomo %%(else) usado más de una vez" -#: ref-filter.c:916 +#: ref-filter.c:965 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:973 +#: ref-filter.c:1027 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1621 +#: ref-filter.c:1033 +#, c-format +msgid "this command reject atom %%(%.*s)" +msgstr "este comando rechaza el átomo %%(%.*s)" + +#: ref-filter.c:1040 +#, c-format +msgid "--format=%.*s cannot be used with --python, --shell, --tcl" +msgstr "--format=%.*s no se puede usar con --python, --shell, --tcl" + +#: ref-filter.c:1706 #, c-format msgid "(no branch, rebasing %s)" msgstr "(no hay rama, rebasando %s)" -#: ref-filter.c:1624 +#: ref-filter.c:1709 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(no hay rama, rebasando con HEAD desacoplado %s)" -#: ref-filter.c:1627 +#: ref-filter.c:1712 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(no hay rama, comenzando biseccón en %s)" -#: ref-filter.c:1631 +#: ref-filter.c:1716 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD desacoplado en %s)" -#: ref-filter.c:1634 +#: ref-filter.c:1719 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD desacoplado de %s)" -#: ref-filter.c:1637 +#: ref-filter.c:1722 msgid "(no branch)" msgstr "(sin rama)" -#: ref-filter.c:1669 ref-filter.c:1880 +#: ref-filter.c:1754 ref-filter.c:1972 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1679 +#: ref-filter.c:1764 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:2064 +#: ref-filter.c:2155 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:2153 +#: ref-filter.c:2245 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2158 refs.c:676 +#: ref-filter.c:2250 refs.c:673 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: ref-filter.c:2502 +#: ref-filter.c:2623 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2596 +#: ref-filter.c:2726 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: ref-filter.c:2601 +#: ref-filter.c:2731 #, c-format msgid "option `%s' must point to a commit" msgstr "opción '%s' debe apuntar a un commit" -#: refs.c:264 +#: refs.c:261 #, c-format msgid "%s does not point to a valid object!" msgstr "¡%s no apunta a ningún objeto válido!" -#: refs.c:566 +#: refs.c:563 #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" @@ -6931,7 +7130,7 @@ msgstr "" "predeterminado\n" "está sujeto a cambios. Para configurar el nombre de la rama inicial para " "usar en todos\n" -"de sus nuevos repositorios, reprimiendo esta advertencia, llame a:\n" +"de sus nuevos repositorios, reprimiendo esta advertencia, llama a:\n" "\n" "\tgit config --global init.defaultBranch <nombre>\n" "\n" @@ -6941,81 +7140,81 @@ msgstr "" "\n" "\tgit branch -m <nombre>\n" -#: refs.c:588 +#: refs.c:585 #, c-format msgid "could not retrieve `%s`" msgstr "no se pudo recibir `%s`" -#: refs.c:598 +#: refs.c:595 #, c-format msgid "invalid branch name: %s = %s" msgstr "nombre de rama inválido: %s = %s" -#: refs.c:674 +#: refs.c:671 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorando referencia symbólica rota %s" -#: refs.c:922 +#: refs.c:920 #, c-format msgid "log for ref %s has gap after %s" msgstr "log de ref %s tiene un vacío tras %s" -#: refs.c:929 +#: refs.c:927 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "log de ref %s finalizado inesperadamente en %s" -#: refs.c:994 +#: refs.c:992 #, c-format msgid "log for %s is empty" msgstr "log de %s está vacío" -#: refs.c:1086 +#: refs.c:1084 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "rehusando actualizar ref con mal nombre '%s'" -#: refs.c:1157 +#: refs.c:1155 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref falló para ref '%s': %s" -#: refs.c:2051 +#: refs.c:2062 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "no se permiten múltiples actualizaciones para ref '%s'" -#: refs.c:2131 +#: refs.c:2142 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs.c:2142 +#: refs.c:2153 msgid "ref updates aborted by hook" msgstr "ref updates abortados por el hook" -#: refs.c:2242 refs.c:2272 +#: refs.c:2253 refs.c:2283 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe; no se puede crear '%s'" -#: refs.c:2248 refs.c:2283 +#: refs.c:2259 refs.c:2294 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no se puede procesar '%s' y '%s' al mismo tiempo" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1271 #, c-format msgid "could not remove reference %s" msgstr "no se pudo eliminar la referencia %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1542 -#: refs/packed-backend.c:1552 +#: refs/files-backend.c:1285 refs/packed-backend.c:1549 +#: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#: refs/files-backend.c:1288 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar las referencias: %s" @@ -7304,7 +7503,7 @@ msgstr "duplicar ref de reemplazo: %s" #: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" -msgstr "profundiad de reemplazo demasiada para objeto %s" +msgstr "profundidad de reemplazo demasiada para objeto %s" #: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" @@ -7319,7 +7518,7 @@ msgstr "incapaz de escribir entrada rerere" msgid "there were errors while writing '%s' (%s)" msgstr "hubieron errores mientras se escribía '%s' (%s)" -#: rerere.c:482 +#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 #, c-format msgid "failed to flush '%s'" msgstr "falló al hacer flush '%s'" @@ -7364,8 +7563,8 @@ msgstr "no se puede desvincular stray '%s'" msgid "Recorded preimage for '%s'" msgstr "Preimagen grabada para '%s'" -#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 -#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 +#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -7403,46 +7602,41 @@ msgstr "no es posible abrir directorio rr-cache" msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisión HEAD" -#: reset.c:69 reset.c:75 sequencer.c:3689 +#: reset.c:70 reset.c:76 sequencer.c:3705 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: revision.c:2344 +#: revision.c:2259 +msgid "--unsorted-input is incompatible with --no-walk" +msgstr "--unsorted-input es incompatible con --no-walk" + +#: revision.c:2346 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> ya no es soportado" -#: revision.c:2684 +#: revision.c:2655 revision.c:2659 +msgid "--no-walk is incompatible with --unsorted-input" +msgstr "--no-walk es incompatible con --unsorted-input" + +#: revision.c:2690 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2687 +#: revision.c:2693 #, 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:2893 +#: revision.c:2895 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:766 -msgid "open /dev/null failed" -msgstr "falló al abrir /dev/null" - -#: run-command.c:1274 +#: run-command.c:1278 #, c-format msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" -#: run-command.c:1344 -#, c-format -msgid "" -"The '%s' hook was ignored because it's not set as executable.\n" -"You can disable this warning with `git config advice.ignoredHook false`." -msgstr "" -"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n" -"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`." - #: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "" @@ -7462,24 +7656,24 @@ msgstr "desempaquetado remoto falló: %s" msgid "failed to sign the push certificate" msgstr "falló al firmar el certificado de push" -#: send-pack.c:433 +#: send-pack.c:435 msgid "send-pack: unable to fork off fetch subprocess" msgstr "" "send-pack: no es posible bifurcar el proceso de búsqueda en un subproceso" -#: send-pack.c:455 +#: send-pack.c:457 msgid "push negotiation failed; proceeding anyway with push" msgstr "negociación push falló; procediendo con el push de todas formas" -#: send-pack.c:526 +#: send-pack.c:528 msgid "the receiving end does not support this repository's hash algorithm" msgstr "el destino no soporta el algoritmo de hash de este repositorio" -#: send-pack.c:535 +#: send-pack.c:537 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta push --signed" -#: send-pack.c:537 +#: send-pack.c:539 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7487,47 +7681,48 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed)" -#: send-pack.c:544 +#: send-pack.c:546 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push atómico (--atomic)" -#: send-pack.c:549 +#: send-pack.c:551 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:196 +#: sequencer.c:197 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit inválido, modo cleanup '%s'" -#: sequencer.c:324 +#: sequencer.c:325 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 +#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:408 #, c-format msgid "could not remove '%s'" msgstr "no se pudo eliminar '%s'" -#: sequencer.c:354 +#: sequencer.c:355 msgid "revert" msgstr "revertir" -#: sequencer.c:356 +#: sequencer.c:357 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:358 +#: sequencer.c:359 msgid "rebase" msgstr "rebase" -#: sequencer.c:360 +#: sequencer.c:361 #, c-format msgid "unknown action: %d" msgstr "acción desconocida: %d" -#: sequencer.c:419 +#: sequencer.c:420 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -7535,53 +7730,75 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:422 +#: sequencer.c:423 msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'\n" -"and commit the result with 'git commit'" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git cherry-pick --continue\".\n" +"You can instead skip this commit with \"git cherry-pick --skip\".\n" +"To abort and get back to the state before \"git cherry-pick\",\n" +"run \"git cherry-pick --abort\"." +msgstr "" +"Luego de resolver los conflictos, márquelos con\n" +"\"git add/rm <pathspec>\", luego ejecute\n" +"\"git cherry-pick --continue\".\n" +"O puede saltar este commit con \"git cherry-pick --skip\".\n" +"Para abortar y regresar al estado anterior a \"git cherry-pick\",\n" +"ejecute \"git cherry-pick --abort\"." + +#: sequencer.c:430 +msgid "" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git revert --continue\".\n" +"You can instead skip this commit with \"git revert --skip\".\n" +"To abort and get back to the state before \"git revert\",\n" +"run \"git revert --abort\"." msgstr "" -"tras resolver los conflictos, marca las rutas corregidas\n" -"con 'git add <rutas>' o 'git rm <rutas>'\n" -"y haz un commit del resultado con 'git commit'" +"Tras resolver los conflictos, márquelos con\n" +"\"git add/rm <pathspec>\", luego ejecute\n" +"\"git revert --continue\".\n" +"O puede saltar este commit con \"git revert --skip\".\n" +"Para abortar y regresar al estado anterior a \"git revert\",\n" +"ejecute \"git revert --abort\"." -#: sequencer.c:435 sequencer.c:3271 +#: sequencer.c:448 sequencer.c:3290 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 +#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "no se pudo escribir en '%s'" -#: sequencer.c:442 +#: sequencer.c:455 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3555 +#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3574 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" -#: sequencer.c:486 +#: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:490 +#: sequencer.c:503 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o haz un stash para proceder." -#: sequencer.c:522 +#: sequencer.c:535 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" -#: sequencer.c:561 builtin/tag.c:609 +#: sequencer.c:574 builtin/tag.c:610 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup inválido %s" @@ -7589,65 +7806,65 @@ msgstr "Modo cleanup inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:671 +#: sequencer.c:685 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:685 +#: sequencer.c:699 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de caché" -#: sequencer.c:699 +#: sequencer.c:713 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:779 +#: sequencer.c:793 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:790 +#: sequencer.c:804 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote valor de '%s'" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 -#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 +#: builtin/am.c:822 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:837 +#: sequencer.c:851 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:842 +#: sequencer.c:856 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:847 +#: sequencer.c:861 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:851 +#: sequencer.c:865 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:856 +#: sequencer.c:870 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:858 +#: sequencer.c:872 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:860 +#: sequencer.c:874 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:925 +#: sequencer.c:939 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7673,15 +7890,15 @@ msgstr "" "\n" " git commit %s\n" "\n" -"en cambos casos, cuando acabes, continua con:\n" +"en ambos casos, cuando acabes, continúa con:\n" "\n" " git rebase --continue\n" -#: sequencer.c:1212 +#: sequencer.c:1229 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' falló" -#: sequencer.c:1218 +#: sequencer.c:1235 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7708,7 +7925,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1231 +#: sequencer.c:1248 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7732,343 +7949,348 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1273 +#: sequencer.c:1290 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: sequencer.c:1275 +#: sequencer.c:1292 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: sequencer.c:1321 +#: sequencer.c:1338 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1323 +#: sequencer.c:1340 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1327 +#: sequencer.c:1344 msgid " (root-commit)" msgstr " (commit-raíz)" -#: sequencer.c:1348 +#: sequencer.c:1365 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1350 +#: sequencer.c:1367 #, c-format msgid "HEAD %s is not a commit!" msgstr "¡HEAD %s no es un commit!" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 +#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1410 sequencer.c:2295 +#: sequencer.c:1427 sequencer.c:2312 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 +#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: sequencer.c:1454 sequencer.c:1574 +#: sequencer.c:1471 sequencer.c:1591 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1485 sequencer.c:1517 +#: sequencer.c:1502 sequencer.c:1534 #, c-format msgid "invalid author identity '%s'" msgstr "identidad de autor inválida '%s'" -#: sequencer.c:1491 +#: sequencer.c:1508 msgid "corrupt author: missing date information" msgstr "autor corrupto: falta información de fecha" -#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 -#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 +#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 #: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:1606 +#: sequencer.c:1623 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1611 +#: sequencer.c:1628 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1694 sequencer.c:1975 +#: sequencer.c:1711 sequencer.c:1992 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1753 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1737 +#: sequencer.c:1754 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1738 +#: sequencer.c:1755 msgid "The 1st commit message will be skipped:" msgstr "El mensaje del 1er commit será saltado:" -#: sequencer.c:1739 +#: sequencer.c:1756 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:1740 +#: sequencer.c:1757 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:1887 sequencer.c:1944 +#: sequencer.c:1904 sequencer.c:1961 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1934 +#: sequencer.c:1951 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1936 sequencer.c:3582 +#: sequencer.c:1953 sequencer.c:3601 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1938 +#: sequencer.c:1955 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1962 +#: sequencer.c:1979 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:2072 +#: sequencer.c:2089 msgid "your index file is unmerged." msgstr "tu archivo índice no está fusionado." -#: sequencer.c:2079 +#: sequencer.c:2096 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raíz" -#: sequencer.c:2098 +#: sequencer.c:2115 #, 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:2106 sequencer.c:2114 +#: sequencer.c:2123 sequencer.c:2131 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:2120 +#: sequencer.c:2137 #, 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:2139 +#: sequencer.c:2156 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:2205 +#: sequencer.c:2222 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:2265 +#: sequencer.c:2282 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:2266 +#: sequencer.c:2283 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:2287 +#: sequencer.c:2304 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "descartando $%s %s -- contenidos del parche ya están en upstream\n" -#: sequencer.c:2345 +#: sequencer.c:2362 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falló al leer el índice" -#: sequencer.c:2352 +#: sequencer.c:2370 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falló al refrescar el índice" -#: sequencer.c:2425 +#: sequencer.c:2450 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta argumentos: '%s'" -#: sequencer.c:2434 +#: sequencer.c:2459 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para %s" -#: sequencer.c:2477 +#: sequencer.c:2502 #, c-format msgid "could not parse '%s'" msgstr "no se puede analizar '%s'" -#: sequencer.c:2538 +#: sequencer.c:2563 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:2549 +#: sequencer.c:2574 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2635 +#: sequencer.c:2622 builtin/rebase.c:184 +#, c-format +msgid "could not read '%s'." +msgstr "no se puede leer '%s'." + +#: sequencer.c:2660 msgid "cancelling a cherry picking in progress" msgstr "cancelando cherry-pick en progreso" -#: sequencer.c:2644 +#: sequencer.c:2669 msgid "cancelling a revert in progress" msgstr "cancelando revert en progreso" -#: sequencer.c:2690 +#: sequencer.c:2709 msgid "please fix this using 'git rebase --edit-todo'." -msgstr "por favor arregle esto usando 'git rebase --edit-todo'." +msgstr "por favor arregla esto usando 'git rebase --edit-todo'." -#: sequencer.c:2692 +#: sequencer.c:2711 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2697 +#: sequencer.c:2716 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:2708 +#: sequencer.c:2727 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2710 +#: sequencer.c:2729 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2788 +#: sequencer.c:2807 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido para %s: %s" -#: sequencer.c:2897 +#: sequencer.c:2916 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2917 +#: sequencer.c:2936 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:3012 sequencer.c:4868 +#: sequencer.c:3031 sequencer.c:4905 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:3029 +#: sequencer.c:3048 msgid "revert is already in progress" msgstr "revert ya está en progreso" -#: sequencer.c:3031 +#: sequencer.c:3050 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenta \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3034 +#: sequencer.c:3053 msgid "cherry-pick is already in progress" msgstr "cherry-pick ya está en progreso" -#: sequencer.c:3036 +#: sequencer.c:3055 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenta \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3050 +#: sequencer.c:3069 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:3065 +#: sequencer.c:3084 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:3125 sequencer.c:4581 +#: sequencer.c:3144 sequencer.c:4615 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:3127 sequencer.c:3138 +#: sequencer.c:3146 sequencer.c:3157 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:3129 sequencer.c:3173 +#: sequencer.c:3148 sequencer.c:3192 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:3159 builtin/grep.c:758 +#: sequencer.c:3178 builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:3161 +#: sequencer.c:3180 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:3162 +#: sequencer.c:3181 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:3168 +#: sequencer.c:3187 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto" -#: sequencer.c:3179 +#: sequencer.c:3198 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:3220 +#: sequencer.c:3239 msgid "no revert in progress" msgstr "no hay revert en progreso" -#: sequencer.c:3229 +#: sequencer.c:3248 msgid "no cherry-pick in progress" msgstr "ningún cherry-pick en progreso" -#: sequencer.c:3239 +#: sequencer.c:3258 msgid "failed to skip the commit" msgstr "falló al escribir el commit" -#: sequencer.c:3246 +#: sequencer.c:3265 msgid "there is nothing to skip" msgstr "no hay nada que saltar" -#: sequencer.c:3249 +#: sequencer.c:3268 #, c-format msgid "" "have you committed already?\n" @@ -8077,16 +8299,16 @@ msgstr "" "¿ya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4472 +#: sequencer.c:3430 sequencer.c:4506 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:3428 +#: sequencer.c:3447 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3436 +#: sequencer.c:3455 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8105,27 +8327,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3446 +#: sequencer.c:3465 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:3453 +#: sequencer.c:3472 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 +#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3483 +#: sequencer.c:3502 #, c-format msgid "Executing: %s\n" msgstr "Ejecutando: %s\n" -#: sequencer.c:3498 +#: sequencer.c:3517 #, c-format msgid "" "execution failed: %s\n" @@ -8140,11 +8362,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3504 +#: sequencer.c:3523 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:3510 +#: sequencer.c:3529 #, c-format msgid "" "execution succeeded: %s\n" @@ -8161,90 +8383,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3572 +#: sequencer.c:3591 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3645 +#: sequencer.c:3664 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:3650 +#: sequencer.c:3669 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3734 +#: sequencer.c:3748 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3767 +#: sequencer.c:3780 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3789 +#: sequencer.c:3802 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3798 +#: sequencer.c:3811 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3810 +#: sequencer.c:3823 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:3826 +#: sequencer.c:3878 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:4009 +#: sequencer.c:4024 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "ni se pudo intentar fusionar '%.*s'" -#: sequencer.c:4025 +#: sequencer.c:4040 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:4099 +#: sequencer.c:4121 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: sequencer.c:4102 +#: sequencer.c:4124 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: sequencer.c:4108 +#: sequencer.c:4130 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: sequencer.c:4111 +#: sequencer.c:4133 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: sequencer.c:4115 +#: sequencer.c:4137 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: sequencer.c:4140 +#: sequencer.c:4162 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:4152 +#: sequencer.c:4174 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:4155 +#: sequencer.c:4177 #, c-format msgid "" "%s\n" @@ -8256,29 +8478,29 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:4160 +#: sequencer.c:4182 msgid "Applying autostash resulted in conflicts." msgstr "Aplicar autostash resultó en conflictos." -#: sequencer.c:4161 +#: sequencer.c:4183 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash existe; creando una nueva entrada stash." -#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4255 msgid "could not detach HEAD" msgstr "no se pudo desacoplar HEAD" -#: sequencer.c:4248 +#: sequencer.c:4270 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:4250 +#: sequencer.c:4272 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:4258 +#: sequencer.c:4304 #, c-format msgid "" "Could not execute the todo command\n" @@ -8294,63 +8516,63 @@ msgstr "" "\n" " %.*s\n" "Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n" -"edite la lista de \"todo\" primero:\n" +"edita la lista de \"todo\" primero:\n" "\n" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4304 +#: sequencer.c:4350 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Aplicando rebase (%d/%d)%s" -#: sequencer.c:4350 +#: sequencer.c:4396 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:4421 +#: sequencer.c:4466 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:4480 +#: sequencer.c:4514 msgid "could not read orig-head" msgstr "no se pudo leer orig-head" -#: sequencer.c:4485 +#: sequencer.c:4519 msgid "could not read 'onto'" msgstr "no se pudo leer 'onto'" -#: sequencer.c:4499 +#: sequencer.c:4533 #, c-format msgid "could not update HEAD to %s" msgstr "no se pudo actualizar HEAD a %s" -#: sequencer.c:4559 +#: sequencer.c:4593 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n" -#: sequencer.c:4611 +#: sequencer.c:4645 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:4620 +#: sequencer.c:4654 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4622 +#: sequencer.c:4656 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:4624 +#: sequencer.c:4658 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:4627 +#: sequencer.c:4661 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8361,50 +8583,59 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4663 sequencer.c:4702 +#: sequencer.c:4697 sequencer.c:4736 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4718 +#: sequencer.c:4752 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se pudo eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4725 +#: sequencer.c:4762 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:4845 +#: sequencer.c:4882 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4849 +#: sequencer.c:4886 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4884 +#: sequencer.c:4921 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:5361 +#: sequencer.c:5192 sequencer.c:5421 +#, c-format +msgid "skipped previously applied commit %s" +msgstr "se ha saltado el commit %s aplicado previamente" + +#: sequencer.c:5262 sequencer.c:5437 +msgid "use --reapply-cherry-picks to include skipped commits" +msgstr "use --reapply-cherry-picks para incluir los commits saltados" + +#: sequencer.c:5408 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:5364 +#: sequencer.c:5411 msgid "make_script: error preparing revisions" msgstr "make_script: error al preparar revisiones" -#: sequencer.c:5614 sequencer.c:5631 +#: sequencer.c:5669 sequencer.c:5686 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5650 +#: sequencer.c:5705 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5750 +#: sequencer.c:5805 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." @@ -8420,7 +8651,7 @@ msgid "" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" "%s: no existe la ruta en el árbol de trabajo.\n" -"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " +"Usa 'git <comando> -- <ruta>...' para especificar rutas que no existen " "localmente." #: setup.c:198 @@ -8432,7 +8663,7 @@ msgid "" msgstr "" "argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de " "trabajo.\n" -"Use '--' para separar las rutas de las revisiones, de esta manera:\n" +"Usa '--' para separar las rutas de las revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" #: setup.c:264 @@ -8448,7 +8679,7 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" "argumento ambiguo '%s': ambos revisión y nombre de archivo\n" -"Use '--' para separar rutas de revisiones, de esta manera:\n" +"Usa '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" #: setup.c:419 @@ -8566,27 +8797,15 @@ msgstr "" "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" "El dueño de los archivos tiene que tener permisos de lectura y escritura." -#: setup.c:1430 -msgid "open /dev/null or dup failed" -msgstr "falló al abrir /dev/null o hacer dup" - -#: setup.c:1445 +#: setup.c:1443 msgid "fork failed" msgstr "falló fork" -#: setup.c:1450 t/helper/test-simple-ipc.c:285 +#: setup.c:1448 msgid "setsid failed" msgstr "falló setsid" -#: sparse-index.c:162 -msgid "attempting to use sparse-index without cone mode" -msgstr "intentando usar sparse-index sin modo cono" - -#: sparse-index.c:176 -msgid "unable to update cache-tree, staying full" -msgstr "no es posible actualizar el cache del árbol, manteniendo full" - -#: sparse-index.c:263 +#: sparse-index.c:273 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "la entrada de índice es un directorio, pero no escazo (%08x)" @@ -8643,13 +8862,13 @@ msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 -#: builtin/rebase.c:866 +#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 +#: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" -#: strbuf.c:1177 +#: strbuf.c:1183 #, c-format msgid "could not edit '%s'" msgstr "no se pudo editar '%s'" @@ -8675,7 +8894,7 @@ msgstr "" msgid "invalid value for %s" msgstr "valor inválido para %s" -#: submodule-config.c:766 +#: submodule-config.c:767 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No se pudo actualizar la entrada %s de .gitmodules" @@ -8683,7 +8902,7 @@ msgstr "No se pudo actualizar la entrada %s de .gitmodules" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -"No se puede cambiar .gitmodules no fusionados, primero resuelva los " +"No se puede cambiar .gitmodules no fusionados, primero resuelve los " "conflictos de fusión" #: submodule.c:118 submodule.c:147 @@ -8700,22 +8919,22 @@ msgstr "No se pudo eliminar la entrada %s de .gitmodules" msgid "staging updated .gitmodules failed" msgstr "falló realizar stage a los .gitmodules actualizados" -#: submodule.c:328 +#: submodule.c:358 #, c-format msgid "in unpopulated submodule '%s'" msgstr "en el submódulo no poblado '%s'" -#: submodule.c:359 +#: submodule.c:389 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" -#: submodule.c:436 +#: submodule.c:466 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "mal argumento --ignore-submodules: %s" -#: submodule.c:805 +#: submodule.c:844 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8724,12 +8943,12 @@ msgstr "" "Submódulo en el commit %s en la ruta: '%s' colisiona con un submódulo " "llamado igual. Saltándolo." -#: submodule.c:908 +#: submodule.c:954 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:993 +#: submodule.c:1042 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8738,36 +8957,36 @@ msgstr "" "No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " "el submódulo %s" -#: submodule.c:1116 +#: submodule.c:1165 #, c-format msgid "process for submodule '%s' failed" msgstr "proceso para submódulo '%s' falló" -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 +#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falló al resolver HEAD como un ref válido." -#: submodule.c:1156 +#: submodule.c:1205 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Empujando submódulo '%s'\n" -#: submodule.c:1159 +#: submodule.c:1208 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "No es posible hacer push al submódulo '%s'\n" -#: submodule.c:1451 +#: submodule.c:1491 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Haciendo fetch al submódulo %s%s\n" -#: submodule.c:1485 +#: submodule.c:1525 #, c-format msgid "Could not access submodule '%s'\n" msgstr "No se pudo acceder al submódulo '%s'\n" -#: submodule.c:1640 +#: submodule.c:1680 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8776,62 +8995,62 @@ msgstr "" "Errores durante el fetch del submódulo:\n" "%s" -#: submodule.c:1665 +#: submodule.c:1705 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1682 +#: submodule.c:1722 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "No se pudo ejecutar 'git status --porcelain=2' en el submódulo %s" -#: submodule.c:1723 +#: submodule.c:1763 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'git status --porcelain=2' falló en el submódulo %s" -#: submodule.c:1798 +#: submodule.c:1838 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" -#: submodule.c:1811 +#: submodule.c:1851 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" -#: submodule.c:1826 +#: submodule.c:1868 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'" -#: submodule.c:1853 submodule.c:2163 +#: submodule.c:1895 submodule.c:2210 #, c-format msgid "could not recurse into submodule '%s'" msgstr "no se pudo recursar en el submódulo '%s'" -#: submodule.c:1874 +#: submodule.c:1917 msgid "could not reset submodule index" msgstr "no se pudo reiniciar el índice del submódulo" -#: submodule.c:1916 +#: submodule.c:1959 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1968 +#: submodule.c:2013 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:2036 +#: submodule.c:2081 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" "directorio de git del submódulo '%s' está dentro del directorio de git '%.*s'" -#: submodule.c:2057 +#: submodule.c:2102 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8839,17 +9058,17 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:2069 submodule.c:2128 +#: submodule.c:2114 submodule.c:2174 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:2073 +#: submodule.c:2118 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "rechazando mover '%s' dentro de un directorio git existente" -#: submodule.c:2080 +#: submodule.c:2124 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8860,11 +9079,11 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2208 +#: submodule.c:2255 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2248 +#: submodule.c:2295 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" @@ -8886,7 +9105,7 @@ msgid "unknown value '%s' for key '%s'" msgstr "valor '%s' desconocido para la clave '%s'" #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 -#: builtin/remote.c:324 +#: builtin/remote.c:327 #, c-format msgid "more than one %s" msgstr "más de un %s" @@ -8901,11 +9120,11 @@ msgstr "token de remolque vacío en el trailer '%.*s'" msgid "could not read input file '%s'" msgstr "no se pudo leer el archivo de entrada '%s'" -#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 +#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573 msgid "could not read from stdin" msgstr "no se pudo leer desde stdin" -#: trailer.c:1024 wrapper.c:676 +#: trailer.c:1024 wrapper.c:684 #, c-format msgid "could not stat %s" msgstr "no se pudo hacer stat en %s" @@ -8973,7 +9192,7 @@ msgstr "no se pudo ejecutar fast-import" msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:549 transport-helper.c:1247 +#: transport-helper.c:549 transport-helper.c:1251 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" @@ -8991,7 +9210,7 @@ msgstr "configurar servicio de ruta remota no soportado por el protocolo" msgid "invalid remote service path" msgstr "ruta de servicio remoto inválida" -#: transport-helper.c:661 transport.c:1477 +#: transport-helper.c:661 transport.c:1475 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" @@ -9000,7 +9219,7 @@ msgstr "operación no soportada por protocolo" msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:693 transport.c:400 +#: transport-helper.c:693 transport.c:404 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only requiere protocolo v2" @@ -9013,59 +9232,59 @@ msgstr "'opción' sin una directiva correspondiente 'ok/error'" msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:855 +#: transport-helper.c:859 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper reportó estado inesperado de %s" -#: transport-helper.c:938 +#: transport-helper.c:942 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:941 +#: transport-helper.c:945 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:944 +#: transport-helper.c:948 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:949 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --atomic" msgstr "helper %s no soporta --atomic" -#: transport-helper.c:953 +#: transport-helper.c:957 #, c-format msgid "helper %s does not support --%s" msgstr "helper %s no soporta --%s" -#: transport-helper.c:960 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:1060 +#: transport-helper.c:1064 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:1065 +#: transport-helper.c:1069 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:1112 +#: transport-helper.c:1116 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:1117 +#: transport-helper.c:1121 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1142 +#: transport-helper.c:1146 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -9074,52 +9293,52 @@ msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" "Tal vez deberías especificar un branch.\n" -#: transport-helper.c:1224 +#: transport-helper.c:1228 #, c-format msgid "unsupported object format '%s'" msgstr "formato de objeto no soportado '%s'" -#: transport-helper.c:1233 +#: transport-helper.c:1237 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1385 +#: transport-helper.c:1389 #, c-format msgid "read(%s) failed" msgstr "read(%s) falló" -#: transport-helper.c:1412 +#: transport-helper.c:1416 #, c-format msgid "write(%s) failed" msgstr "write(%s) falló" -#: transport-helper.c:1461 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed" msgstr "hilo %s falló" -#: transport-helper.c:1465 +#: transport-helper.c:1469 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s falló al unirse: %s" -#: transport-helper.c:1484 transport-helper.c:1488 +#: transport-helper.c:1488 transport-helper.c:1492 #, 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:1525 +#: transport-helper.c:1529 #, c-format msgid "%s process failed to wait" msgstr "proceso %s falló al esperar" -#: transport-helper.c:1529 +#: transport-helper.c:1533 #, c-format msgid "%s process failed" msgstr "proceso %s falló" -#: transport-helper.c:1547 transport-helper.c:1556 +#: transport-helper.c:1551 transport-helper.c:1560 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" @@ -9133,46 +9352,46 @@ msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" msgid "could not read bundle '%s'" msgstr "no se pudo leer el conjunto '%s'" -#: transport.c:223 +#: transport.c:227 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opción de profundidad inválida '%s'" -#: transport.c:275 +#: transport.c:279 msgid "see protocol.version in 'git help config' for more details" -msgstr "ver protocol.version en 'git help config' para más información" +msgstr "mira protocol.version en 'git help config' para más información" -#: transport.c:276 +#: transport.c:280 msgid "server options require protocol version 2 or later" msgstr "opciones del servidor requieren protocolo versión 2 o posterior" -#: transport.c:403 +#: transport.c:407 msgid "server does not support wait-for-done" msgstr "el servidor no soporta wait-for-done" -#: transport.c:755 +#: transport.c:759 msgid "could not parse transport.color.* config" msgstr "no se pudo analizar valor de configuración transport.color.*" -#: transport.c:830 +#: transport.c:834 msgid "support for protocol v2 not implemented yet" msgstr "soporte para protocolo v2 no implementado todavía" -#: transport.c:965 +#: transport.c:967 #, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconocido para configuración '%s': %s" -#: transport.c:1031 +#: transport.c:1033 #, c-format msgid "transport '%s' not allowed" msgstr "transporte '%s' no permitido" -#: transport.c:1084 +#: transport.c:1082 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync ya no es soportado" -#: transport.c:1187 +#: transport.c:1185 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9181,7 +9400,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:1191 +#: transport.c:1189 #, c-format msgid "" "\n" @@ -9208,11 +9427,11 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:1199 +#: transport.c:1197 msgid "Aborting." msgstr "Abortando." -#: transport.c:1346 +#: transport.c:1344 msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" @@ -9497,17 +9716,17 @@ msgstr "" "en un filesystem case-insensitive) y solo una del grupo\n" "colisionando está en el árbol de trabajo:\n" -#: unpack-trees.c:1618 +#: unpack-trees.c:1620 msgid "Updating index flags" msgstr "Actualizando flags del índice" -#: unpack-trees.c:2718 +#: unpack-trees.c:2772 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" "el árbol de trabajo y commits no monitoreados tienen entradas duplicadas: %s" -#: upload-pack.c:1548 +#: upload-pack.c:1561 msgid "expected flush after fetch arguments" msgstr "se espera flush tras argumentos fetch" @@ -9544,7 +9763,7 @@ msgstr "segmento de ruta '..' inválido" msgid "Fetching objects" msgstr "Haciendo fetch a objetos" -#: worktree.c:236 builtin/am.c:2152 +#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" @@ -9645,17 +9864,27 @@ msgstr "archivo gitdir inválido" msgid "gitdir file points to non-existent location" msgstr "archivo gitdir apunta a una ubicación inexistente" -#: wrapper.c:197 wrapper.c:367 +#: wrapper.c:151 +#, c-format +msgid "could not setenv '%s'" +msgstr "no se pudo establecer setenv '%s'" + +#: wrapper.c:203 +#, c-format +msgid "unable to create '%s'" +msgstr "no se puede crear '%s'" + +#: wrapper.c:205 wrapper.c:375 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:398 wrapper.c:599 +#: wrapper.c:406 wrapper.c:607 #, c-format msgid "unable to access '%s'" msgstr "no es posible acceder '%s'" -#: wrapper.c:607 +#: wrapper.c:615 msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" @@ -9722,8 +9951,8 @@ msgstr "" #: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -" (confirmar o descartar el contenido sin seguimiento o modificado en los " -"sub-módulos)" +" (confirma o descarta el contenido sin seguimiento o modificado en los sub-" +"módulos)" #: wt-status.c:254 #, c-format @@ -9823,7 +10052,7 @@ msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -"No modifique ni borre la línea de encima.\n" +"No modifiques ni borres la línea de encima.\n" "Todo lo que esté por abajo será ignorado." #: wt-status.c:1165 @@ -10006,7 +10235,7 @@ msgstr " (usa \"git cherry-pick --skip\" para saltar este parche)" #: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" +" (usa \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" #: wt-status.c:1500 msgid "Revert currently in progress." @@ -10057,7 +10286,7 @@ msgstr "Estás en un sparse checkout." #: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." -msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes." +msgstr "Estás en un checkout de sparse con %d%% archivos rastreados presentes." #: wt-status.c:1794 msgid "On branch " @@ -10108,7 +10337,7 @@ msgid "" msgstr "" "Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n" "puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n" -"nuevos archivos tú mismo (vea 'git help status')." +"nuevos archivos tú mismo (mira 'git help status')." #: wt-status.c:1857 #, c-format @@ -10208,25 +10437,25 @@ 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/simple-ipc/ipc-unix-socket.c:182 +#: compat/simple-ipc/ipc-unix-socket.c:183 msgid "could not send IPC command" msgstr "no se pudo enviar el comando IPC" -#: compat/simple-ipc/ipc-unix-socket.c:189 +#: compat/simple-ipc/ipc-unix-socket.c:190 msgid "could not read IPC response" msgstr "no se pudo leer la respuesta IPC" -#: compat/simple-ipc/ipc-unix-socket.c:866 +#: compat/simple-ipc/ipc-unix-socket.c:870 #, c-format msgid "could not start accept_thread '%s'" msgstr "no se pudo iniciar el accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c:878 +#: compat/simple-ipc/ipc-unix-socket.c:882 #, c-format msgid "could not start worker[0] for '%s'" msgstr "no se pudo iniciar el worker[0] para '%s'" -#: compat/precompose_utf8.c:58 builtin/clone.c:461 +#: compat/precompose_utf8.c:58 builtin/clone.c:347 #, c-format msgid "failed to unlink '%s'" msgstr "falló al desvincular '%s'" @@ -10235,134 +10464,133 @@ msgstr "falló al desvincular '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opciones>] [--] <especificación-de-ruta>..." -#: builtin/add.c:61 +#: builtin/add.c:64 #, c-format msgid "cannot chmod %cx '%s'" msgstr "no se puede aplicar chmod %cx '%s'" -#: builtin/add.c:99 +#: builtin/add.c:106 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:104 builtin/commit.c:297 +#: builtin/add.c:111 builtin/commit.c:298 msgid "updating files failed" msgstr "falló la actualización de archivos" -#: builtin/add.c:114 +#: builtin/add.c:121 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:198 +#: builtin/add.c:205 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:307 builtin/rev-parse.c:993 +#: builtin/add.c:317 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "No se pudo leer el índice" -#: builtin/add.c:318 -#, c-format -msgid "Could not open '%s' for writing." -msgstr "No se pudo abrir '%s' para escritura." - -#: builtin/add.c:322 +#: builtin/add.c:330 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:325 +#: builtin/add.c:333 msgid "editing patch failed" msgstr "falló la edición del parche" -#: builtin/add.c:328 +#: builtin/add.c:336 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo hacer stat en '%s'" -#: builtin/add.c:330 +#: builtin/add.c:338 msgid "Empty patch. Aborted." msgstr "Parche vacío. Abortado." -#: builtin/add.c:335 +#: builtin/add.c:343 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:343 +#: builtin/add.c:351 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:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 -#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 +#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "dry run (ejecución en seco)" -#: builtin/add.c:366 +#: builtin/add.c:374 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 +#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 msgid "select hunks interactively" msgstr "elegir fragmentos de forma interactiva" -#: builtin/add.c:368 +#: builtin/add.c:376 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:369 +#: builtin/add.c:377 msgid "allow adding otherwise ignored files" msgstr "permitir agregar archivos que de otro modo se ignoren" -#: builtin/add.c:370 +#: builtin/add.c:378 msgid "update tracked files" msgstr "actualizar los archivos rastreados" -#: builtin/add.c:371 +#: builtin/add.c:379 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:372 +#: builtin/add.c:380 msgid "record only the fact that the path will be added later" msgstr "grabar solo el hecho de que la ruta será agregada luego" -#: builtin/add.c:373 +#: builtin/add.c:381 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todos los archivos con y sin seguimiento" -#: builtin/add.c:376 +#: builtin/add.c:384 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:378 +#: builtin/add.c:386 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el índice" -#: builtin/add.c:379 +#: builtin/add.c:387 msgid "just skip files which cannot be added because of errors" msgstr "saltar los archivos que no pueden ser agregados a causa de errores" -#: builtin/add.c:380 +#: builtin/add.c:388 msgid "check if - even missing - files are ignored in dry run" msgstr "" "comprobar si los archivos - incluso los que faltan - se ignoran en dry run" -#: builtin/add.c:382 builtin/update-index.c:1006 +#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251 +msgid "allow updating entries outside of the sparse-checkout cone" +msgstr "permite actualizar entradas fuera del cono de sparse-checkout" + +#: builtin/add.c:391 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:384 +#: builtin/add.c:393 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:386 +#: builtin/add.c:395 msgid "backend for `git stash -p`" msgstr "backend para `git stash -p`" -#: builtin/add.c:404 +#: builtin/add.c:413 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10391,14 +10619,14 @@ msgstr "" "\n" "\tgit rm --cached %s\n" "\n" -"Vea \"git help submodule\" para más información." +"Mira \"git help submodule\" para más información." -#: builtin/add.c:432 +#: builtin/add.c:442 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio de git embebido: %s" -#: builtin/add.c:451 +#: builtin/add.c:462 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10408,51 +10636,51 @@ msgstr "" "Desactiva este mensaje ejecutando\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:460 +#: builtin/add.c:477 msgid "adding files failed" msgstr "falló al agregar archivos" -#: builtin/add.c:488 +#: builtin/add.c:513 msgid "--dry-run is incompatible with --interactive/--patch" msgstr "--dry-run es incompatible con --interactive/--patch" -#: builtin/add.c:490 builtin/commit.c:357 +#: builtin/add.c:515 builtin/commit.c:358 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file es incompatible con --interactive/--patch" -#: builtin/add.c:507 +#: builtin/add.c:532 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file es incompatible con --edit" -#: builtin/add.c:519 +#: builtin/add.c:544 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:522 +#: builtin/add.c:547 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:526 +#: builtin/add.c:551 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x o +x" -#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 +#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 +#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file es incompatible con argumentos de pathspec" -#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 +#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 +#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul requiere --pathspec-from-file" -#: builtin/add.c:555 +#: builtin/add.c:583 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:557 +#: builtin/add.c:585 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10462,111 +10690,110 @@ msgstr "" "Desactiva este mensage ejecutando\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:365 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "no se pudo analizar el script del autor" -#: builtin/am.c:455 +#: builtin/am.c:456 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' fue borrado por el hook de applypatch-msg" -#: builtin/am.c:497 +#: builtin/am.c:498 #, c-format msgid "Malformed input line: '%s'." msgstr "Línea de entrada mal formada: '%s'." -#: builtin/am.c:535 +#: builtin/am.c:536 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falló al copiar notas de '%s' a '%s'" -#: builtin/am.c:561 +#: builtin/am.c:562 msgid "fseek failed" msgstr "fallo de fseek" -#: builtin/am.c:749 +#: builtin/am.c:750 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:814 +#: builtin/am.c:815 msgid "Only one StGIT patch series can be applied at once" msgstr "Solo un parche StGIT puede ser aplicado a la vez" -#: builtin/am.c:862 +#: builtin/am.c:863 msgid "invalid timestamp" msgstr "timestamp inválido" -#: builtin/am.c:867 builtin/am.c:879 +#: builtin/am.c:868 builtin/am.c:880 msgid "invalid Date line" msgstr "línea Date inválida" -#: builtin/am.c:874 +#: builtin/am.c:875 msgid "invalid timezone offset" msgstr "offset de zona horaria inválido" -#: builtin/am.c:967 +#: builtin/am.c:968 msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:972 builtin/clone.c:414 +#: builtin/am.c:973 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" -#: builtin/am.c:977 +#: builtin/am.c:978 msgid "Failed to split patches." msgstr "Falló al dividir parches." -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." -#: builtin/am.c:1128 +#: builtin/am.c:1129 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -"Para restaurar la rama original y detener el parcheo, ejecutar \"%s --abort" -"\"." +"Para restaurar la rama original y detener el parcheo, ejecuta \"%s --abort\"." -#: builtin/am.c:1223 +#: builtin/am.c:1224 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Parche enviado con format=flowed; espacios al final de las líneas tal vez " "desaparezcan." -#: builtin/am.c:1251 +#: builtin/am.c:1252 msgid "Patch is empty." msgstr "El parche está vacío." -#: builtin/am.c:1316 +#: builtin/am.c:1317 #, c-format msgid "missing author line in commit %s" msgstr "falta línea de autor en commit %s" -#: builtin/am.c:1319 +#: builtin/am.c:1320 #, c-format msgid "invalid ident line: %.*s" msgstr "línea de identificación no válida: %.*s" -#: builtin/am.c:1538 +#: builtin/am.c:1539 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositorio carece de los blobs necesarios para retroceder en una fusión de " "3 vías." -#: builtin/am.c:1540 +#: builtin/am.c:1541 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1559 +#: builtin/am.c:1560 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10574,24 +10801,24 @@ msgstr "" "¿Editaste el parche a mano?\n" "No aplica a los blobs registrados en su índice." -#: builtin/am.c:1565 +#: builtin/am.c:1566 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediendo para parchar base y fusionar de 3 vías..." -#: builtin/am.c:1591 +#: builtin/am.c:1592 msgid "Failed to merge in the changes." msgstr "Falló al fusionar los cambios." -#: builtin/am.c:1623 +#: builtin/am.c:1624 msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1675 builtin/am.c:1679 +#: builtin/am.c:1676 builtin/am.c:1680 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1697 +#: builtin/am.c:1698 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -10599,37 +10826,37 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1707 +#: builtin/am.c:1708 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1753 builtin/commit.c:408 +#: builtin/am.c:1754 builtin/commit.c:409 msgid "unable to write index file" msgstr "no es posible escribir el archivo índice" -#: builtin/am.c:1757 +#: builtin/am.c:1758 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1797 builtin/am.c:1865 +#: builtin/am.c:1798 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1814 +#: builtin/am.c:1815 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- Parche ya aplicado." -#: builtin/am.c:1820 +#: builtin/am.c:1821 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1824 +#: builtin/am.c:1825 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido" +msgstr "Usa 'git am --show-current-patch=diff' para ver el parche fallido" #: builtin/am.c:1868 msgid "" @@ -10654,17 +10881,17 @@ msgstr "" "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " "en él." -#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 -#: builtin/reset.c:355 +#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 +#: builtin/reset.c:361 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:2034 +#: builtin/am.c:2035 builtin/am.c:2111 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2078 +#: builtin/am.c:2079 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10672,190 +10899,190 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2185 +#: builtin/am.c:2187 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2227 +#: builtin/am.c:2229 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valor inválido para --show-current-patch: %s" -#: builtin/am.c:2231 +#: builtin/am.c:2233 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s" -#: builtin/am.c:2262 +#: builtin/am.c:2264 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2263 +#: builtin/am.c:2265 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2269 +#: builtin/am.c:2271 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2271 +#: builtin/am.c:2273 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2273 +#: builtin/am.c:2275 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:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:945 +#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:640 builtin/stash.c:961 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2276 +#: builtin/am.c:2278 msgid "add a Signed-off-by trailer to the commit message" msgstr "agregar una línea \"Signed-off-by\" al mensaje del commit" -#: builtin/am.c:2279 +#: builtin/am.c:2281 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2281 +#: builtin/am.c:2283 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2283 +#: builtin/am.c:2285 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2285 +#: builtin/am.c:2287 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2287 +#: builtin/am.c:2289 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2290 +#: builtin/am.c:2292 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2293 +#: builtin/am.c:2295 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2295 +#: builtin/am.c:2297 msgid "pass it through git-mailinfo" msgstr "pasarlo a través de git-mailinfo" -#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 -#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 -#: builtin/am.c:2325 +#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 +#: builtin/am.c:2327 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 +#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 -#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 -#: parse-options.h:317 +#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 +#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 -#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 +#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2322 +#: builtin/am.c:2324 msgid "format the patch(es) are in" msgstr "formato de los parches" -#: builtin/am.c:2328 +#: builtin/am.c:2330 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensaje de error cuando fallos de parcheo ocurran" -#: builtin/am.c:2330 +#: builtin/am.c:2332 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2333 +#: builtin/am.c:2335 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2336 +#: builtin/am.c:2338 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2339 +#: builtin/am.c:2341 msgid "restore the original branch and abort the patching operation" msgstr "restaurar la rama original y abortar la operación de parcheo" -#: builtin/am.c:2342 +#: builtin/am.c:2344 msgid "abort the patching operation but keep HEAD where it is" msgstr "abortar la operación de parcheo pero mantener HEAD donde está" -#: builtin/am.c:2346 +#: builtin/am.c:2348 msgid "show the patch being applied" -msgstr "muestra el parche siendo aplicado" +msgstr "mostrar el parche siendo aplicado" -#: builtin/am.c:2351 +#: builtin/am.c:2353 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2353 +#: builtin/am.c:2355 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 -#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 +#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 +#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099 +#: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2358 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "firmar los commits con GPG" -#: builtin/am.c:2359 +#: builtin/am.c:2361 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2377 +#: builtin/am.c:2379 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" -"será eliminada. Por favor no la use más." +"será eliminada. Por favor no la uses más." -#: builtin/am.c:2384 +#: builtin/am.c:2386 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2399 +#: builtin/am.c:2401 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe pero un mbox fue dado." -#: builtin/am.c:2423 +#: builtin/am.c:2425 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" "Directorio extraviado %s encontrado.\n" -"Use \"git am --abort\" para borrarlo." +"Usa \"git am --abort\" para borrarlo." -#: builtin/am.c:2429 +#: builtin/am.c:2431 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." -#: builtin/am.c:2439 +#: builtin/am.c:2441 msgid "interactive mode requires patches on the command line" msgstr "modo interactivo requiere parches en la línea de comando" @@ -10863,44 +11090,35 @@ msgstr "modo interactivo requiere parches en la línea de comando" msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<opciones>] [<parche>...]" -#: builtin/archive.c:17 -#, c-format -msgid "could not create archive file '%s'" -msgstr "no se pudo crear el archivo de crónica '%s'" - -#: builtin/archive.c:20 +#: builtin/archive.c:18 msgid "could not redirect output" msgstr "no se pudo redirigir la salida" -#: builtin/archive.c:37 +#: builtin/archive.c:35 msgid "git archive: Remote with no URL" msgstr "git archive: Remote sin URL" -#: builtin/archive.c:61 +#: builtin/archive.c:59 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet" -#: builtin/archive.c:64 +#: builtin/archive.c:62 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:65 +#: builtin/archive.c:63 msgid "git archive: protocol error" msgstr "git archive: error de protocolo" -#: builtin/archive.c:69 +#: builtin/archive.c:67 msgid "git archive: expected a flush" msgstr "git archive: se esperaba un flush" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<commit>]" -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]" - #: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" @@ -10939,46 +11157,59 @@ msgstr "git bisect--helper --bisect-replay <archivo>" msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]" -#: builtin/bisect--helper.c:107 +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-visualize" +msgstr "git bisect--helper --bisect-visualize" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-run <cmd>..." +msgstr "git bisect--helper --bisect-run <cmd>..." + +#: builtin/bisect--helper.c:109 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "no se puede abrir archivo '%s' en modo '%s'" -#: builtin/bisect--helper.c:114 +#: builtin/bisect--helper.c:116 #, c-format msgid "could not write to file '%s'" msgstr "no se pudo escribir al archivo '%s'" -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:154 +#, c-format +msgid "cannot open file '%s' for reading" +msgstr "no se puede abrir archivo '%s' para lectura" + +#: builtin/bisect--helper.c:170 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' no es un término válido" -#: builtin/bisect--helper.c:159 +#: builtin/bisect--helper.c:174 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "no se puede usar el comando nativo '%s' como un término" -#: builtin/bisect--helper.c:169 +#: builtin/bisect--helper.c:184 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "no se puede cambiar el significado del término '%s'" -#: builtin/bisect--helper.c:179 +#: builtin/bisect--helper.c:194 msgid "please use two different terms" -msgstr "por favor use dos términos diferentes" +msgstr "por favor usa dos términos diferentes" -#: builtin/bisect--helper.c:195 +#: builtin/bisect--helper.c:210 #, c-format msgid "We are not bisecting.\n" msgstr "No estamos bisecando.\n" -#: builtin/bisect--helper.c:203 +#: builtin/bisect--helper.c:218 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' no es un commit válido" -#: builtin/bisect--helper.c:212 +#: builtin/bisect--helper.c:227 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10986,27 +11217,27 @@ msgstr "" "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:256 +#: builtin/bisect--helper.c:271 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mal argumento bisect_write: %s" -#: builtin/bisect--helper.c:261 +#: builtin/bisect--helper.c:276 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no se pudo obtener el oid de la rev '%s'" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:288 #, c-format msgid "couldn't open the file '%s'" msgstr "no se pudo abrir el archivo '%s'" -#: builtin/bisect--helper.c:299 +#: builtin/bisect--helper.c:314 #, 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:326 +#: builtin/bisect--helper.c:341 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -11015,7 +11246,7 @@ msgstr "" "Tienes que dar al menos una revisión %s y una %s.\n" "Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:330 +#: builtin/bisect--helper.c:345 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -11026,7 +11257,7 @@ msgstr "" "Después tienes que entregar al menos una revisión %s y una %s.\n" "Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:350 +#: builtin/bisect--helper.c:365 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -11035,15 +11266,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:358 +#: builtin/bisect--helper.c:373 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]? " -#: builtin/bisect--helper.c:419 +#: builtin/bisect--helper.c:434 msgid "no terms defined" msgstr "no hay términos definidos" -#: builtin/bisect--helper.c:422 +#: builtin/bisect--helper.c:437 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -11052,7 +11283,7 @@ msgstr "" "Tus términos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:432 +#: builtin/bisect--helper.c:447 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -11061,53 +11292,53 @@ 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:499 builtin/bisect--helper.c:1023 +#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038 msgid "revision walk setup failed\n" msgstr "la configuración del recorrido de revisiones falló\n" -#: builtin/bisect--helper.c:521 +#: builtin/bisect--helper.c:536 #, c-format msgid "could not open '%s' for appending" msgstr "no se pudo abrir '%s' en modo append" -#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668 msgid "'' is not a valid term" msgstr "'' no es un término válido" -#: builtin/bisect--helper.c:663 +#: builtin/bisect--helper.c:678 #, c-format msgid "unrecognized option: '%s'" msgstr "opción desconocida: '%s'" -#: builtin/bisect--helper.c:667 +#: builtin/bisect--helper.c:682 #, 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:698 +#: builtin/bisect--helper.c:713 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:713 +#: builtin/bisect--helper.c:728 #, 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>'." +"error al hacer checkout '%s'. Intenta 'git bisect start <rama-válida>'." -#: builtin/bisect--helper.c:734 +#: builtin/bisect--helper.c:749 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecará en un árbol con cg-seek" -#: builtin/bisect--helper.c:737 +#: builtin/bisect--helper.c:752 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbólico extraño" -#: builtin/bisect--helper.c:757 +#: builtin/bisect--helper.c:772 #, c-format msgid "invalid ref: '%s'" msgstr "ref inválido: '%s'" -#: builtin/bisect--helper.c:815 +#: builtin/bisect--helper.c:830 msgid "You need to start by \"git bisect start\"\n" msgstr "Debes iniciar con \"git bisect start\"\n" @@ -11115,104 +11346,150 @@ msgstr "Debes iniciar con \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:826 +#: builtin/bisect--helper.c:841 msgid "Do you want me to do it for you [Y/n]? " msgstr "¿Quieres que lo haga por ti [Y/n]? " -#: builtin/bisect--helper.c:844 +#: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument" -msgstr "Llame a `--bisect-state` con al menos un argumento" +msgstr "Por favor llama a `--bisect-state` con al menos un argumento" -#: builtin/bisect--helper.c:857 +#: builtin/bisect--helper.c:872 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' solo puede tomar un argumento." -#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897 #, c-format msgid "Bad rev input: %s" msgstr "Mala entrada rev: %s" -#: builtin/bisect--helper.c:889 +#: builtin/bisect--helper.c:904 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Mala entrada rev (no es un commit): %s" -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:936 msgid "We are not bisecting." msgstr "No estamos bisecando." -#: builtin/bisect--helper.c:971 +#: builtin/bisect--helper.c:986 #, c-format msgid "'%s'?? what are you talking about?" msgstr "¿¿'%s'?? ¿De qué estás hablando?" -#: builtin/bisect--helper.c:983 +#: builtin/bisect--helper.c:998 #, c-format msgid "cannot read file '%s' for replaying" msgstr "no se puede leer '%s' para reproducir" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274 +msgid "bisect run failed: no command provided." +msgstr "bisect falló: no se proveyó comando." + +#: builtin/bisect--helper.c:1116 +#, c-format +msgid "running %s\n" +msgstr "ejecutando %s\n" + +#: builtin/bisect--helper.c:1120 +#, c-format +msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgstr "bisect falló: código de salida %d de '%s' es <0 o >=128" + +#: builtin/bisect--helper.c:1136 +#, c-format +msgid "cannot open file '%s' for writing" +msgstr "no se pudo abrir archivo '%s' para escritura" + +#: builtin/bisect--helper.c:1152 +msgid "bisect run cannot continue any more" +msgstr "bisect no puede seguir continuando" + +#: builtin/bisect--helper.c:1154 +#, c-format +msgid "bisect run success" +msgstr "bisect exitoso" + +#: builtin/bisect--helper.c:1157 +#, c-format +msgid "bisect found first bad commit" +msgstr "bisect encontró el primer mal commit" + +#: builtin/bisect--helper.c:1160 +#, c-format +msgid "" +"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " +"code %d" +msgstr "" +"ejecución de bisect falló: 'git bisect--helper --bisect-state %s' terminó " +"con código de error %d" + +#: builtin/bisect--helper.c:1192 msgid "reset the bisection state" msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1194 msgid "check whether bad or good terms exist" msgstr "revisar si existen términos malos o buenos" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1196 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1198 msgid "start the bisect session" msgstr "comenzar la sesión de bisect" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1200 msgid "find the next bisection commit" msgstr "encontrar el siguiente commit de bisección" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1202 msgid "mark the state of ref (or refs)" msgstr "marcar el estado de ref (o refs)" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1204 msgid "list the bisection steps so far" msgstr "listar los pasos de bisección hasta ahora" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1206 msgid "replay the bisection process from the given file" msgstr "reproducir el proceso de bisección del archivo dado" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1208 msgid "skip some commits for checkout" msgstr "saltar algunos commits para checkout" -#: builtin/bisect--helper.c:1074 +#: builtin/bisect--helper.c:1210 +msgid "visualize the bisection" +msgstr "visualizar bisección" + +#: builtin/bisect--helper.c:1212 +msgid "use <cmd>... to automatically bisect." +msgstr "use <cmd>... para aplicar bisección automática." + +#: builtin/bisect--helper.c:1214 msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:1089 +#: builtin/bisect--helper.c:1229 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset requiere o un commit o ningún argumento" -#: builtin/bisect--helper.c:1094 -msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "--bisect-next-check requiere 2 o 3 argumentos" - -#: builtin/bisect--helper.c:1100 +#: builtin/bisect--helper.c:1234 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" -#: builtin/bisect--helper.c:1109 +#: builtin/bisect--helper.c:1243 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next requiere 0 argumentos" -#: builtin/bisect--helper.c:1120 +#: builtin/bisect--helper.c:1254 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log requiere 0 argumentos" -#: builtin/bisect--helper.c:1125 +#: builtin/bisect--helper.c:1259 msgid "no logfile given" msgstr "ningún logfile proporcionado" @@ -11224,151 +11501,153 @@ msgstr "git blame [<opciones>] [<opciones-de-rev>] [<revisión>] [--] <archivo>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<opciones-de-rev> están documentadas en git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:406 #, c-format msgid "expecting a color: %s" msgstr "esperando un color: %s" -#: builtin/blame.c:417 +#: builtin/blame.c:413 msgid "must end with a color" msgstr "tiene que terminar con un color" -#: builtin/blame.c:728 +#: builtin/blame.c:724 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "color inválido '%s' en color.blame.repeatedLines" -#: builtin/blame.c:746 +#: builtin/blame.c:742 msgid "invalid value for blame.coloring" msgstr "valor inválido para blame.coloring" -#: builtin/blame.c:845 +#: builtin/blame.c:841 #, c-format msgid "cannot find revision %s to ignore" msgstr "no se pudo encontrar revisión %s para ignorar" -#: builtin/blame.c:867 +#: builtin/blame.c:863 msgid "show blame entries as we find them, incrementally" msgstr "mostrar las entradas blame como las encontramos, incrementalmente" -#: builtin/blame.c:868 +#: builtin/blame.c:864 msgid "do not show object names of boundary commits (Default: off)" msgstr "no mostrar nombres de objetos de commits extremos (Default: off)" -#: builtin/blame.c:869 +#: builtin/blame.c:865 msgid "do not treat root commits as boundaries (Default: off)" msgstr "no tratar commits raíces como extremos (Default: off)" -#: builtin/blame.c:870 +#: builtin/blame.c:866 msgid "show work cost statistics" msgstr "mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 -#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:566 builtin/send-pack.c:198 +#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 +#: builtin/merge.c:298 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 +#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566 +#: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "forzar el reporte de progreso" -#: builtin/blame.c:872 +#: builtin/blame.c:868 msgid "show output score for blame entries" msgstr "mostrar la puntuación de salida de las entradas de blame" -#: builtin/blame.c:873 +#: builtin/blame.c:869 msgid "show original filename (Default: auto)" msgstr "mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:874 +#: builtin/blame.c:870 msgid "show original linenumber (Default: off)" msgstr "mostrar número de línea original (Default: off)" -#: builtin/blame.c:875 +#: builtin/blame.c:871 msgid "show in a format designed for machine consumption" msgstr "mostrar en un formato diseñado para consumo de máquina" -#: builtin/blame.c:876 +#: builtin/blame.c:872 msgid "show porcelain format with per-line commit information" msgstr "mostrar en formato porcelana con información de commit por línea" -#: builtin/blame.c:877 +#: builtin/blame.c:873 msgid "use the same output mode as git-annotate (Default: off)" msgstr "usar el mismo modo de salida como git-annotate (Default: off)" -#: builtin/blame.c:878 +#: builtin/blame.c:874 msgid "show raw timestamp (Default: off)" msgstr "mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:879 +#: builtin/blame.c:875 msgid "show long commit SHA1 (Default: off)" msgstr "mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:880 +#: builtin/blame.c:876 msgid "suppress author name and timestamp (Default: off)" msgstr "suprimir nombre del autor y timestamp (Default: off)" -#: builtin/blame.c:881 +#: builtin/blame.c:877 msgid "show author email instead of name (Default: off)" msgstr "mostrar el email del autor en cambio de su nombre (Default: off)" -#: builtin/blame.c:882 +#: builtin/blame.c:878 msgid "ignore whitespace differences" msgstr "ignorar diferencias de espacios en blanco" -#: builtin/blame.c:883 builtin/log.c:1823 +#: builtin/blame.c:879 builtin/log.c:1823 msgid "rev" msgstr "rev" -#: builtin/blame.c:883 +#: builtin/blame.c:879 msgid "ignore <rev> when blaming" msgstr "ignorar <rev> durante el blame" -#: builtin/blame.c:884 +#: builtin/blame.c:880 msgid "ignore revisions from <file>" msgstr "ignorar revisiones de <archivo>" -#: builtin/blame.c:885 +#: builtin/blame.c:881 msgid "color redundant metadata from previous line differently" msgstr "colorear metadata redundante de líneas previas de manera diferente" -#: builtin/blame.c:886 +#: builtin/blame.c:882 msgid "color lines by age" msgstr "colorear líneas por edad" -#: builtin/blame.c:887 +#: builtin/blame.c:883 msgid "spend extra cycles to find better match" msgstr "ocupar más ciclos para encontrar mejores resultados" -#: builtin/blame.c:888 +#: builtin/blame.c:884 msgid "use revisions from <file> instead of calling git-rev-list" -msgstr "use revisiones en <archivo> en lugar de llamar git-rev-list" +msgstr "usar revisiones en <archivo> en lugar de llamar git-rev-list" -#: builtin/blame.c:889 +#: builtin/blame.c:885 msgid "use <file>'s contents as the final image" msgstr "usar contenido de <archivo> como imagen final" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:886 builtin/blame.c:887 msgid "score" msgstr "puntaje" -#: builtin/blame.c:890 +#: builtin/blame.c:886 msgid "find line copies within and across files" msgstr "encontrar copias de líneas entre y a través de archivos" -#: builtin/blame.c:891 +#: builtin/blame.c:887 msgid "find line movements within and across files" msgstr "encontrar movimientos de líneas entre y a través de archivos" -#: builtin/blame.c:892 +#: builtin/blame.c:888 msgid "range" msgstr "rango" -#: builtin/blame.c:893 +#: builtin/blame.c:889 msgid "process only line range <start>,<end> or function :<funcname>" msgstr "" "procesar solo el rango de líneas <inicio>,<fin> o función :<nombre-de-" "función>" -#: builtin/blame.c:945 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress no puede ser usado con --incremental o formatos de porcelana" @@ -11381,18 +11660,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:996 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "hace 4 años, 11 meses" -#: builtin/blame.c:1112 +#: builtin/blame.c:1111 #, 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:1157 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "Blaming a líneas" @@ -11493,78 +11772,78 @@ msgstr "Eliminada la rama de rastreo remota %s (era %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Eliminada la rama %s (era %s).\n" -#: builtin/branch.c:440 builtin/tag.c:63 +#: builtin/branch.c:441 builtin/tag.c:63 msgid "unable to parse format string" msgstr "no es posible analizar el string de formato" -#: builtin/branch.c:471 +#: builtin/branch.c:472 msgid "could not resolve HEAD" msgstr "no se pudo resolver HEAD" -#: builtin/branch.c:477 +#: builtin/branch.c:478 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) apunta fuera de refs/heads/" -#: builtin/branch.c:492 +#: builtin/branch.c:493 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Rama %s está siendo rebasada en %s" -#: builtin/branch.c:496 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Rama %s está siendo bisecada en %s" -#: builtin/branch.c:513 +#: builtin/branch.c:514 msgid "cannot copy the current branch while not on any." msgstr "no se puede copiar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:515 +#: builtin/branch.c:516 msgid "cannot rename the current branch while not on any." msgstr "no se puede renombrar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:526 +#: builtin/branch.c:527 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nombre de rama inválido: '%s'" -#: builtin/branch.c:555 +#: builtin/branch.c:556 msgid "Branch rename failed" msgstr "Cambio de nombre de rama fallido" -#: builtin/branch.c:557 +#: builtin/branch.c:558 msgid "Branch copy failed" msgstr "Duplicación de rama fallida" -#: builtin/branch.c:561 +#: builtin/branch.c:562 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Copia creada de la rama malnombrada '%s'" -#: builtin/branch.c:564 +#: builtin/branch.c:565 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Rama mal llamada '%s' renombrada" -#: builtin/branch.c:570 +#: builtin/branch.c:571 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!" -#: builtin/branch.c:579 +#: builtin/branch.c:580 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La rama está renombrada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:581 +#: builtin/branch.c:582 msgid "Branch is copied, but update of config-file failed" msgstr "" "La rama está copiada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:597 +#: builtin/branch.c:598 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11575,180 +11854,180 @@ msgstr "" "%s\n" "Las líneas que comiencen con '%c' serán eliminadas.\n" -#: builtin/branch.c:631 +#: builtin/branch.c:632 msgid "Generic options" msgstr "Opciones genéricas" -#: builtin/branch.c:633 +#: builtin/branch.c:634 msgid "show hash and subject, give twice for upstream branch" msgstr "mostrar hash y tema, dar dos veces para rama upstream" -#: builtin/branch.c:634 +#: builtin/branch.c:635 msgid "suppress informational messages" msgstr "suprimir mensajes informativos" -#: builtin/branch.c:635 +#: builtin/branch.c:636 msgid "set up tracking mode (see git-pull(1))" msgstr "configurando modo tracking (mirar git-pull(1))" -#: builtin/branch.c:637 +#: builtin/branch.c:638 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:639 builtin/rebase.c:533 +#: builtin/branch.c:640 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:639 +#: builtin/branch.c:640 msgid "change the upstream info" msgstr "cambiar info de upstream" -#: builtin/branch.c:640 +#: builtin/branch.c:641 msgid "unset the upstream info" -msgstr "desconfigurando la info de upstream" +msgstr "desconfigurar la info de upstream" -#: builtin/branch.c:641 +#: builtin/branch.c:642 msgid "use colored output" msgstr "usar salida con colores" -#: builtin/branch.c:642 +#: builtin/branch.c:643 msgid "act on remote-tracking branches" msgstr "actuar en ramas de rastreo remoto" -#: builtin/branch.c:644 builtin/branch.c:646 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that contain the commit" msgstr "mostrar solo ramas que contengan el commit" -#: builtin/branch.c:645 builtin/branch.c:647 +#: builtin/branch.c:646 builtin/branch.c:648 msgid "print only branches that don't contain the commit" msgstr "mostrar solo ramas que no contengan el commit" -#: builtin/branch.c:650 +#: builtin/branch.c:651 msgid "Specific git-branch actions:" msgstr "Acciones específicas de git-branch:" -#: builtin/branch.c:651 +#: builtin/branch.c:652 msgid "list both remote-tracking and local branches" -msgstr "listar ramas de remote-tracking y locales" +msgstr "listar ramas de remote-tracking y locales" -#: builtin/branch.c:653 +#: builtin/branch.c:654 msgid "delete fully merged branch" msgstr "borrar ramas totalmente fusionadas" -#: builtin/branch.c:654 +#: builtin/branch.c:655 msgid "delete branch (even if not merged)" msgstr "borrar rama (incluso si no está fusionada)" -#: builtin/branch.c:655 +#: builtin/branch.c:656 msgid "move/rename a branch and its reflog" msgstr "mover/renombrar una rama y su reflog" -#: builtin/branch.c:656 +#: builtin/branch.c:657 msgid "move/rename a branch, even if target exists" msgstr "mover/renombrar una rama, incluso si el destino existe" -#: builtin/branch.c:657 +#: builtin/branch.c:658 msgid "copy a branch and its reflog" msgstr "copiar una rama y su reflog" -#: builtin/branch.c:658 +#: builtin/branch.c:659 msgid "copy a branch, even if target exists" msgstr "copiar una rama, incluso si el destino existe" -#: builtin/branch.c:659 +#: builtin/branch.c:660 msgid "list branch names" msgstr "listar nombres de ramas" -#: builtin/branch.c:660 +#: builtin/branch.c:661 msgid "show current branch name" -msgstr "muestra el nombre de branch actual" +msgstr "mostrar el nombre de branch actual" -#: builtin/branch.c:661 +#: builtin/branch.c:662 msgid "create the branch's reflog" -msgstr "crea el reflog de la rama" +msgstr "crear el reflog de la rama" -#: builtin/branch.c:663 +#: builtin/branch.c:664 msgid "edit the description for the branch" -msgstr "edita la descripción de la rama" +msgstr "editar la descripción de la rama" -#: builtin/branch.c:664 +#: builtin/branch.c:665 msgid "force creation, move/rename, deletion" -msgstr "fuerza la creación, movimiento/renombramiento, eliminación" +msgstr "forzar la creación, movimiento/renombramiento, eliminación" -#: builtin/branch.c:665 +#: builtin/branch.c:666 msgid "print only branches that are merged" -msgstr "muestra solo ramas que hayan sido fusionadas" +msgstr "mostrar solo ramas que hayan sido fusionadas" -#: builtin/branch.c:666 +#: builtin/branch.c:667 msgid "print only branches that are not merged" -msgstr "muestra solo ramas que no han sido fusionadas" +msgstr "mostrar solo ramas que no han sido fusionadas" -#: builtin/branch.c:667 +#: builtin/branch.c:668 msgid "list branches in columns" -msgstr "muestra las ramas en columnas" +msgstr "mostrar las ramas en columnas" -#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:477 +#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 +#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 +#: builtin/tag.c:475 msgid "object" msgstr "objeto" -#: builtin/branch.c:670 +#: builtin/branch.c:671 msgid "print only branches of the object" msgstr "imprimir solo las ramas del objeto" -#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 +#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtración son case-insensitive" -#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 +#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:695 builtin/clone.c:794 +#: builtin/branch.c:696 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "¡HEAD no encontrado dentro de refs/heads!" -#: builtin/branch.c:719 +#: builtin/branch.c:720 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 +#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:766 +#: builtin/branch.c:768 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripción al HEAD desacoplado" -#: builtin/branch.c:771 +#: builtin/branch.c:773 msgid "cannot edit description of more than one branch" msgstr "no se puede editar la descripción de más de una rama" -#: builtin/branch.c:778 +#: builtin/branch.c:780 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aún no hay commits en la rama '%s'." -#: builtin/branch.c:781 +#: builtin/branch.c:783 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:796 +#: builtin/branch.c:798 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operación de duplicación" -#: builtin/branch.c:805 +#: builtin/branch.c:807 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operación de renombramiento" -#: builtin/branch.c:810 +#: builtin/branch.c:812 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:814 +#: builtin/branch.c:816 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11756,32 +12035,32 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:817 builtin/branch.c:840 +#: builtin/branch.c:819 builtin/branch.c:842 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:821 +#: builtin/branch.c:823 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:834 +#: builtin/branch.c:836 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:838 +#: builtin/branch.c:840 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:844 +#: builtin/branch.c:846 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Rama '%s' no tiene información de upstream" -#: builtin/branch.c:854 +#: builtin/branch.c:856 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11789,41 +12068,41 @@ msgstr "" "Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n" "¿Quisiste usar: -a|-r --list <patrón>?" -#: builtin/branch.c:858 +#: builtin/branch.c:860 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--" +"la opción '--set-upstream' ya no es soportada. Considera usar '--track' o '--" "set-upstream-to' en cambio." -#: builtin/bugreport.c:15 +#: builtin/bugreport.c:16 msgid "git version:\n" msgstr "versión de git:\n" -#: builtin/bugreport.c:21 +#: builtin/bugreport.c:22 #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "uname() falló con error '%s' (%d)\n" -#: builtin/bugreport.c:31 +#: builtin/bugreport.c:32 msgid "compiler info: " msgstr "información del compilador: " -#: builtin/bugreport.c:34 +#: builtin/bugreport.c:35 msgid "libc info: " msgstr "información de libc: " -#: builtin/bugreport.c:80 +#: builtin/bugreport.c:49 msgid "not run from a git repository - no hooks to show\n" msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n" -#: builtin/bugreport.c:90 +#: builtin/bugreport.c:62 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" msgstr "" "git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]" -#: builtin/bugreport.c:97 +#: builtin/bugreport.c:69 msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -11842,7 +12121,7 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" "¡Gracias por prepara un reporte de bug de Git!\n" -"Por favor conteste las siguientes preguntas para ayudarnos a entender el " +"Por favor contesta las siguientes preguntas para ayudarnos a entender el " "problema.\n" "\n" "¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el " @@ -11850,7 +12129,7 @@ msgstr "" "\n" "¿Qué esperabas que sucediera? (Comportamiento esperado)\n" "\n" -"¿Qué sucedio en lugar de eso? (Comportamiento real)\n" +"¿Qué sucedió en lugar de eso? (Comportamiento real)\n" "\n" "¿Qué es diferente entre lo que esperabas y lo que pasó de verdad?\n" "\n" @@ -11859,39 +12138,34 @@ msgstr "" "Por favor revisa el resto del reporte abajo.\n" "Puedes borrar cualquier línea que no desees compartir.\n" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:108 msgid "specify a destination for the bugreport file" msgstr "especificar el destino para el archivo de reporte de bug" -#: builtin/bugreport.c:138 +#: builtin/bugreport.c:110 msgid "specify a strftime format suffix for the filename" msgstr "" "especificar el sufijo de formato de strftime para el nombre del archivo" -#: builtin/bugreport.c:160 +#: builtin/bugreport.c:132 #, c-format msgid "could not create leading directories for '%s'" msgstr "no se pudo crear directorios principales para '%s'" -#: builtin/bugreport.c:167 +#: builtin/bugreport.c:139 msgid "System Info" msgstr "Información del sistema" -#: builtin/bugreport.c:170 +#: builtin/bugreport.c:142 msgid "Enabled Hooks" msgstr "Hooks habilitados" -#: builtin/bugreport.c:177 -#, c-format -msgid "couldn't create a new file at '%s'" -msgstr "no se pudo crear un archivo nuevo en '%s'" - -#: builtin/bugreport.c:180 +#: builtin/bugreport.c:149 #, c-format msgid "unable to write to %s" msgstr "no es posible escribir en %s" -#: builtin/bugreport.c:190 +#: builtin/bugreport.c:159 #, c-format msgid "Created new report at '%s'.\n" msgstr "Crear un nuevo reporte en '%s'.\n" @@ -11912,53 +12186,53 @@ msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3907 +#: builtin/bundle.c:65 builtin/pack-objects.c:3876 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/bundle.c:69 builtin/pack-objects.c:3909 +#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/bundle.c:71 builtin/pack-objects.c:3911 +#: builtin/bundle.c:69 builtin/pack-objects.c:3880 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/bundle.c:74 builtin/pack-objects.c:3914 +#: builtin/bundle.c:72 builtin/pack-objects.c:3883 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress cuando medidor de progreso es mostrado" -#: builtin/bundle.c:76 +#: builtin/bundle.c:74 msgid "specify bundle format version" msgstr "especificar la versión del formato del paquete" -#: builtin/bundle.c:96 +#: builtin/bundle.c:94 msgid "Need a repository to create a bundle." msgstr "Se necesita un repositorio para agrupar." -#: builtin/bundle.c:109 +#: builtin/bundle.c:107 msgid "do not show bundle details" msgstr "no mostrar detalles del bundle" -#: builtin/bundle.c:128 +#: builtin/bundle.c:126 #, c-format msgid "%s is okay\n" msgstr "%s está bien\n" -#: builtin/bundle.c:179 +#: builtin/bundle.c:182 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/bundle.c:191 builtin/remote.c:1700 -msgid "be verbose; must be placed before a subcommand" -msgstr "ser verboso; tiene que ser agregado antes de un subcomando" +#: builtin/bundle.c:185 +msgid "Unbundling objects" +msgstr "Desagrupando objetos" -#: builtin/bundle.c:213 builtin/remote.c:1731 +#: builtin/bundle.c:219 builtin/remote.c:1733 #, c-format msgid "Unknown subcommand: %s" msgstr "Sub-comando desconocido: %s" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:622 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11966,7 +12240,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" -#: builtin/cat-file.c:597 +#: builtin/cat-file.c:623 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11974,74 +12248,74 @@ msgstr "" "git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-" "symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:618 +#: builtin/cat-file.c:644 msgid "only one batch option may be specified" msgstr "solo se puede especificar una opción batch" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:662 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puede ser: blob, tree, commit, tag" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:663 msgid "show object type" msgstr "mostrar el tipo del objeto" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:664 msgid "show object size" msgstr "mostrar el tamaño del objeto" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:666 msgid "exit with zero when there's no error" msgstr "salir con cero cuando no haya error" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:667 msgid "pretty-print object's content" msgstr "realizar pretty-print del contenido del objeto" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:669 msgid "for blob objects, run textconv on object's content" msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:671 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:646 +#: builtin/cat-file.c:672 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:673 msgid "use a specific path for --textconv/--filters" -msgstr "use una ruta específica para --textconv/--filters" +msgstr "usar una ruta específica para --textconv/--filters" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:675 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permita que -s y -t funcionen con objetos rotos o corruptos" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:676 msgid "buffer --batch output" msgstr "salida buffer --batch" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:678 msgid "show info and content of objects fed from the standard input" msgstr "mostrar info y content de los objetos alimentados por standard input" -#: builtin/cat-file.c:656 +#: builtin/cat-file.c:682 msgid "show info about objects fed from the standard input" msgstr "mostrar info de los objetos alimentados por standard input" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:686 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:688 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos los objetos con --batch o --batch-check" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:690 msgid "do not order --batch-all-objects output" -msgstr "no ordenar el salida de --batch-all-objects" +msgstr "no ordenar la salida de --batch-all-objects" #: builtin/check-attr.c:13 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." @@ -12057,9 +12331,9 @@ msgstr "reportar todos los atributos configurados en el archivo" #: builtin/check-attr.c:22 msgid "use .gitattributes only from the index" -msgstr "use .gitattributes solo desde el índice" +msgstr "usar .gitattributes solo desde el índice" -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "leer nombres de archivos de stdin" @@ -12067,8 +12341,8 @@ msgstr "leer nombres de archivos de stdin" msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 -#: builtin/worktree.c:493 +#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549 +#: builtin/worktree.c:494 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -12126,11 +12400,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<opciones>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1892 -#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 -#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 -#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 -#: builtin/worktree.c:728 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 +#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 +#: builtin/worktree.c:492 builtin/worktree.c:729 msgid "string" msgstr "string" @@ -12283,11 +12556,11 @@ msgstr "'%s' o '%s' no puede ser usado con %s" msgid "path '%s' is unmerged" msgstr "ruta '%s' no está fusionada" -#: builtin/checkout.c:734 +#: builtin/checkout.c:736 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:788 +#: builtin/checkout.c:786 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12296,50 +12569,50 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:881 +#: builtin/checkout.c:879 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:923 +#: builtin/checkout.c:921 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:931 +#: builtin/checkout.c:929 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:934 +#: builtin/checkout.c:932 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:938 +#: builtin/checkout.c:936 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:940 builtin/checkout.c:1371 +#: builtin/checkout.c:938 builtin/checkout.c:1369 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:942 +#: builtin/checkout.c:940 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:993 +#: builtin/checkout.c:991 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:999 +#: builtin/checkout.c:997 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12362,7 +12635,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1016 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12389,28 +12662,28 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1053 +#: builtin/checkout.c:1051 msgid "internal error in revision walk" msgstr "error interno en recorrido de revisiones" -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1055 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:1097 builtin/checkout.c:1366 +#: builtin/checkout.c:1095 builtin/checkout.c:1364 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1179 +#: builtin/checkout.c:1177 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" "'%s' puede ser tanto un archivo local como una rama de rastreo.\n" -"Por favor use -- (y opcionalmente --no-guess) para desambiguar" +"Por favor usa -- (y opcionalmente --no-guess) para desambiguar" -#: builtin/checkout.c:1186 +#: builtin/checkout.c:1184 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12430,51 +12703,51 @@ msgstr "" "un remoto particular, como 'origin', considera configurar\n" "checkout.defaultRemote=origin en tu configuración." -#: builtin/checkout.c:1196 +#: builtin/checkout.c:1194 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' concordó con múltiples (%d) ramas de rastreo remoto" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1260 msgid "only one reference expected" msgstr "solo una referencia esperada" -#: builtin/checkout.c:1279 +#: builtin/checkout.c:1277 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 +#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1338 builtin/checkout.c:1707 +#: builtin/checkout.c:1336 builtin/checkout.c:1705 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es un árbol: %s" -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1383 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1387 +#: builtin/checkout.c:1385 #, 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:1388 builtin/checkout.c:1396 +#: builtin/checkout.c:1386 builtin/checkout.c:1394 #, c-format msgid "a branch is expected, got '%s'" msgstr "se esperaba branch, se obtuvo '%s'" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1389 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1405 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12482,7 +12755,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1409 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12490,7 +12763,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:1415 +#: builtin/checkout.c:1413 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12498,7 +12771,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1417 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12506,7 +12779,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:1423 +#: builtin/checkout.c:1421 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12514,137 +12787,137 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1427 +#: builtin/checkout.c:1425 msgid "you are switching branch while bisecting" msgstr "estás cambiando de rama durante un bisect" -#: builtin/checkout.c:1434 +#: builtin/checkout.c:1432 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 +#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 -#: builtin/checkout.c:1460 builtin/checkout.c:1465 +#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 +#: builtin/checkout.c:1458 builtin/checkout.c:1463 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1460 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1470 +#: builtin/checkout.c:1468 #, 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:1477 +#: builtin/checkout.c:1475 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1520 +#: builtin/checkout.c:1518 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:1521 builtin/log.c:1810 parse-options.h:323 +#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1522 +#: builtin/checkout.c:1520 msgid "conflict style (merge or diff3)" msgstr "estilo de conflictos (merge o diff3)" -#: builtin/checkout.c:1534 builtin/worktree.c:488 +#: builtin/checkout.c:1532 builtin/worktree.c:489 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1533 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1535 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1539 +#: builtin/checkout.c:1537 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1539 +#: builtin/checkout.c:1537 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1541 builtin/merge.c:301 +#: builtin/checkout.c:1539 builtin/merge.c:302 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1542 msgid "do not check if another worktree is holding the given ref" msgstr "no averiguar si otro árbol de trabajo contiene la ref entregada" -#: builtin/checkout.c:1557 +#: builtin/checkout.c:1555 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1560 +#: builtin/checkout.c:1558 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1564 +#: builtin/checkout.c:1562 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a entradas escasas solamente" -#: builtin/checkout.c:1622 +#: builtin/checkout.c:1620 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1626 +#: builtin/checkout.c:1624 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1663 +#: builtin/checkout.c:1661 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1668 +#: builtin/checkout.c:1666 #, c-format msgid "missing branch name; try -%c" msgstr "falta nombre de rama; prueba -%c" -#: builtin/checkout.c:1700 +#: builtin/checkout.c:1698 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1714 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1723 +#: builtin/checkout.c:1721 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1725 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1734 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file es incompatible con --detach" -#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 +#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file es incompatible con --patch" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1750 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12652,71 +12925,71 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1757 +#: builtin/checkout.c:1755 msgid "you must specify path(s) to restore" msgstr "debes especificar path(s) para restaurar" -#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 -#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2736 -#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 -#: builtin/worktree.c:486 +#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 +#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2958 +#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1784 +#: builtin/checkout.c:1782 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1785 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" +msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1790 +#: builtin/checkout.c:1788 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1835 +#: builtin/checkout.c:1833 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "second guess 'git switch <no-such-branch>'" -msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" +msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1875 +#: builtin/checkout.c:1873 msgid "which tree-ish to checkout from" msgstr "de qué árbol hacer el checkout" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "restore the index" msgstr "restaurar el índice" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the working tree (default)" msgstr "restaurar el árbol de trabajo (default)" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1882 +#: builtin/checkout.c:1880 msgid "use overlay mode" msgstr "usar modo overlay" @@ -12760,8 +13033,8 @@ msgid "" " - (empty) select nothing\n" msgstr "" "Ayuda de comandos:\n" -"1 - selecciona un objeto por número\n" -"foo - selecciona un objeto basado en un prefijo único\n" +"1 - seleccionar un objeto por número\n" +"foo - seleccionar un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" #: builtin/clean.c:304 git-add--interactive.perl:602 @@ -12777,10 +13050,10 @@ msgid "" " - (empty) finish selecting\n" msgstr "" "Ayuda de comandos:\n" -"1 - selecciona un objeto único\n" -"3-5 - selecciona un rango de objetos\n" -"2-3,6-9 - selecciona múltiples rangos\n" -"foo - selecciona un objeto basado en un prefijo único\n" +"1 - seleccionar un objeto único\n" +"3-5 - seleccionar un rango de objetos\n" +"2-3,6-9 - seleccionar múltiples rangos\n" +"foo - seleccionar un objeto basado en un prefijo único\n" "-... - de-seleccionar objetos especificados\n" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" @@ -12822,8 +13095,8 @@ msgid "" "? - help for prompt selection" msgstr "" "clean - comenzar la limpieza\n" -"filter by pattern - excluye objetos de la eliminación\n" -"select by numbers - selecciona objetos a ser borrados por número\n" +"filter by pattern - excluir objetos de la eliminación\n" +"select by numbers - seleccionar objetos a ser borrados por número\n" "ask each - confirmar cada eliminación (como \"rm -i\")\n" "quit - parar limpieza\n" "help - esta pantalla\n" @@ -12856,8 +13129,8 @@ msgid "remove whole directories" msgstr "borrar directorios completos" #: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" @@ -12946,25 +13219,26 @@ msgstr "directorio-template" msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 -#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:123 builtin/submodule--helper.c:1901 -#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 +#: builtin/clone.c:123 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:2515 msgid "use --reference only while cloning" -msgstr "usa --reference solamente si estás clonando" +msgstr "usar --reference solamente si estás clonando" #: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 -#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 +#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 +#: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "nombre" #: builtin/clone.c:125 msgid "use <name> instead of 'origin' to track upstream" -msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" +msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream" #: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" @@ -12974,7 +13248,7 @@ msgstr "checkout <rama> en lugar de HEAD remota" msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 #: builtin/pull.c:208 msgid "depth" msgstr "profundidad" @@ -12983,7 +13257,7 @@ msgstr "profundidad" msgid "create a shallow clone of that depth" msgstr "crear un clon superficial de esa profundidad" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 #: builtin/pull.c:211 msgid "time" msgstr "tiempo" @@ -12993,7 +13267,7 @@ msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022 msgid "revision" msgstr "revisión" @@ -13001,8 +13275,8 @@ msgstr "revisión" msgid "deepen history of shallow clone, excluding rev" msgstr "ahondar historia de clon superficial, excluyendo rev" -#: builtin/clone.c:137 builtin/submodule--helper.c:1911 -#: builtin/submodule--helper.c:2369 +#: builtin/clone.c:137 builtin/submodule--helper.c:1882 +#: builtin/submodule--helper.c:2529 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama, HEAD o --branch" @@ -13020,7 +13294,7 @@ msgstr "gitdir" #: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" -msgstr "separa git dir del árbol de trabajo" +msgstr "separar git dir del árbol de trabajo" #: builtin/clone.c:144 msgid "key=value" @@ -13031,12 +13305,12 @@ msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "específico-al-servidor" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "opción para trasmitir" @@ -13059,50 +13333,42 @@ 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:292 -msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -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:345 +#: builtin/clone.c:231 #, 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:418 +#: builtin/clone.c:304 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:436 +#: builtin/clone.c:322 #, c-format msgid "failed to start iterator over '%s'" msgstr "falló al iniciar el iterador sobre '%s'" -#: builtin/clone.c:467 +#: builtin/clone.c:353 #, c-format msgid "failed to create link '%s'" msgstr "falló al crear link '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:357 #, c-format msgid "failed to copy file to '%s'" msgstr "falló al copiar archivo a '%s'" -#: builtin/clone.c:476 +#: builtin/clone.c:362 #, c-format msgid "failed to iterate over '%s'" msgstr "falló al iterar sobre '%s'" -#: builtin/clone.c:503 +#: builtin/clone.c:389 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:517 +#: builtin/clone.c:403 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -13112,105 +13378,105 @@ msgstr "" "Puedes inspeccionar a qué se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:594 +#: builtin/clone.c:480 #, 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:713 +#: builtin/clone.c:597 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:761 +#: builtin/clone.c:645 msgid "failed to initialize sparse-checkout" msgstr "falló al inicializar sparse-checkout" -#: builtin/clone.c:784 +#: builtin/clone.c:668 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:816 +#: builtin/clone.c:701 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:894 +#: builtin/clone.c:779 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:957 +#: builtin/clone.c:842 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:959 +#: builtin/clone.c:844 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivo de alternos temporal" -#: builtin/clone.c:1001 builtin/receive-pack.c:2490 +#: builtin/clone.c:886 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: builtin/clone.c:1005 +#: builtin/clone.c:890 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:1018 +#: builtin/clone.c:903 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:1021 +#: builtin/clone.c:906 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:1035 +#: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:1039 builtin/fetch.c:2014 +#: builtin/clone.c:924 builtin/fetch.c:2029 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un número positivo" -#: builtin/clone.c:1049 +#: builtin/clone.c:934 #, 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:1055 +#: builtin/clone.c:940 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "la ruta del repositorio '%s' ya existe y no es un directorio vacío." -#: builtin/clone.c:1069 +#: builtin/clone.c:954 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 +#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:1089 +#: builtin/clone.c:974 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:1109 +#: builtin/clone.c:994 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:1111 +#: builtin/clone.c:996 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1135 +#: builtin/clone.c:1025 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -13218,48 +13484,48 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no es un nombre remoto válido" -#: builtin/clone.c:1229 +#: builtin/clone.c:1121 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:1231 +#: builtin/clone.c:1123 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -"--shallow-since es ignorado en clonaciones locales; use file:// en su lugar." +"--shallow-since es ignorado en clonaciones locales; usa file:// en su lugar." -#: builtin/clone.c:1233 +#: builtin/clone.c:1125 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -"--shallow-exclude es ignorado en clonaciones locales; use file:// en su " +"--shallow-exclude es ignorado en clonaciones locales; usa file:// en su " "lugar." -#: builtin/clone.c:1235 +#: builtin/clone.c:1127 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter es ignorado en clonaciones locales; usa file:// en su lugar." -#: builtin/clone.c:1240 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1245 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1324 builtin/clone.c:1383 +#: builtin/clone.c:1216 builtin/clone.c:1276 msgid "remote transport reported error" msgstr "transporte remoto reportó error" -#: builtin/clone.c:1336 builtin/clone.c:1344 +#: builtin/clone.c:1228 builtin/clone.c:1239 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1347 +#: builtin/clone.c:1242 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -13295,13 +13561,13 @@ msgstr "espacio padding entre columnas" msgid "--command must be the first argument" msgstr "--command debe ser el primer argumento" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 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:27 +#: builtin/commit-graph.c:16 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" @@ -13311,93 +13577,91 @@ msgstr "" "split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>" -#: builtin/commit-graph.c:64 -#, c-format -msgid "could not find object directory matching %s" -msgstr "no se pudo encontrar el directorio de objetos concordante con %s" - -#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 +#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 -#: builtin/commit-graph.c:317 +#: builtin/commit-graph.c:52 msgid "the object directory to store the graph" msgstr "el directorio de objetos en que guardar el gráfico" -#: builtin/commit-graph.c:83 +#: builtin/commit-graph.c:73 msgid "if the commit-graph is split, only verify the tip file" msgstr "si el commit-graph está cortado, solo verifica el archivo tope" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:100 #, c-format msgid "Could not open commit-graph '%s'" msgstr "No se pudo abrir commit-graph '%s'" -#: builtin/commit-graph.c:142 +#: builtin/commit-graph.c:137 #, c-format msgid "unrecognized --split argument, %s" msgstr "argumento --split no reconocido, %s" -#: builtin/commit-graph.c:155 +#: builtin/commit-graph.c:150 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "ID de objeto no hex inesperado: %s" -#: builtin/commit-graph.c:160 +#: builtin/commit-graph.c:155 #, c-format msgid "invalid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/commit-graph.c:213 +#: builtin/commit-graph.c:205 msgid "start walk at all refs" msgstr "comenzar recorrido en todas las refs" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:207 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de índices por stdin por commits" -#: builtin/commit-graph.c:217 +#: builtin/commit-graph.c:209 msgid "start walk at commits listed by stdin" msgstr "comenzar recorrido a los commits listados por stdin" -#: builtin/commit-graph.c:219 +#: builtin/commit-graph.c:211 msgid "include all commits already in the commit-graph file" -msgstr "incluye todos los commits que ya están en el archivo commit-graph" +msgstr "incluir todos los commits que ya están en el archivo commit-graph" -#: builtin/commit-graph.c:221 +#: builtin/commit-graph.c:213 msgid "enable computation for changed paths" msgstr "habilitar computación para rutas cambiadas" -#: builtin/commit-graph.c:224 +#: builtin/commit-graph.c:215 msgid "allow writing an incremental commit-graph file" msgstr "permitir escribir un archivo commit-graph incremental" -#: builtin/commit-graph.c:228 +#: builtin/commit-graph.c:219 msgid "maximum number of commits in a non-base split commit-graph" msgstr "número máximo de commits en un commit-graph sin base cortada" -#: builtin/commit-graph.c:230 +#: builtin/commit-graph.c:221 msgid "maximum ratio between two levels of a split commit-graph" msgstr "razón máxima entre dos niveles de corte de commit-graph" -#: builtin/commit-graph.c:232 +#: builtin/commit-graph.c:223 msgid "only expire files older than a given date-time" msgstr "solo caducar objetos más viejos a una fecha dada" -#: builtin/commit-graph.c:234 +#: builtin/commit-graph.c:225 msgid "maximum number of changed-path Bloom filters to compute" msgstr "número máximo de cambios de ruta de filtro Bloom para computar" -#: builtin/commit-graph.c:255 +#: builtin/commit-graph.c:251 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" +msgstr "usa como máximo uno de --reachable, --stdin-commits, o --stdin-packs" -#: builtin/commit-graph.c:287 +#: builtin/commit-graph.c:282 msgid "Collecting commits from input" msgstr "Recolectando commits del input" +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 +#, c-format +msgid "unrecognized subcommand: %s" +msgstr "subcomando desconocido: %s" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -13411,70 +13675,65 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "padre duplicado %s ignorado" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto válido %s" -#: builtin/commit-tree.c:93 -#, c-format -msgid "git commit-tree: failed to open '%s'" -msgstr "git commit-tree: falló al abrir '%s'" - -#: builtin/commit-tree.c:96 +#: builtin/commit-tree.c:94 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree: falló al leer '%s'" -#: builtin/commit-tree.c:98 +#: builtin/commit-tree.c:96 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree: falló al cerrar '%s'" -#: builtin/commit-tree.c:111 +#: builtin/commit-tree.c:109 msgid "parent" msgstr "padre" -#: builtin/commit-tree.c:112 +#: builtin/commit-tree.c:110 msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 -#: builtin/tag.c:456 +#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 +#: builtin/tag.c:454 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1624 +#: builtin/commit-tree.c:113 builtin/commit.c:1626 msgid "commit message" msgstr "mensaje del commit" -#: builtin/commit-tree.c:118 +#: builtin/commit-tree.c:116 msgid "read commit log message from file" msgstr "leer mensaje de commit desde un archivo" -#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 +#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" -#: builtin/commit-tree.c:133 +#: builtin/commit-tree.c:131 msgid "must give exactly one tree" -msgstr "tiene que dar exactamente un árbol" +msgstr "hay que dar exactamente un árbol" -#: builtin/commit-tree.c:140 +#: builtin/commit-tree.c:138 msgid "git commit-tree: failed to read" msgstr "git commit-tree: falló al leer" -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<opciones>] [--] <especificación-de-ruta>..." -#: builtin/commit.c:51 +#: builtin/commit.c:52 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -13484,7 +13743,7 @@ msgstr "" "vaciaría. Puedes repetir el comando con --allow-empty, o puedes eliminar\n" "el commit completamente con \"git reset HEAD^\".\n" -#: builtin/commit.c:56 +#: builtin/commit.c:57 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -13499,15 +13758,15 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:63 +#: builtin/commit.c:64 msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "Caso contrario, por favor usa 'git rebase --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:67 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n" -#: builtin/commit.c:69 +#: builtin/commit.c:70 msgid "" "and then use:\n" "\n" @@ -13529,73 +13788,73 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:324 +#: builtin/commit.c:325 msgid "failed to unpack HEAD tree object" msgstr "falló al desempaquetar objeto del árbol HEAD" -#: builtin/commit.c:360 +#: builtin/commit.c:361 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file con -a no tiene sentido" -#: builtin/commit.c:374 +#: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only sin ruta no tiene sentido." -#: builtin/commit.c:386 +#: builtin/commit.c:387 msgid "unable to create temporary index" msgstr "no es posible crear un índice temporal" -#: builtin/commit.c:395 +#: builtin/commit.c:396 msgid "interactive add failed" msgstr "adición interactiva fallida" -#: builtin/commit.c:410 +#: builtin/commit.c:411 msgid "unable to update temporary index" msgstr "no es posible actualizar el índice temporal" -#: builtin/commit.c:412 +#: builtin/commit.c:413 msgid "Failed to update main cache tree" msgstr "Falló al actualizar el árbol de caché principal" -#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 +#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:489 +#: builtin/commit.c:490 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusión." -#: builtin/commit.c:491 +#: builtin/commit.c:492 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:493 +#: builtin/commit.c:494 msgid "cannot do a partial commit during a rebase." msgstr "no se puede realizar un commit parcial durante un rebase." -#: builtin/commit.c:501 +#: builtin/commit.c:502 msgid "cannot read the index" msgstr "no se puede leer el índice" -#: builtin/commit.c:520 +#: builtin/commit.c:521 msgid "unable to write temporary index file" msgstr "no es posible escribir el índice temporal" -#: builtin/commit.c:618 +#: builtin/commit.c:619 #, c-format msgid "commit '%s' lacks author header" msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:620 +#: builtin/commit.c:621 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una línea de autor mal formada" -#: builtin/commit.c:639 +#: builtin/commit.c:640 msgid "malformed --author parameter" msgstr "parámetro --author mal formado" -#: builtin/commit.c:692 +#: builtin/commit.c:693 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -13603,43 +13862,43 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no sea usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 +#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:758 builtin/shortlog.c:413 +#: builtin/commit.c:759 builtin/shortlog.c:416 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" -#: builtin/commit.c:760 +#: builtin/commit.c:761 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:764 +#: builtin/commit.c:765 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:801 +#: builtin/commit.c:802 #, c-format msgid "cannot combine -m with --fixup:%s" msgstr "no se puede combinar -m con --fixup:%s" -#: builtin/commit.c:813 builtin/commit.c:829 +#: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:820 +#: builtin/commit.c:821 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:880 +#: builtin/commit.c:881 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:893 +#: builtin/commit.c:894 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13648,7 +13907,7 @@ msgstr "" "Por favor ingresa el mensaje del commit para tus cambios. Las\n" " líneas que comiencen con '%c' serán ignoradas.\n" -#: builtin/commit.c:895 +#: builtin/commit.c:896 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13658,17 +13917,17 @@ msgstr "" " líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" " vacío aborta el commit.\n" -#: builtin/commit.c:899 +#: builtin/commit.c:900 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" msgstr "" "Por favor ingresa el mensaje del commit para tus cambios. Las\n" -" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n" -" usted mismo si lo desea.\n" +" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n" +" tú mismo si lo deseas.\n" -#: builtin/commit.c:903 +#: builtin/commit.c:904 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13676,11 +13935,11 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" "Por favor ingresa el mensaje del commit para tus cambios. Las\n" -" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n" -" usted mismo si lo desea.\n" +" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n" +" tú mismo si lo deseas.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:915 +#: builtin/commit.c:916 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13689,12 +13948,12 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que está realizando una fusión.\n" -"Si esto no es correcto, ejecute\n" +"Parece que estás realizando una fusión.\n" +"Si esto no es correcto, ejecuta\n" "\tgit update-ref -d MERGE_HEAD\n" "e intenta de nuevo.\n" -#: builtin/commit.c:920 +#: builtin/commit.c:921 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13703,78 +13962,78 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que puede estar cometiendo una selección de cerezas.\n" -"Si esto no es correcto, ejecute\n" +"Parece que puedes estar cometiendo una selección de cerezas.\n" +"Si esto no es correcto, ejecuta\n" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "e intenta de nuevo.\n" -#: builtin/commit.c:947 +#: builtin/commit.c:948 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:955 +#: builtin/commit.c:956 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:962 +#: builtin/commit.c:963 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:980 +#: builtin/commit.c:981 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:1025 +#: builtin/commit.c:1026 msgid "unable to pass trailers to --trailers" msgstr "no se puede pasar trailers a --trailers" -#: builtin/commit.c:1065 +#: builtin/commit.c:1066 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:1079 builtin/tag.c:319 +#: builtin/commit.c:1080 builtin/tag.c:317 #, 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:1123 +#: builtin/commit.c:1124 #, 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:1137 +#: builtin/commit.c:1138 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo de ignorancia inválido '%s'" -#: builtin/commit.c:1155 builtin/commit.c:1448 +#: builtin/commit.c:1156 builtin/commit.c:1450 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de archivos no rastreados '%s'" -#: builtin/commit.c:1195 +#: builtin/commit.c:1196 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1226 +#: builtin/commit.c:1227 msgid "You are in the middle of a merge -- cannot reword." msgstr "Estás en medio de una fusión -- no puedes renombrar." -#: builtin/commit.c:1228 +#: builtin/commit.c:1229 msgid "You are in the middle of a cherry-pick -- cannot reword." -msgstr "Está en medio de un cherry-pick -- no se puede renombrar." +msgstr "Estás en medio de un cherry-pick -- no se puede renombrar." -#: builtin/commit.c:1231 +#: builtin/commit.c:1232 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "no se puede combinar opción de renombrar de --fixup con ruta '%s'" -#: builtin/commit.c:1233 +#: builtin/commit.c:1234 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" @@ -13782,103 +14041,103 @@ msgstr "" "opción de refraseado de --fixup es mutuamente exclusiva con --patch/--" "interactive/--all/--include/--only" -#: builtin/commit.c:1252 +#: builtin/commit.c:1253 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1261 +#: builtin/commit.c:1260 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1264 +#: builtin/commit.c:1263 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:1266 +#: builtin/commit.c:1265 msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "Está en medio de un cherry-pick -- no se puede enmendar." +msgstr "Estás en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1268 +#: builtin/commit.c:1267 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1271 +#: builtin/commit.c:1270 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1281 +#: builtin/commit.c:1280 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:1283 +#: builtin/commit.c:1282 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:1292 +#: builtin/commit.c:1291 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author solo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1310 +#: builtin/commit.c:1309 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:1338 +#: builtin/commit.c:1337 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "opción desconocida: --fixup=%s:%s" -#: builtin/commit.c:1352 +#: builtin/commit.c:1354 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1483 builtin/commit.c:1652 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1485 builtin/commit.c:1654 +#: builtin/commit.c:1487 builtin/commit.c:1656 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1487 +#: builtin/commit.c:1489 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1489 builtin/commit.c:1656 +#: builtin/commit.c:1491 builtin/commit.c:1658 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1491 +#: builtin/commit.c:1493 msgid "version" -msgstr "version" +msgstr "versión" -#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 -#: builtin/worktree.c:690 +#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 +#: builtin/worktree.c:691 msgid "machine-readable output" msgstr "output en formato de máquina" -#: builtin/commit.c:1494 builtin/commit.c:1660 +#: builtin/commit.c:1496 builtin/commit.c:1662 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1497 builtin/commit.c:1663 +#: builtin/commit.c:1499 builtin/commit.c:1665 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 -#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 +#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1500 builtin/commit.c:1666 +#: builtin/commit.c:1502 builtin/commit.c:1668 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:1504 +#: builtin/commit.c:1506 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13886,11 +14145,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1506 parse-options.h:193 +#: builtin/commit.c:1508 parse-options.h:192 msgid "when" msgstr "cuando" -#: builtin/commit.c:1507 +#: builtin/commit.c:1509 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13898,202 +14157,202 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1509 +#: builtin/commit.c:1511 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1510 +#: builtin/commit.c:1512 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1512 +#: builtin/commit.c:1514 msgid "detect renames, optionally set similarity index" msgstr "detectar renombrados, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1535 +#: builtin/commit.c:1537 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:1617 +#: builtin/commit.c:1619 msgid "suppress summary after successful commit" -msgstr "suprime summary tras un commit exitoso" +msgstr "suprimir summary tras un commit exitoso" -#: builtin/commit.c:1618 +#: builtin/commit.c:1620 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1620 +#: builtin/commit.c:1622 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1622 +#: builtin/commit.c:1624 msgid "author" msgstr "autor" -#: builtin/commit.c:1622 +#: builtin/commit.c:1624 msgid "override author for commit" -msgstr "sobrescribe el autor del commit" +msgstr "sobrescribir el autor del commit" -#: builtin/commit.c:1623 builtin/gc.c:550 +#: builtin/commit.c:1625 builtin/gc.c:550 msgid "date" msgstr "fecha" -#: builtin/commit.c:1623 +#: builtin/commit.c:1625 msgid "override date for commit" -msgstr "sobrescribe la fecha del commit" +msgstr "sobrescribir la fecha del commit" -#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 -#: parse-options.h:329 ref-filter.h:90 +#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 +#: parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1625 +#: builtin/commit.c:1627 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit específico" -#: builtin/commit.c:1626 +#: builtin/commit.c:1628 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit específico" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1631 +#: builtin/commit.c:1633 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1631 +#: builtin/commit.c:1633 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" -"usar mensaje de formato autosquash para arreglar el amend/renombrado del " +"usar mensaje de formato autosquash para arreglar el amend/renombrado del " "commit especificado" -#: builtin/commit.c:1632 +#: builtin/commit.c:1634 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:1633 +#: builtin/commit.c:1635 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:1634 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "trailer" -#: builtin/commit.c:1634 +#: builtin/commit.c:1636 msgid "add custom trailer(s)" msgstr "agregando trailer(s) personalizados" -#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 +#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "agregar una línea Signed-off-by al final" -#: builtin/commit.c:1636 +#: builtin/commit.c:1638 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1637 +#: builtin/commit.c:1639 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1639 +#: builtin/commit.c:1641 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1644 +#: builtin/commit.c:1646 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1645 +#: builtin/commit.c:1647 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1646 +#: builtin/commit.c:1648 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1647 +#: builtin/commit.c:1649 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1648 +#: builtin/commit.c:1650 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1649 +#: builtin/commit.c:1651 msgid "commit only specified files" msgstr "solo confirmar archivos específicos" -#: builtin/commit.c:1650 +#: builtin/commit.c:1652 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1651 +#: builtin/commit.c:1653 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1664 +#: builtin/commit.c:1666 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1665 +#: builtin/commit.c:1667 msgid "bypass post-rewrite hook" -msgstr "salta el gancho de postreescritura" +msgstr "saltar el gancho de postreescritura" -#: builtin/commit.c:1672 +#: builtin/commit.c:1674 msgid "ok to record an empty change" msgstr "vale grabar un cambio vacío" -#: builtin/commit.c:1674 +#: builtin/commit.c:1676 msgid "ok to record a change with an empty message" msgstr "vale grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1750 +#: builtin/commit.c:1752 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1757 +#: builtin/commit.c:1759 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1778 +#: builtin/commit.c:1780 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1785 +#: builtin/commit.c:1787 #, 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:1790 +#: builtin/commit.c:1792 #, 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:1801 +#: builtin/commit.c:1803 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Abortando commit debido que el cuerpo del mensaje está en blanco.\n" -#: builtin/commit.c:1837 +#: builtin/commit.c:1839 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n" -"new_index. Verifique que el disco no esté lleno y la cuota no haya\n" +"new_index. Verifica que el disco no esté lleno y la cuota no haya\n" "sido superada, y luego \"git restore --staged :/\" para recuperar." #: builtin/config.c:11 @@ -14192,7 +14451,7 @@ msgstr "listar todo" #: builtin/config.c:149 msgid "use string equality when comparing values to 'value-pattern'" -msgstr "use la igualdad de cadenas al comparar valores con 'patrón de valor'" +msgstr "usar la igualdad de cadenas al comparar valores con 'patrón de valor'" #: builtin/config.c:150 msgid "open an editor" @@ -14271,7 +14530,7 @@ msgstr "valor" #: builtin/config.c:167 msgid "with --get, use default value when missing entry" -msgstr "con --get, usa el valor por defecto cuando falta una entrada" +msgstr "con --get, usar el valor por defecto cuando falta una entrada" #: builtin/config.c:181 #, c-format @@ -14357,7 +14616,7 @@ msgid "" msgstr "" "--worktree no puede ser usado con múltiples árboles de trabajo a menos que " "la\n" -"extensión worktreeConfig esté habilitada. Por favor lea \"CONFIGURATION FILE" +"extensión worktreeConfig esté habilitada. Por favor lee \"CONFIGURATION FILE" "\"\n" "en \"git help worktree\" para más detalles" @@ -14417,7 +14676,7 @@ msgid "" " Use a regexp, --add or --replace-all to change %s." msgstr "" "no se puede sobrescribir múltiples valores con un único valor\n" -" Use una regexp, --add o --replace-all para cambiar %s." +" Usa una regexp, --add o --replace-all para cambiar %s." #: builtin/config.c:943 builtin/config.c:954 #, c-format @@ -14454,7 +14713,7 @@ msgstr "mostrar mensajes de debug en stderr" msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix" -#: builtin/credential-cache.c:154 +#: builtin/credential-cache.c:180 msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache no disponible; sin soporte de socket Unix" @@ -14516,7 +14775,7 @@ msgid "" "However, there were unannotated tags: try --tags." msgstr "" "No hay tags anotados que puedan describir '%s'.\n" -"Sin embargo, hubieron tags no anotados: intente --tags." +"Sin embargo, hubieron tags no anotados: intenta --tags." #: builtin/describe.c:428 #, c-format @@ -14525,7 +14784,7 @@ msgid "" "Try --always, or create some tags." msgstr "" "Ningún tag puede describir '%s'.\n" -"Intente --always, o cree algunos tags." +"Intenta --always, o crea algunos tags." #: builtin/describe.c:458 #, c-format @@ -14566,11 +14825,11 @@ msgstr "hacer debug a la estrategia de búsqueda en stderr" #: builtin/describe.c:556 msgid "use any ref" -msgstr "use cualquier ref" +msgstr "usar cualquier ref" #: builtin/describe.c:557 msgid "use any tag, even unannotated" -msgstr "use cualquier tag, incluso los no anotados" +msgstr "usar cualquier tag, incluso los no anotados" #: builtin/describe.c:558 msgid "always use long format" @@ -14649,13 +14908,13 @@ msgstr "opción inválida: %s" #: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" -msgstr "%s...%s: se neceista una base de fusión" +msgstr "%s...%s: se necesita una base de fusión" #: builtin/diff.c:486 msgid "Not a git repository" msgstr "No es un repositorio git" -#: builtin/diff.c:532 builtin/grep.c:684 +#: builtin/diff.c:532 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "objeto '%s' entregado no es válido." @@ -14679,114 +14938,114 @@ msgstr "%s...%s: múltiples bases de fusión, usando %s" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" -#: builtin/difftool.c:261 -#, c-format -msgid "failed: %d" -msgstr "falló: %d" - -#: builtin/difftool.c:303 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink %s" msgstr "no se pudo leer el symlink %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink file %s" msgstr "no se pudo leer el archivo symlink %s" -#: builtin/difftool.c:313 +#: builtin/difftool.c:303 #, c-format msgid "could not read object %s for symlink %s" msgstr "no se pudo leer el objeto %s para el symlink %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:427 msgid "" -"combined diff formats('-c' and '--cc') are not supported in\n" -"directory diff mode('-d' and '--dir-diff')." +"combined diff formats ('-c' and '--cc') are not supported in\n" +"directory diff mode ('-d' and '--dir-diff')." msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:637 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:639 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "archivo del árbol de trabajo ha sido dejado." -#: builtin/difftool.c:650 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:651 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "tal vez desees limpiar o recuperar estos." -#: builtin/difftool.c:699 +#: builtin/difftool.c:651 +#, c-format +msgid "failed: %d" +msgstr "falló: %d" + +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" -msgstr "use `diff.guitool` en lugar de `diff.tool`" +msgstr "usar `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:701 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:703 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:708 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:706 msgid "tool" msgstr "herramienta" -#: builtin/difftool.c:710 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:712 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" -#: builtin/difftool.c:715 +#: builtin/difftool.c:712 msgid "" -"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:718 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:719 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "pasado a `diff`" -#: builtin/difftool.c:734 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool requiere un árbol de trabajo o --no-index" -#: builtin/difftool.c:741 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff es incompatible con --no-index" -#: builtin/difftool.c:744 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool y --extcmd son mutuamente exclusivas" -#: builtin/difftool.c:752 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:759 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -14794,7 +15053,7 @@ msgstr "no se ha entregado <comando> para --extcmd=<comando>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>" -#: builtin/env--helper.c:42 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:96 msgid "type" msgstr "tipo" @@ -14823,98 +15082,98 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:868 +#: builtin/fast-export.c:869 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" "Error: No se puede exportar los tags anidados a menos que --mark-tags sea " "especificado." -#: builtin/fast-export.c:1177 +#: builtin/fast-export.c:1178 msgid "--anonymize-map token cannot be empty" msgstr "token --anonymize-map no puede estar vacío" -#: builtin/fast-export.c:1197 +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "mostrar progreso después de <n> objetos" -#: builtin/fast-export.c:1199 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "seleccionar el manejo de tags firmados" -#: builtin/fast-export.c:1202 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "seleccionar el manejo de tags que son tags de objetos filtrados" -#: builtin/fast-export.c:1205 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente" -#: builtin/fast-export.c:1208 +#: builtin/fast-export.c:1209 msgid "dump marks to this file" msgstr "volcar marcas a este archivo" -#: builtin/fast-export.c:1210 +#: builtin/fast-export.c:1211 msgid "import marks from this file" msgstr "importar marcas de este archivo" -#: builtin/fast-export.c:1214 +#: builtin/fast-export.c:1215 msgid "import marks from this file if it exists" msgstr "importar marcas de este archivo si existe" -#: builtin/fast-export.c:1216 +#: builtin/fast-export.c:1217 msgid "fake a tagger when tags lack one" msgstr "falsificar un tagger cuando les falta uno" -#: builtin/fast-export.c:1218 +#: builtin/fast-export.c:1219 msgid "output full tree for each commit" msgstr "mostrar todo el árbol para cada commit" -#: builtin/fast-export.c:1220 +#: builtin/fast-export.c:1221 msgid "use the done feature to terminate the stream" -msgstr "use el feature done para terminar el stream" +msgstr "usar el feature done para terminar el stream" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1222 msgid "skip output of blob data" -msgstr "saltar el salida de data blob" +msgstr "saltar la salida de data blob" -#: builtin/fast-export.c:1222 builtin/log.c:1826 +#: builtin/fast-export.c:1223 builtin/log.c:1826 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1223 +#: builtin/fast-export.c:1224 msgid "apply refspec to exported refs" msgstr "aplicar refspec para los refs exportados" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1226 msgid "from:to" msgstr "de:para" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1227 msgid "convert <from> to <to> in anonymized output" msgstr "convertir <de> a <para> en output anonimizado" -#: builtin/fast-export.c:1229 +#: builtin/fast-export.c:1230 msgid "reference parents which are not in fast-export stream by object id" msgstr "" "referir a los padres que no estén en fast-export stream por id de objeto" -#: builtin/fast-export.c:1231 +#: builtin/fast-export.c:1232 msgid "show original object ids of blobs/commits" msgstr "mostrar ids de objetos originales para blobs/commits" -#: builtin/fast-export.c:1233 +#: builtin/fast-export.c:1234 msgid "label tags with mark ids" msgstr "marcar tags con ids de mark" -#: builtin/fast-export.c:1256 +#: builtin/fast-export.c:1257 msgid "--anonymize-map without --anonymize does not make sense" msgstr "--anonymize-map sin --anonymize no tiene sentido" -#: builtin/fast-export.c:1271 +#: builtin/fast-export.c:1272 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists" @@ -15088,17 +15347,17 @@ msgstr "especificar extracción de refmap" #: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" -msgstr "reporta que solo tenemos objetos alcanzables de este objeto" +msgstr "reportar que solo tenemos objetos alcanzables de este objeto" #: builtin/fetch.c:210 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" -"no realizar fecth al packfile; en lugar de eso, mostrar los ancestros de las " +"no realizar fetch al packfile; en lugar de eso, mostrar los ancestros de las " "puntas de negociación" #: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" -msgstr "ejecute 'maintenance --auto' después de buscar" +msgstr "ejecutar 'maintenance --auto' después de buscar" #: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" @@ -15116,73 +15375,73 @@ msgstr "aceptar refspecs de stdin" msgid "Couldn't find remote ref HEAD" msgstr "No se pudo encontrar ref remota HEAD" -#: builtin/fetch.c:757 +#: builtin/fetch.c:760 #, 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:856 +#: builtin/fetch.c:862 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:860 +#: builtin/fetch.c:866 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 +#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:874 +#: builtin/fetch.c:880 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:884 +#: builtin/fetch.c:890 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 -#: builtin/fetch.c:956 +#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 +#: builtin/fetch.c:962 msgid "unable to update local ref" msgstr "no es posible actualizar el ref local" -#: builtin/fetch.c:889 +#: builtin/fetch.c:895 msgid "would clobber existing tag" msgstr "sobrescribiría tag existente" -#: builtin/fetch.c:911 +#: builtin/fetch.c:917 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:914 +#: builtin/fetch.c:920 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:917 +#: builtin/fetch.c:923 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:956 +#: builtin/fetch.c:962 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:961 +#: builtin/fetch.c:967 msgid "non-fast-forward" msgstr "avance no rápido" -#: builtin/fetch.c:1065 +#: builtin/fetch.c:1070 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" "Fetch normalmente incida qué branches han tenido un update forzado,\n" -"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--" +"pero esa validación ha sido deshabilitada. Para activarla de nuevo usa '--" "show-forced-updates'\n" -"o ejecute 'git config fetch.showForcedUpdates true'." +"o ejecuta 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:1069 +#: builtin/fetch.c:1074 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -15195,80 +15454,85 @@ msgstr "" "false'\n" "para evitar esta validación.\n" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1105 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:1129 +#: builtin/fetch.c:1134 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizada" -#: builtin/fetch.c:1206 builtin/fetch.c:1357 +#: builtin/fetch.c:1223 builtin/fetch.c:1371 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:1228 +#: builtin/fetch.c:1244 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"algunos refs locales no pudieron ser actualizados; intente ejecutar\n" +"algunos refs locales no pudieron ser actualizados; intenta ejecutar\n" " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1341 #, c-format msgid " (%s will become dangling)" msgstr " (%s se volverá colgante)" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1342 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha vuelto colgante)" -#: builtin/fetch.c:1360 +#: builtin/fetch.c:1374 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1361 builtin/remote.c:1118 +#: builtin/fetch.c:1375 builtin/remote.c:1128 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1384 +#: builtin/fetch.c:1398 #, 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:1403 +#: builtin/fetch.c:1417 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Valor \"%2$s\" de opción \"%1$s\" no es válido para %3$s" -#: builtin/fetch.c:1406 +#: builtin/fetch.c:1420 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1618 +#: builtin/fetch.c:1447 +#, c-format +msgid "the object %s does not exist" +msgstr "el objeto %s no existe" + +#: builtin/fetch.c:1633 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "múltiples ramas detectadas, incompatible con --set-upstream" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1648 msgid "not setting upstream for a remote remote-tracking branch" msgstr "no configurar upstream para una rama de rastreo remoto" -#: builtin/fetch.c:1635 +#: builtin/fetch.c:1650 msgid "not setting upstream for a remote tag" msgstr "no configurar upstream para un tag remoto" -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1652 msgid "unknown branch type" msgstr "tipo de branch desconocido" -#: builtin/fetch.c:1639 +#: builtin/fetch.c:1654 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -15276,79 +15540,79 @@ msgstr "" "no se encontró rama fuente.\n" "tienes que especificar exactamente una rama con la opción --set-upstream." -#: builtin/fetch.c:1768 builtin/fetch.c:1831 +#: builtin/fetch.c:1783 builtin/fetch.c:1846 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 +#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1790 +#: builtin/fetch.c:1805 #, 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:1894 +#: builtin/fetch.c:1909 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" +"No hay repositorio remoto especificado. Por favor, especifica un URL o un\n" "nombre remoto del cual las nuevas revisiones deben ser extraídas." -#: builtin/fetch.c:1930 +#: builtin/fetch.c:1945 msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1994 +#: builtin/fetch.c:2009 msgid "--negotiate-only needs one or more --negotiate-tip=*" msgstr "--negotiate-only necesita uno o más --negotiate-tip=*" -#: builtin/fetch.c:1998 +#: builtin/fetch.c:2013 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:2000 +#: builtin/fetch.c:2015 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:2005 +#: builtin/fetch.c:2020 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:2007 +#: builtin/fetch.c:2022 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:2024 +#: builtin/fetch.c:2039 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:2026 +#: builtin/fetch.c:2041 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:2035 +#: builtin/fetch.c:2050 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:2042 +#: builtin/fetch.c:2057 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar refspecs no tiene sentido" -#: builtin/fetch.c:2058 +#: builtin/fetch.c:2073 msgid "must supply remote when using --negotiate-only" msgstr "tiene que proveer un remoto cuando usa --negotiate-only" -#: builtin/fetch.c:2063 +#: builtin/fetch.c:2078 msgid "Protocol does not support --negotiate-only, exiting." msgstr "Protocolo no soporta --negotiate-only, saliendo." -#: builtin/fetch.c:2082 +#: builtin/fetch.c:2097 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15356,11 +15620,11 @@ msgstr "" "--filter solo puede ser usado con el remoto configurado en extensions." "partialclone" -#: builtin/fetch.c:2086 +#: builtin/fetch.c:2101 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic solo se puede usar cuando se busca desde un control remoto" -#: builtin/fetch.c:2090 +#: builtin/fetch.c:2105 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin solo se puede usar cuando se busca desde un control remoto" @@ -15384,7 +15648,7 @@ msgstr "texto" #: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" -msgstr "use <text> como comienzo de mensaje" +msgstr "usar <text> como comienzo de mensaje" #: builtin/fmt-merge-msg.c:26 msgid "file to read from" @@ -15408,25 +15672,25 @@ msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" #: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" -msgstr "cite los marcadores de posición adecuadamente para los shells" +msgstr "entrecomillar los marcadores de posición adecuadamente para los shells" #: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" -msgstr "cite los marcadores de posición adecuadamente para perl" +msgstr "entrecomillar los marcadores de posición adecuadamente para perl" #: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" -msgstr "cite los marcadores de posición adecuadamente para python" +msgstr "entrecomillar los marcadores de posición adecuadamente para python" #: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" -msgstr "cite los marcadores de posición adecuadamente para Tcl" +msgstr "entrecomillar los marcadores de posición adecuadamente para Tcl" #: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "mostrar solo <n> refs encontradas" -#: builtin/for-each-ref.c:41 builtin/tag.c:483 +#: builtin/for-each-ref.c:41 builtin/tag.c:481 msgid "respect format colors" msgstr "respetar los colores de formato" @@ -15582,129 +15846,139 @@ msgstr "%s: no es un commit" msgid "notice: No default references" msgstr "aviso: No hay referencias por defecto" -#: builtin/fsck.c:606 +#: builtin/fsck.c:621 +#, c-format +msgid "%s: hash-path mismatch, found at: %s" +msgstr "%s: hash-path no concuerda, encontrado en: %s" + +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objeto corrupto o no encontrado: %s" -#: builtin/fsck.c:619 +#: builtin/fsck.c:628 +#, c-format +msgid "%s: object is of unknown type '%s': %s" +msgstr "%s: objeto de tipo desconocido '%s':%s" + +#: builtin/fsck.c:644 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no se pudo analizar objeto: %s" -#: builtin/fsck.c:639 +#: builtin/fsck.c:664 #, c-format msgid "bad sha1 file: %s" msgstr "mal sha1 de archivo: %s" -#: builtin/fsck.c:654 +#: builtin/fsck.c:685 msgid "Checking object directory" msgstr "Revisando directorio de objetos" -#: builtin/fsck.c:657 +#: builtin/fsck.c:688 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:672 +#: builtin/fsck.c:704 #, c-format msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:677 builtin/index-pack.c:864 +#: builtin/fsck.c:709 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "%s inválido" -#: builtin/fsck.c:684 +#: builtin/fsck.c:716 #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a algo extraño (%s)" -#: builtin/fsck.c:690 +#: builtin/fsck.c:722 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD desacoplado no apunta a nada" -#: builtin/fsck.c:694 +#: builtin/fsck.c:726 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "aviso: %s apunta a un branch no nacido (%s)" -#: builtin/fsck.c:706 +#: builtin/fsck.c:738 msgid "Checking cache tree" msgstr "Revisando el tree caché" -#: builtin/fsck.c:711 +#: builtin/fsck.c:743 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntero inválido sha1 en cache-tree" -#: builtin/fsck.c:720 +#: builtin/fsck.c:752 msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" -#: builtin/fsck.c:751 +#: builtin/fsck.c:783 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:757 +#: builtin/fsck.c:789 msgid "show unreachable objects" msgstr "mostrar objetos inalcanzables" -#: builtin/fsck.c:758 +#: builtin/fsck.c:790 msgid "show dangling objects" msgstr "mostrar objetos colgantes" -#: builtin/fsck.c:759 +#: builtin/fsck.c:791 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:760 +#: builtin/fsck.c:792 msgid "report root nodes" msgstr "reportar nodos raíz" -#: builtin/fsck.c:761 +#: builtin/fsck.c:793 msgid "make index objects head nodes" msgstr "hacer objetos índices cabezas de nodos" -#: builtin/fsck.c:762 +#: builtin/fsck.c:794 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:763 +#: builtin/fsck.c:795 msgid "also consider packs and alternate objects" msgstr "también considerar paquetes y objetos alternos" -#: builtin/fsck.c:764 +#: builtin/fsck.c:796 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:765 builtin/mktag.c:75 +#: builtin/fsck.c:797 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "habilitar revisión más estricta" -#: builtin/fsck.c:767 +#: builtin/fsck.c:799 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgantes en .git/lost-found" -#: builtin/fsck.c:768 builtin/prune.c:134 +#: builtin/fsck.c:800 builtin/prune.c:134 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:769 +#: builtin/fsck.c:801 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verbosos de objetos alcanzables" -#: builtin/fsck.c:828 builtin/index-pack.c:262 +#: builtin/fsck.c:861 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/fsck.c:856 +#: builtin/fsck.c:889 #, c-format msgid "%s: object missing" msgstr "%s: objeto faltante" -#: builtin/fsck.c:867 +#: builtin/fsck.c:900 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'" @@ -15728,7 +16002,7 @@ msgstr "falló al analizar '%s' valor '%s'" msgid "cannot stat '%s'" msgstr "no se puede hacer stat en '%s'" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 +#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" @@ -15737,13 +16011,13 @@ msgstr "no se puede leer '%s'" #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" -"and remove %s.\n" +"and remove %s\n" "Automatic cleanup will not be performed until the file is removed.\n" "\n" "%s" msgstr "" "El último gc reportó lo siguiente. Por favor corrige la causa\n" -"y elimine %s.\n" +"y elimina %s\n" "Limpieza automática no se realizará hasta que el archivo sea eliminado.\n" "\n" "%s" @@ -15782,25 +16056,25 @@ msgstr "falló al analizar valor %s de prune expiry" #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -"Auto empaquetado del repositorio en segundo plano para un performance " +"Auto empaquetado del repositorio en segundo plano para un rendimiento " "óptimo.\n" #: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" -msgstr "Auto empaquetado del repositorio para performance óptimo.\n" +msgstr "Auto empaquetado del repositorio para rendimiento óptimo.\n" #: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" -msgstr "Vea \"git help gc\" para limpieza manual.\n" +msgstr "Mira \"git help gc\" para limpieza manual.\n" #: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force si no " +"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (usa --force si no " "es así)" #: builtin/gc.c:705 @@ -15825,151 +16099,191 @@ msgstr "--no-schedule no está permitido" msgid "unrecognized --schedule argument '%s'" msgstr "argumento --schedule no reconocido, '%s'" -#: builtin/gc.c:869 +#: builtin/gc.c:868 msgid "failed to write commit-graph" msgstr "no se pudo escribir el commit-graph" -#: builtin/gc.c:905 +#: builtin/gc.c:904 msgid "failed to prefetch remotes" msgstr "falló al hacer prefetch a los remotos" -#: builtin/gc.c:1022 +#: builtin/gc.c:1020 msgid "failed to start 'git pack-objects' process" msgstr "no se pudo iniciar el proceso 'git pack-objects'" -#: builtin/gc.c:1039 +#: builtin/gc.c:1037 msgid "failed to finish 'git pack-objects' process" msgstr "no se pudo finalizar el proceso 'git pack-objects'" -#: builtin/gc.c:1091 +#: builtin/gc.c:1088 msgid "failed to write multi-pack-index" msgstr "no se pudo escribir el índice de paquetes múltiples" -#: builtin/gc.c:1109 +#: builtin/gc.c:1104 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' falló" -#: builtin/gc.c:1170 +#: builtin/gc.c:1163 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' falló" -#: builtin/gc.c:1179 +#: builtin/gc.c:1172 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "omitiendo la tarea de reempaquetado incremental porque core.multiPackIndex " "está deshabilitado" -#: builtin/gc.c:1283 +#: builtin/gc.c:1276 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento" -#: builtin/gc.c:1313 +#: builtin/gc.c:1306 #, c-format msgid "task '%s' failed" msgstr "tarea '%s' falló" -#: builtin/gc.c:1395 +#: builtin/gc.c:1388 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' no es una tarea válida" -#: builtin/gc.c:1400 +#: builtin/gc.c:1393 #, c-format msgid "task '%s' cannot be selected multiple times" -msgstr "tarea '%s' no puede ser seleccionada múltipes veces" +msgstr "tarea '%s' no puede ser seleccionada múltiples veces" -#: builtin/gc.c:1415 +#: builtin/gc.c:1408 msgid "run tasks based on the state of the repository" msgstr "ejecutar tareas basadas en el estado del repositorio" -#: builtin/gc.c:1416 +#: builtin/gc.c:1409 msgid "frequency" msgstr "frecuencia" -#: builtin/gc.c:1417 +#: builtin/gc.c:1410 msgid "run tasks based on frequency" msgstr "ejecutar tareas basado en frecuencia" -#: builtin/gc.c:1420 +#: builtin/gc.c:1413 msgid "do not report progress or other information over stderr" msgstr "no reportar progreso u otra información por medio de stderr" -#: builtin/gc.c:1421 +#: builtin/gc.c:1414 msgid "task" msgstr "tarea" -#: builtin/gc.c:1422 +#: builtin/gc.c:1415 msgid "run a specific task" msgstr "ejecutar una tarea específica" -#: builtin/gc.c:1439 +#: builtin/gc.c:1432 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "usar como máximo una de --auto y --schedule=<frecuencia>" -#: builtin/gc.c:1482 +#: builtin/gc.c:1475 msgid "failed to run 'git config'" msgstr "no pudo ejecutar 'git config'" -#: builtin/gc.c:1547 +#: builtin/gc.c:1627 #, c-format msgid "failed to expand path '%s'" msgstr "falló al expandir la ruta '%s'" -#: builtin/gc.c:1576 +#: builtin/gc.c:1654 builtin/gc.c:1692 msgid "failed to start launchctl" msgstr "falló al iniciar launchctl" -#: builtin/gc.c:1613 +#: builtin/gc.c:1767 builtin/gc.c:2220 #, c-format msgid "failed to create directories for '%s'" msgstr "falló al crear directorios para '%s'" -#: builtin/gc.c:1674 +#: builtin/gc.c:1794 #, c-format msgid "failed to bootstrap service %s" msgstr "falló al generar el servicio %s" -#: builtin/gc.c:1745 +#: builtin/gc.c:1887 msgid "failed to create temp xml file" msgstr "no se pudo crear el archivo temp xml" -#: builtin/gc.c:1835 +#: builtin/gc.c:1977 msgid "failed to start schtasks" msgstr "no se pudo iniciar schtasks" -#: builtin/gc.c:1879 +#: builtin/gc.c:2046 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "no se pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'" -#: builtin/gc.c:1896 +#: builtin/gc.c:2063 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "no se pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'" -#: builtin/gc.c:1900 +#: builtin/gc.c:2067 msgid "failed to open stdin of 'crontab'" msgstr "no se pudo abrir stdin de 'crontab'" -#: builtin/gc.c:1942 +#: builtin/gc.c:2109 msgid "'crontab' died" msgstr "'crontab' murió" -#: builtin/gc.c:1976 +#: builtin/gc.c:2174 +msgid "failed to start systemctl" +msgstr "falló al iniciar systemctl" + +#: builtin/gc.c:2184 +msgid "failed to run systemctl" +msgstr "falló el ejecutar systemctl" + +#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62 +#: builtin/worktree.c:945 +#, c-format +msgid "failed to delete '%s'" +msgstr "falló al borrar '%s'" + +#: builtin/gc.c:2378 +#, c-format +msgid "unrecognized --scheduler argument '%s'" +msgstr "argumento --scheduler no reconocido '%s'" + +#: builtin/gc.c:2403 +msgid "neither systemd timers nor crontab are available" +msgstr "ni systemd ni crontab disponibles" + +#: builtin/gc.c:2418 +#, c-format +msgid "%s scheduler is not available" +msgstr "%s planificador no disponible" + +#: builtin/gc.c:2432 msgid "another process is scheduling background maintenance" msgstr "otro proceso está programando el mantenimiento en segundo plano" -#: builtin/gc.c:2000 +#: builtin/gc.c:2454 +msgid "git maintenance start [--scheduler=<scheduler>]" +msgstr "git maintenance start [--scheduler=<planificador>]" + +#: builtin/gc.c:2463 +msgid "scheduler" +msgstr "planificador" + +#: builtin/gc.c:2464 +msgid "scheduler to trigger git maintenance run" +msgstr "planificador para iniciar git maintenance run" + +#: builtin/gc.c:2478 msgid "failed to add repo to global config" msgstr "no se pudo agregar el repositorio a la configuración global" -#: builtin/gc.c:2010 +#: builtin/gc.c:2487 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcomando> [<opciones>]" -#: builtin/gc.c:2029 +#: builtin/gc.c:2506 #, c-format msgid "invalid subcommand: %s" msgstr "subcomando no válido: %s" @@ -15978,12 +16292,12 @@ msgstr "subcomando no válido: %s" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" -#: builtin/grep.c:223 +#: builtin/grep.c:239 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: falló al crear el hilo: %s" -#: builtin/grep.c:277 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "número inválido de hilos especificado (%d) para %s" @@ -15992,266 +16306,266 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 -#: builtin/pack-objects.c:3129 +#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785 +#: builtin/pack-objects.c:3142 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 +#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:658 +#: builtin/grep.c:672 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:738 +#: builtin/grep.c:752 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:837 +#: builtin/grep.c:851 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:839 +#: builtin/grep.c:853 msgid "find in contents not managed by git" msgstr "buscar en contenidos no manejados por git" -#: builtin/grep.c:841 +#: builtin/grep.c:855 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:843 +#: builtin/grep.c:857 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados vía '.gitignore'" -#: builtin/grep.c:845 +#: builtin/grep.c:859 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:848 +#: builtin/grep.c:862 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerden" -#: builtin/grep.c:850 +#: builtin/grep.c:864 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:852 +#: builtin/grep.c:866 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:854 +#: builtin/grep.c:868 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:856 +#: builtin/grep.c:870 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:859 +#: builtin/grep.c:873 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:861 +#: builtin/grep.c:875 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:863 +#: builtin/grep.c:877 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:867 +#: builtin/grep.c:881 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:870 +#: builtin/grep.c:884 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:873 +#: builtin/grep.c:887 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings fijos" -#: builtin/grep.c:876 +#: builtin/grep.c:890 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:879 +#: builtin/grep.c:893 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:880 +#: builtin/grep.c:894 msgid "show column number of first match" msgstr "mostrar el número de columna de la primera coincidencia" -#: builtin/grep.c:881 +#: builtin/grep.c:895 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:882 +#: builtin/grep.c:896 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:884 +#: builtin/grep.c:898 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:886 +#: builtin/grep.c:900 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:888 +#: builtin/grep.c:902 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:891 +#: builtin/grep.c:905 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:893 +#: builtin/grep.c:907 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:896 +#: builtin/grep.c:910 msgid "show only matching parts of a line" msgstr "mostrar solo las partes que concuerden de una línea" -#: builtin/grep.c:898 +#: builtin/grep.c:912 msgid "show the number of matches instead of matching lines" msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:899 +#: builtin/grep.c:913 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:901 +#: builtin/grep.c:915 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:903 +#: builtin/grep.c:917 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:906 +#: builtin/grep.c:920 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:909 +#: builtin/grep.c:923 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:911 +#: builtin/grep.c:925 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:913 +#: builtin/grep.c:927 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:914 +#: builtin/grep.c:928 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:917 +#: builtin/grep.c:931 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:919 +#: builtin/grep.c:933 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:922 +#: builtin/grep.c:936 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:924 +#: builtin/grep.c:938 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:926 +#: builtin/grep.c:940 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:938 +#: builtin/grep.c:952 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:940 +#: builtin/grep.c:954 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan con todos los patrones" -#: builtin/grep.c:943 +#: builtin/grep.c:957 msgid "pager" msgstr "paginador" -#: builtin/grep.c:943 +#: builtin/grep.c:957 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:947 +#: builtin/grep.c:961 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:1013 +#: builtin/grep.c:1027 msgid "no pattern given" msgstr "no se ha entregado ningún patrón" -#: builtin/grep.c:1049 +#: builtin/grep.c:1063 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1057 +#: builtin/grep.c:1071 #, c-format msgid "unable to resolve revision: %s" msgstr "no es posible resolver revisión: %s" -#: builtin/grep.c:1087 +#: builtin/grep.c:1101 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked no es soportada con --recurse-submodules" -#: builtin/grep.c:1091 +#: builtin/grep.c:1105 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1094 builtin/pack-objects.c:4090 +#: builtin/grep.c:1108 builtin/pack-objects.c:4059 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 +#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1131 +#: builtin/grep.c:1145 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1157 +#: builtin/grep.c:1171 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1160 +#: builtin/grep.c:1174 msgid "--untracked cannot be used with --cached" msgstr "--untracked no se puede usar con --cached" -#: builtin/grep.c:1166 +#: builtin/grep.c:1180 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1174 +#: builtin/grep.c:1188 msgid "both --cached and trees are given" msgstr "ambos --cached y árboles han sido entregados" -#: builtin/hash-object.c:85 +#: builtin/hash-object.c:83 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -16259,439 +16573,442 @@ msgstr "" "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] " "[--] <archivo>..." -#: builtin/hash-object.c:86 +#: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:96 msgid "object type" msgstr "tipo de objeto" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "escribir el objeto en la base de datos de objetos" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "leer el objeto de stdin" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "guardar el archivo tal cual sin filtros" -#: builtin/hash-object.c:104 +#: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "solo realizar un hash a cualquier basura random para crear un objeto " "corrupto para hacer debugging de Git" -#: builtin/hash-object.c:105 +#: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "procesar el archivo como si fuera de esta ruta" -#: builtin/help.c:47 +#: builtin/help.c:55 msgid "print all available commands" msgstr "mostrar todos los comandos disponibles" -#: builtin/help.c:48 +#: builtin/help.c:57 msgid "exclude guides" msgstr "excluir las guias" -#: builtin/help.c:49 -msgid "print list of useful guides" -msgstr "mostrar una lista de guías útiles" - -#: builtin/help.c:50 -msgid "print all configuration variable names" -msgstr "imprimir todos los nombres de variables de configuración" - -#: builtin/help.c:52 +#: builtin/help.c:58 msgid "show man page" msgstr "mostrar la página del manual" -#: builtin/help.c:53 +#: builtin/help.c:59 msgid "show manual in web browser" msgstr "mostrar la página del manual en un navegador web" -#: builtin/help.c:55 +#: builtin/help.c:61 msgid "show info page" msgstr "mostrar la página de info" -#: builtin/help.c:57 +#: builtin/help.c:63 msgid "print command description" msgstr "imprimir descripción del comando" -#: builtin/help.c:62 -msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" -msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" +#: builtin/help.c:65 +msgid "print list of useful guides" +msgstr "mostrar una lista de guías útiles" -#: builtin/help.c:163 +#: builtin/help.c:67 +msgid "print all configuration variable names" +msgstr "imprimir todos los nombres de variables de configuración" + +#: builtin/help.c:78 +msgid "" +"git help [-a|--all] [--[no-]verbose]]\n" +" [[-i|--info] [-m|--man] [-w|--web]] [<command>]" +msgstr "" +"git help [-a|--all] [--[no-]verbose]]\n" +" [[-i|--info] [-m|--man] [-w|--web]] [<command>]" + +#: builtin/help.c:80 +msgid "git help [-g|--guides]" +msgstr "git help [-g|--guides]" + +#: builtin/help.c:81 +msgid "git help [-c|--config]" +msgstr "git help [-c|--config]" + +#: builtin/help.c:196 #, c-format msgid "unrecognized help format '%s'" msgstr "formato help no reconocido '%s'" -#: builtin/help.c:190 +#: builtin/help.c:223 msgid "Failed to start emacsclient." msgstr "Falló al iniciar emacsclient." -#: builtin/help.c:203 +#: builtin/help.c:236 msgid "Failed to parse emacsclient version." msgstr "Falló al analizar la versión de emacsclient." -#: builtin/help.c:211 +#: builtin/help.c:244 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versión '%d' de emacsclient es demasiada antigua (<22)." -#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 +#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 #, c-format msgid "failed to exec '%s'" msgstr "falló al ejecutar '%s'" -#: builtin/help.c:307 +#: builtin/help.c:340 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s': ruta para un visualizador del manual no soportado.\n" -"Por favor considere usar 'man.<herramienta>.cmd'." +"Por favor considera usar 'man.<herramienta>.cmd'." -#: builtin/help.c:319 +#: builtin/help.c:352 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': comando para man viewer soportado.\n" -"Por favor considere usar 'man.<herramienta>.path." +"Por favor considera usar 'man.<herramienta>.path." -#: builtin/help.c:436 +#: builtin/help.c:467 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualizador de man desconocido." -#: builtin/help.c:452 +#: builtin/help.c:483 msgid "no man viewer handled the request" msgstr "ningún visualizador de manual procesó la petición" -#: builtin/help.c:459 +#: builtin/help.c:490 msgid "no info viewer handled the request" msgstr "ningún visor de info manejó la petición" -#: builtin/help.c:517 builtin/help.c:528 git.c:348 +#: builtin/help.c:551 builtin/help.c:562 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' tiene el alias '%s'" -#: builtin/help.c:531 git.c:380 +#: builtin/help.c:565 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" -#: builtin/help.c:561 builtin/help.c:591 +#: builtin/help.c:581 +msgid "this option doesn't take any other arguments" +msgstr "esta opción no requiere argumentos" + +#: builtin/help.c:602 builtin/help.c:629 #, c-format msgid "usage: %s%s" msgstr "uso: %s%s" -#: builtin/help.c:575 +#: builtin/help.c:624 msgid "'git help config' for more information" msgstr "'git help config' para más información" -#: builtin/index-pack.c:222 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "el tipo del objeto no concuerda en %s" -#: builtin/index-pack.c:242 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "no se recibió el objeto esperado %s" -#: builtin/index-pack.c:245 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, encontrado %s" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no se puede llenar %d byte" msgstr[1] "no se pueden llenar %d bytes" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "EOF temprano" -#: builtin/index-pack.c:306 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "error al leer en input" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:325 builtin/pack-objects.c:756 +#: builtin/index-pack.c:324 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "paquete demasiado grande para la definición actual de off_t" -#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" -#: builtin/index-pack.c:343 -#, c-format -msgid "unable to create '%s'" -msgstr "no se puede crear '%s'" - -#: builtin/index-pack.c:349 -#, c-format -msgid "cannot open packfile '%s'" -msgstr "no se puede abrir el archivo de paquete '%s'" - -#: builtin/index-pack.c:363 +#: builtin/index-pack.c:358 msgid "pack signature mismatch" msgstr "firma del paquete no concuerda" -#: builtin/index-pack.c:365 +#: builtin/index-pack.c:360 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versión de paquete %<PRIu32> no soportada" -#: builtin/index-pack.c:381 +#: builtin/index-pack.c:376 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:487 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "inflate devolvió %d" -#: builtin/index-pack.c:536 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "valor de offset desbordado para el objeto base delta" -#: builtin/index-pack.c:544 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "offset de base delta está fuera de límites" -#: builtin/index-pack.c:552 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "tipo de objeto %d desconocido" -#: builtin/index-pack.c:583 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "no se puede hacer pread en el paquete" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" -#: builtin/index-pack.c:611 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 -#: builtin/index-pack.c:825 builtin/index-pack.c:834 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781 +#: builtin/index-pack.c:820 builtin/index-pack.c:829 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "¡ COLISIÓN DE SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/index-pack.c:754 builtin/pack-objects.c:292 #: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "no es posible leer %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:818 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:831 +#: builtin/index-pack.c:826 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:840 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:848 builtin/index-pack.c:867 +#: builtin/index-pack.c:843 builtin/index-pack.c:862 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:869 +#: builtin/index-pack.c:864 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:930 builtin/index-pack.c:977 +#: builtin/index-pack.c:925 builtin/index-pack.c:972 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1156 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1156 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1190 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1199 +#: builtin/index-pack.c:1195 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1202 +#: builtin/index-pack.c:1198 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1214 +#: builtin/index-pack.c:1210 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusión más allá de la locura en parse_pack_objects()" -#: builtin/index-pack.c:1237 +#: builtin/index-pack.c:1233 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 +#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1281 +#: builtin/index-pack.c:1277 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1283 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completado con %d objeto local" msgstr[1] "completado con %d objetos locales" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1295 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)" -#: builtin/index-pack.c:1303 +#: builtin/index-pack.c:1299 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paquete tiene %d delta sin resolver" msgstr[1] "paquete tiene %d deltas sin resolver" -#: builtin/index-pack.c:1327 +#: builtin/index-pack.c:1323 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1423 +#: builtin/index-pack.c:1419 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1440 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1464 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir archivo '%2$s' de %1$s" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1472 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar el archivo escrito '%2$s' de %1$s" -#: builtin/index-pack.c:1502 +#: builtin/index-pack.c:1489 +#, c-format +msgid "unable to rename temporary '*.%s' file to '%s'" +msgstr "no se pudo renombrar el archivo temporal '*.%s' a '%s'" + +#: builtin/index-pack.c:1514 msgid "error while closing pack file" msgstr "error mientras se cerraba el archivo paquete" -#: builtin/index-pack.c:1516 -msgid "cannot store pack file" -msgstr "no se puede guardar el archivo paquete" - -#: builtin/index-pack.c:1524 -msgid "cannot store index file" -msgstr "no se puede guardar el archivo índice" - -#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 +#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1649 +#: builtin/index-pack.c:1643 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1645 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No se puede abrir el archivo índice del paquete para '%s'" -#: builtin/index-pack.c:1699 +#: builtin/index-pack.c:1693 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1706 +#: builtin/index-pack.c:1700 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1748 +#: builtin/index-pack.c:1742 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 -#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1799 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1823 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 +#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algoritmo hash desconocido '%s'" -#: builtin/index-pack.c:1850 +#: builtin/index-pack.c:1848 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--object-format cannot be used with --stdin" msgstr "--object-format no se puede usar con --stdin" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" @@ -16799,7 +17116,7 @@ msgstr "permisos" #: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -"especifica que el repositorio de git será compartido entre varios usuarios" +"especificar que el repositorio de git será compartido entre varios usuarios" #: builtin/init-db.c:551 msgid "override the name of the initial branch" @@ -17067,11 +17384,11 @@ msgstr "usando '%s' como origen de diferencia de rango de la serie actual" #: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" -msgstr "use [PATCH n/m] incluso con un único parche" +msgstr "usar [PATCH n/m] incluso con un único parche" #: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" -msgstr "use [PATCH] incluso con múltiples parches" +msgstr "usar [PATCH] incluso con múltiples parches" #: builtin/log.c:1756 msgid "print patches to standard out" @@ -17092,7 +17409,7 @@ msgstr "sfx" #: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" -msgstr "use <sfx> en lugar de '.patch'" +msgstr "usar <sfx> en lugar de '.patch'" #: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" @@ -17112,7 +17429,7 @@ msgstr "tamaño máximo de nombre de archivo resultante" #: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "use [RFC PATCH] en lugar de [PATCH]" +msgstr "usar [RFC PATCH] en lugar de [PATCH]" #: builtin/log.c:1773 msgid "cover-from-description-mode" @@ -17121,12 +17438,12 @@ msgstr "modo-cover-from-description" #: builtin/log.c:1774 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 " +"generar partes de una carta de presentación basadas en la descripción de la " "rama" #: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" -msgstr "use [<prefijo>] en lugar de [PATCH]" +msgstr "usar [<prefijo>] en lugar de [PATCH]" #: builtin/log.c:1779 msgid "store resulting files in <dir>" @@ -17146,7 +17463,7 @@ msgstr "poner hash de todos ceros en la cabecera From" #: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" -msgstr "no incluya un parche que coincida con un commit en upstream" +msgstr "no incluir un parche que coincida con un commit en upstream" #: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" @@ -17241,11 +17558,11 @@ msgstr "mostrar medidor de progreso mientras se generan los parches" #: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" -msgstr "muestra cambios contra <rev> en cover letter o en un solo parche" +msgstr "mostrar cambios contra <rev> en cover letter o en un solo parche" #: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" -msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche" +msgstr "mostrar cambios contra <refspec> en cover letter o en un solo parche" #: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" @@ -17332,134 +17649,138 @@ msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -"No se pudo encontrar una rama remota rastreada, por favor especifique " +"No se pudo encontrar una rama remota rastreada, por favor especifica " "<upstream> manualmente.\n" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:561 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" -#: builtin/ls-files.c:619 +#: builtin/ls-files.c:615 +msgid "separate paths with the NUL character" +msgstr "rutas están separadas con un carácter NULL" + +#: builtin/ls-files.c:617 msgid "identify the file status with tags" -msgstr "identifique el estado del archivo con tags" +msgstr "identificar el estado del archivo con tags" -#: builtin/ls-files.c:621 +#: builtin/ls-files.c:619 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'" -#: builtin/ls-files.c:625 +#: builtin/ls-files.c:623 msgid "show cached files in the output (default)" msgstr "mostrar archivos en caché en la salida (default)" -#: builtin/ls-files.c:627 +#: builtin/ls-files.c:625 msgid "show deleted files in the output" msgstr "mostrar archivos borrados en la salida" -#: builtin/ls-files.c:629 +#: builtin/ls-files.c:627 msgid "show modified files in the output" msgstr "mostrar archivos modificados en la salida" -#: builtin/ls-files.c:631 +#: builtin/ls-files.c:629 msgid "show other files in the output" msgstr "mostrar otros archivos en la salida" -#: builtin/ls-files.c:633 +#: builtin/ls-files.c:631 msgid "show ignored files in the output" msgstr "mostrar archivos ignorados en la salida" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c:634 msgid "show staged contents' object name in the output" msgstr "mostrar nombre de objeto del contenido del área de stage en la salida" -#: builtin/ls-files.c:638 +#: builtin/ls-files.c:636 msgid "show files on the filesystem that need to be removed" msgstr "mostrar archivos en el filesystem que necesiten ser borrados" -#: builtin/ls-files.c:640 +#: builtin/ls-files.c:638 msgid "show 'other' directories' names only" msgstr "mostrar solo nombres de 'otros' directorios" -#: builtin/ls-files.c:642 +#: builtin/ls-files.c:640 msgid "show line endings of files" msgstr "mostrar finales de línea de archivos" -#: builtin/ls-files.c:644 +#: builtin/ls-files.c:642 msgid "don't show empty directories" msgstr "no mostrar directorios vacíos" -#: builtin/ls-files.c:647 +#: builtin/ls-files.c:645 msgid "show unmerged files in the output" msgstr "mostrar archivos no fusionados en la salida" -#: builtin/ls-files.c:649 +#: builtin/ls-files.c:647 msgid "show resolve-undo information" msgstr "mostrar información resolver-deshacer" -#: builtin/ls-files.c:651 +#: builtin/ls-files.c:649 msgid "skip files matching pattern" msgstr "saltar archivos que concuerden con el patrón" -#: builtin/ls-files.c:654 -msgid "exclude patterns are read from <file>" -msgstr "excluir patrones leídos de <archivo>" +#: builtin/ls-files.c:652 +msgid "read exclude patterns from <file>" +msgstr "leer patrones exclude del archivo <archivo>" -#: builtin/ls-files.c:657 +#: builtin/ls-files.c:655 msgid "read additional per-directory exclude patterns in <file>" msgstr "leer patrones adicionales de exclusión por directorio en <archivo>" -#: builtin/ls-files.c:659 +#: builtin/ls-files.c:657 msgid "add the standard git exclusions" msgstr "agregar las exclusiones standard de git" -#: builtin/ls-files.c:663 +#: builtin/ls-files.c:661 msgid "make the output relative to the project top directory" msgstr "hacer la salida relativa al directorio principal del proyecto" -#: builtin/ls-files.c:666 +#: builtin/ls-files.c:664 msgid "recurse through submodules" msgstr "recurrir a través de submódulos" -#: builtin/ls-files.c:668 +#: builtin/ls-files.c:666 msgid "if any <file> is not in the index, treat this as an error" msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error" -#: builtin/ls-files.c:669 +#: builtin/ls-files.c:667 msgid "tree-ish" msgstr "árbol-ismo" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c:668 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que las rutas hayan sido borradas ya que todavía hay <árbol-ismos> " "presentes" -#: builtin/ls-files.c:672 +#: builtin/ls-files.c:670 msgid "show debugging data" msgstr "mostrar data de debug" -#: builtin/ls-files.c:674 +#: builtin/ls-files.c:672 msgid "suppress duplicate entries" msgstr "suprimir entradas duplicadas" #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<repository> [<refs>...]]" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<repositorio> [<refs>...]]" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repositorio> [<refs>...]]" #: builtin/ls-remote.c:60 msgid "do not print remote URL" msgstr "no mostrar el URL remoto" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103 msgid "exec" msgstr "ejecutar" @@ -17577,7 +17898,7 @@ msgstr "actión cuando se encuentra un CR citado" msgid "use headers in message's body" msgstr "usar cabeceras en el cuerpo del mensaje" -#: builtin/mailsplit.c:241 +#: builtin/mailsplit.c:239 #, c-format msgid "empty mbox: '%s'" msgstr "mbox vacío: '%s'" @@ -17616,7 +17937,7 @@ msgstr "listar revs no alcanzables desde otros" #: builtin/merge-base.c:149 msgid "is the first one ancestor of the other?" -msgstr "¿es el primer ancestro del otro?" +msgstr "¿es el primero ancestro del otro?" #: builtin/merge-base.c:151 msgid "find where <commit> forked from reflog of <ref>" @@ -17693,144 +18014,144 @@ msgstr "no se pudo resolver ref '%s'" msgid "Merging %s with %s\n" msgstr "Fusionando %s con %s\n" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:123 +#: builtin/merge.c:124 msgid "switch `m' requires a value" msgstr "opción `m' requiere un valor" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "option `%s' requires a value" msgstr "opción `%s' requiere un valor" -#: builtin/merge.c:199 +#: builtin/merge.c:200 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:200 +#: builtin/merge.c:201 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:205 +#: builtin/merge.c:206 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:256 builtin/pull.c:133 +#: builtin/merge.c:257 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "no mostrar un diffstat al final de la fusión" -#: builtin/merge.c:259 builtin/pull.c:136 +#: builtin/merge.c:260 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:260 builtin/pull.c:139 +#: builtin/merge.c:261 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:262 builtin/pull.c:142 +#: builtin/merge.c:263 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " "fusión" -#: builtin/merge.c:265 builtin/pull.c:148 +#: builtin/merge.c:266 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "crear un commit único en lugar de hacer una fusión" -#: builtin/merge.c:267 builtin/pull.c:151 +#: builtin/merge.c:268 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:269 builtin/pull.c:154 +#: builtin/merge.c:270 builtin/pull.c:154 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "allow fast-forward (default)" msgstr "permitir fast-forward (default)" -#: builtin/merge.c:273 builtin/pull.c:161 +#: builtin/merge.c:274 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:277 builtin/pull.c:164 +#: builtin/merge.c:278 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tenga una firma GPG válida" -#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 +#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168 +#: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:279 builtin/pull.c:169 +#: builtin/merge.c:280 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:280 builtin/pull.c:172 +#: builtin/merge.c:281 builtin/pull.c:172 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:281 builtin/pull.c:173 +#: builtin/merge.c:282 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:283 +#: builtin/merge.c:284 msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#: builtin/merge.c:290 +#: builtin/merge.c:291 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:292 +#: builtin/merge.c:293 msgid "--abort but leave index and working tree alone" msgstr "--abort pero no tocar el índice ni el árbol de trabajo" -#: builtin/merge.c:294 +#: builtin/merge.c:295 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:296 builtin/pull.c:180 +#: builtin/merge.c:297 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:303 +#: builtin/merge.c:304 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" -#: builtin/merge.c:320 +#: builtin/merge.c:321 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:325 +#: builtin/merge.c:326 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:330 +#: builtin/merge.c:331 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:352 builtin/merge.c:369 +#: builtin/merge.c:353 builtin/merge.c:370 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:400 +#: builtin/merge.c:401 msgid "Already up to date. (nothing to squash)" msgstr "Ya está actualizado. (nada para hacer squash)" -#: builtin/merge.c:414 +#: builtin/merge.c:415 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:464 +#: builtin/merge.c:465 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" @@ -17845,48 +18166,48 @@ msgstr "'%s' no apunta a ningún commit" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:729 +#: builtin/merge.c:730 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:742 +#: builtin/merge.c:743 #, c-format -msgid "Unknown option for merge-recursive: -X%s" -msgstr "Opción desconocida para merge-recursive: -X%s" +msgid "unknown strategy option: -X%s" +msgstr "opción de estrategia desconocida: -X%s" -#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:813 +#: builtin/merge.c:814 #, c-format msgid "Could not read from '%s'" msgstr "No se pudo leer de '%s'" -#: builtin/merge.c:822 +#: builtin/merge.c:823 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"No se realiza commit de fusión; use 'git commit' para completar la fusión.\n" +"No se realiza commit de fusión; usa 'git commit' para completar la fusión.\n" -#: builtin/merge.c:828 +#: builtin/merge.c:829 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -"Por favor ingrese un mensaje de commit que explique por qué es necesaria " +"Por favor ingresa un mensaje de commit que explique por qué es necesaria " "esta fusión,\n" "especialmente si esto fusiona un upstream actualizado en una rama de " "tópico.\n" "\n" -#: builtin/merge.c:833 +#: builtin/merge.c:834 msgid "An empty message aborts the commit.\n" msgstr "Un mensaje vacío aborta el commit.\n" -#: builtin/merge.c:836 +#: builtin/merge.c:837 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17895,74 +18216,74 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" "el commit.\n" -#: builtin/merge.c:889 +#: builtin/merge.c:892 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:904 +#: builtin/merge.c:907 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:965 +#: builtin/merge.c:968 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:1004 +#: builtin/merge.c:1007 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:1006 +#: builtin/merge.c:1009 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:1008 +#: builtin/merge.c:1011 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:1013 +#: builtin/merge.c:1016 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remota para %s de %s" -#: builtin/merge.c:1070 +#: builtin/merge.c:1073 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1173 +#: builtin/merge.c:1174 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1207 +#: builtin/merge.c:1208 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1317 +#: builtin/merge.c:1321 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1321 +#: builtin/merge.c:1325 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1339 +#: builtin/merge.c:1343 msgid "--quit expects no arguments" msgstr "--quit no espera argumentos" -#: builtin/merge.c:1352 +#: builtin/merge.c:1356 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1356 +#: builtin/merge.c:1360 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1372 +#: builtin/merge.c:1376 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17970,7 +18291,7 @@ msgstr "" "No has concluido la fusión (existe MERGE_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1379 +#: builtin/merge.c:1383 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17978,89 +18299,85 @@ msgstr "" "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1382 +#: builtin/merge.c:1386 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1396 +#: builtin/merge.c:1400 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1398 +#: builtin/merge.c:1402 msgid "You cannot combine --squash with --commit." msgstr "No se puede combinar --squash con --commit." -#: builtin/merge.c:1414 +#: builtin/merge.c:1418 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1431 +#: builtin/merge.c:1435 msgid "Squash commit into empty head not supported yet" msgstr "Aplastar un commit a un head vacío no es soportado todavía" -#: builtin/merge.c:1433 +#: builtin/merge.c:1437 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1438 +#: builtin/merge.c:1442 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1440 +#: builtin/merge.c:1444 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1521 +#: builtin/merge.c:1531 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1540 +#: builtin/merge.c:1550 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1587 +#: builtin/merge.c:1598 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1605 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1625 -msgid "Not possible to fast-forward, aborting." -msgstr "No es posible hacer fast-forward, abortando." - -#: builtin/merge.c:1653 builtin/merge.c:1719 +#: builtin/merge.c:1664 builtin/merge.c:1730 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1657 +#: builtin/merge.c:1668 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1720 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1711 +#: builtin/merge.c:1722 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1721 +#: builtin/merge.c:1732 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "Usando estrategia %s para preparar resolución a mano.\n" -#: builtin/merge.c:1735 +#: builtin/merge.c:1746 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -18095,15 +18412,15 @@ msgstr "no se pudo leer objeto etiquetado '%s'" msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "objeto '%s' es etiquetado como '%s', pero es de tipo '%s'" -#: builtin/mktag.c:97 +#: builtin/mktag.c:98 msgid "tag on stdin did not pass our strict fsck check" msgstr "etiqueta en stdin no pasó nuestro estricto control fsck" -#: builtin/mktag.c:100 +#: builtin/mktag.c:101 msgid "tag on stdin did not refer to a valid object" msgstr "tag en stdin no se refería a un objeto válido" -#: builtin/mktag.c:103 builtin/tag.c:243 +#: builtin/mktag.c:104 builtin/tag.c:243 msgid "unable to write tag file" msgstr "incapaz de escribir el archivo de tag" @@ -18124,35 +18441,51 @@ msgid "allow creation of more than one tree" msgstr "permitir la creación de más de un árbol" #: builtin/multi-pack-index.c:10 -msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" -msgstr "git multi-pack-index [<opciones>] write [--preferred-pack=<pack>]" +msgid "" +"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" +"snapshot=<path>]" +msgstr "" +"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" +"snapshot=<path>]" -#: builtin/multi-pack-index.c:13 +#: builtin/multi-pack-index.c:14 msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<opciones>] verify" -#: builtin/multi-pack-index.c:16 +#: builtin/multi-pack-index.c:17 msgid "git multi-pack-index [<options>] expire" msgstr "git multi-pack-index [<opciones>] expire" -#: builtin/multi-pack-index.c:19 +#: builtin/multi-pack-index.c:20 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<opciones>] repack [--batch-size=<tamaño>]" -#: builtin/multi-pack-index.c:54 +#: builtin/multi-pack-index.c:57 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "directorio de objetos conteniendo conjunto de pares de packfile y pack-index" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:98 msgid "preferred-pack" msgstr "pack preferido" -#: builtin/multi-pack-index.c:70 +#: builtin/multi-pack-index.c:99 msgid "pack for reuse when computing a multi-pack bitmap" msgstr "pack para reuso cuando se calcula un bitmap de múltiples packs" -#: builtin/multi-pack-index.c:128 +#: builtin/multi-pack-index.c:100 +msgid "write multi-pack bitmap" +msgstr "escribir bitmap multi-pack" + +#: builtin/multi-pack-index.c:105 +msgid "write multi-pack index containing only given indexes" +msgstr "escribir el índice multi-pack que contenga los siguientes índices" + +#: builtin/multi-pack-index.c:107 +msgid "refs snapshot for selecting bitmap commits" +msgstr "referencia los snapshots para seleccionar los commits de bitmap" + +#: builtin/multi-pack-index.c:202 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -18160,11 +18493,6 @@ msgstr "" "durante el repack, recolectar los pack-files de tamaño menor en un batch que " "sea más grande que este tamaño" -#: builtin/multi-pack-index.c:179 -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "subcomando desconocido: %s" - #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<opciones>] <fuente>... <destino>" @@ -18193,72 +18521,72 @@ msgstr "forzar mover/renombrar incluso si el destino existe" msgid "skip move/rename errors" msgstr "saltar errores de mover/renombrar" -#: builtin/mv.c:170 +#: builtin/mv.c:172 #, c-format msgid "destination '%s' is not a directory" msgstr "destino '%s' no es un directorio" -#: builtin/mv.c:181 +#: builtin/mv.c:184 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Revisando cambio de nombre de '%s' a '%s'\n" -#: builtin/mv.c:185 +#: builtin/mv.c:190 msgid "bad source" msgstr "mala fuente" -#: builtin/mv.c:188 +#: builtin/mv.c:193 msgid "can not move directory into itself" msgstr "no se puede mover un directorio en sí mismo" -#: builtin/mv.c:191 +#: builtin/mv.c:196 msgid "cannot move directory over file" msgstr "no se puede mover un directorio dentro de un archivo" -#: builtin/mv.c:200 +#: builtin/mv.c:205 msgid "source directory is empty" msgstr "directorio de fuente está vacío" -#: builtin/mv.c:225 +#: builtin/mv.c:231 msgid "not under version control" msgstr "no se encuentra bajo control de versiones" -#: builtin/mv.c:227 +#: builtin/mv.c:233 msgid "conflicted" msgstr "en conflicto" -#: builtin/mv.c:230 +#: builtin/mv.c:236 msgid "destination exists" msgstr "destino existe" -#: builtin/mv.c:238 +#: builtin/mv.c:244 #, c-format msgid "overwriting '%s'" msgstr "sobrescribiendo '%s'" -#: builtin/mv.c:241 +#: builtin/mv.c:247 msgid "Cannot overwrite" msgstr "No se puede sobrescribir" -#: builtin/mv.c:244 +#: builtin/mv.c:250 msgid "multiple sources for the same target" msgstr "múltiples fuentes para el mismo destino" -#: builtin/mv.c:246 +#: builtin/mv.c:252 msgid "destination directory does not exist" msgstr "el directorio de destino no existe" -#: builtin/mv.c:253 +#: builtin/mv.c:280 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, fuente=%s, destino=%s" -#: builtin/mv.c:274 +#: builtin/mv.c:308 #, c-format msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 #, c-format msgid "renaming '%s' failed" msgstr "renombrar '%s' falló" @@ -18439,47 +18767,47 @@ msgstr "no se pudo leer salida de 'show'" msgid "failed to finish 'show' for object '%s'" msgstr "falló la finalización de 'show' para el objeto '%s'" -#: builtin/notes.c:197 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" -msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F" +msgstr "por favor suministra los contenidos de nota usando la opción -m o -F" -#: builtin/notes.c:206 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "incapaz de escribir el objeto de nota" -#: builtin/notes.c:208 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "los contenidos de nota han sido dejados en %s" -#: builtin/notes.c:242 builtin/tag.c:576 +#: builtin/notes.c:240 builtin/tag.c:577 #, c-format msgid "could not open or read '%s'" msgstr "no se pudo abrir o leer '%s'" -#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 -#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 +#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313 +#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524 +#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "falló al resolver '%s' como ref válida." -#: builtin/notes.c:265 +#: builtin/notes.c:263 #, c-format msgid "failed to read object '%s'." msgstr "falló al leer objeto '%s'." -#: builtin/notes.c:268 +#: builtin/notes.c:266 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "no se puede leer los datos de la nota de un objeto no blob '%s'." -#: builtin/notes.c:309 +#: builtin/notes.c:307 #, c-format msgid "malformed input line: '%s'." msgstr "línea de entrada mal formada: '%s'." -#: builtin/notes.c:324 +#: builtin/notes.c:322 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "falló al copiar notas de '%s' a '%s'" @@ -18487,147 +18815,147 @@ msgstr "falló al copiar notas de '%s' a '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:356 +#: builtin/notes.c:354 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "rechazando %s notas en %s (fuera de refs/notes/)" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -#: builtin/prune-packed.c:25 builtin/tag.c:586 +#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 +#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 +#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 +#: builtin/prune-packed.c:25 builtin/tag.c:587 msgid "too many arguments" -msgstr "muchos argumentos" +msgstr "demasiados argumentos" -#: builtin/notes.c:389 builtin/notes.c:678 +#: builtin/notes.c:387 builtin/notes.c:676 #, c-format msgid "no note found for object %s." msgstr "no se encontraron notas para objeto %s." -#: builtin/notes.c:410 builtin/notes.c:576 +#: builtin/notes.c:408 builtin/notes.c:574 msgid "note contents as a string" msgstr "contenidos de la nota como cadena" -#: builtin/notes.c:413 builtin/notes.c:579 +#: builtin/notes.c:411 builtin/notes.c:577 msgid "note contents in a file" msgstr "contenidos de la nota en un archivo" -#: builtin/notes.c:416 builtin/notes.c:582 +#: builtin/notes.c:414 builtin/notes.c:580 msgid "reuse and edit specified note object" msgstr "reutilizar y editar el objeto de nota especificado" -#: builtin/notes.c:419 builtin/notes.c:585 +#: builtin/notes.c:417 builtin/notes.c:583 msgid "reuse specified note object" msgstr "reutilizar el objeto de nota especificado" -#: builtin/notes.c:422 builtin/notes.c:588 +#: builtin/notes.c:420 builtin/notes.c:586 msgid "allow storing empty note" msgstr "permitir almacenar nota vacía" -#: builtin/notes.c:423 builtin/notes.c:496 +#: builtin/notes.c:421 builtin/notes.c:494 msgid "replace existing notes" msgstr "reemplazar notas existentes" -#: builtin/notes.c:448 +#: builtin/notes.c:446 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use " +"No se puede agregar notas. Se encontró notas existentes para objeto %s. Usa " "'-f' para sobrescribir las notas existentes" -#: builtin/notes.c:463 builtin/notes.c:544 +#: builtin/notes.c:461 builtin/notes.c:542 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Sobrescribiendo notas existentes para objeto %s\n" -#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 #, c-format msgid "Removing note for object %s\n" msgstr "Quitando nota del objeto %s\n" -#: builtin/notes.c:497 +#: builtin/notes.c:495 msgid "read objects from stdin" msgstr "leer objetos desde stdin" -#: builtin/notes.c:499 +#: builtin/notes.c:497 msgid "load rewriting config for <command> (implies --stdin)" msgstr "cargar configuración de reescritura para <comando> (implica --stdin)" -#: builtin/notes.c:517 +#: builtin/notes.c:515 msgid "too few arguments" msgstr "demasiados pocos argumentos" -#: builtin/notes.c:538 +#: builtin/notes.c:536 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" "No se puede copiar notas. Se encontró notas existentes para el objeto %s. " -"Use '-f' para sobrescribir las notas existentes" +"Usa '-f' para sobrescribir las notas existentes" -#: builtin/notes.c:550 +#: builtin/notes.c:548 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "faltan notas en el objeto de fuente %s. No se puede copiar." -#: builtin/notes.c:603 +#: builtin/notes.c:601 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n" -"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n" +"Por favor usa 'git notes add -f -m/-F/-c/-C' en cambio.\n" -#: builtin/notes.c:698 +#: builtin/notes.c:696 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "falló al borrar ref NOTES_MERGE_PARTIAL" -#: builtin/notes.c:700 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "falló al borrar ref NOTES_MERGE_REF" -#: builtin/notes.c:702 +#: builtin/notes.c:700 msgid "failed to remove 'git notes merge' worktree" msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'" -#: builtin/notes.c:722 +#: builtin/notes.c:720 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "falló al leer ref NOTES_MERGE_PARTIAL" -#: builtin/notes.c:724 +#: builtin/notes.c:722 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:726 +#: builtin/notes.c:724 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:739 +#: builtin/notes.c:737 msgid "failed to resolve NOTES_MERGE_REF" msgstr "falló al resolver NOTES_MERGE_REF" -#: builtin/notes.c:742 +#: builtin/notes.c:740 msgid "failed to finalize notes merge" msgstr "falló al finalizar la fusión de notas" -#: builtin/notes.c:768 +#: builtin/notes.c:766 #, c-format msgid "unknown notes merge strategy %s" msgstr "estrategia de fusión de notas %s desconocida" -#: builtin/notes.c:784 +#: builtin/notes.c:782 msgid "General options" msgstr "Opciones generales" -#: builtin/notes.c:786 +#: builtin/notes.c:784 msgid "Merge options" msgstr "Opciones de fusión" -#: builtin/notes.c:788 +#: builtin/notes.c:786 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -18635,92 +18963,92 @@ msgstr "" "resolver conflictos de notas usando la estrategia entregada (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:790 +#: builtin/notes.c:788 msgid "Committing unmerged notes" msgstr "Realizando commit a las notas no fusionadas" -#: builtin/notes.c:792 +#: builtin/notes.c:790 msgid "finalize notes merge by committing unmerged notes" msgstr "" "finalizar fusión de notas realizando un commit de las notas no fusionadas" -#: builtin/notes.c:794 +#: builtin/notes.c:792 msgid "Aborting notes merge resolution" msgstr "Abortando resolución de fusión de notas" -#: builtin/notes.c:796 +#: builtin/notes.c:794 msgid "abort notes merge" msgstr "abortar fusión de notas" -#: builtin/notes.c:807 +#: builtin/notes.c:805 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "no se pueden mezclar --commit, --abort o -s/--strategy" -#: builtin/notes.c:812 +#: builtin/notes.c:810 msgid "must specify a notes ref to merge" msgstr "se debe especificar una ref de notas a fusionar" -#: builtin/notes.c:836 +#: builtin/notes.c:834 #, c-format msgid "unknown -s/--strategy: %s" msgstr "--strategy/-s desconocida: %s" -#: builtin/notes.c:873 +#: builtin/notes.c:871 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "una fusión de notas en %s ya está en progreso en %s" -#: builtin/notes.c:876 +#: builtin/notes.c:874 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "falló al guardar un link para el ref de notas actual (%s)" -#: builtin/notes.c:878 +#: builtin/notes.c:876 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" msgstr "" -"Fusión automática de notas falló. Arregle conflictos en %s y realice un " -"commit con el resultado 'git notes merge --commit', o aborte la fusión con " +"Fusión automática de notas falló. Arregla conflictos en %s y realiza un " +"commit con el resultado 'git notes merge --commit', o aborta la fusión con " "'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:589 +#: builtin/notes.c:895 builtin/tag.c:590 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falló al resolver '%s' como una ref válida." -#: builtin/notes.c:900 +#: builtin/notes.c:898 #, c-format msgid "Object %s has no note\n" msgstr "El objeto %s no tiene notas\n" -#: builtin/notes.c:912 +#: builtin/notes.c:910 msgid "attempt to remove non-existent note is not an error" msgstr "intentar eliminar una nota no existente no es un error" -#: builtin/notes.c:915 +#: builtin/notes.c:913 msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 +#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "no eliminar, solo mostrar" -#: builtin/notes.c:955 +#: builtin/notes.c:953 msgid "report pruned notes" msgstr "reportar notas recortadas" -#: builtin/notes.c:998 +#: builtin/notes.c:996 msgid "notes-ref" msgstr "referencia-de-notas" -#: builtin/notes.c:999 +#: builtin/notes.c:997 msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1735 +#: builtin/notes.c:1032 builtin/stash.c:1752 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" @@ -18773,86 +19101,90 @@ msgstr "%u objetos ordenados, esperados %<PRIu32>" msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s" -#: builtin/pack-objects.c:1155 +#: builtin/pack-objects.c:1160 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:1168 +#: builtin/pack-objects.c:1173 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1229 builtin/update-index.c:90 +#: builtin/pack-objects.c:1235 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:1281 +#: builtin/pack-objects.c:1268 +msgid "failed to write bitmap index" +msgstr "escribir un índice de bitmap" + +#: builtin/pack-objects.c:1294 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1523 +#: builtin/pack-objects.c:1536 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:1971 +#: builtin/pack-objects.c:1984 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow de offset de base de delta en paquete para %s" -#: builtin/pack-objects.c:1980 +#: builtin/pack-objects.c:1993 #, c-format msgid "delta base offset out of bound for %s" msgstr "offset de base de delta está fuera de límites para %s" -#: builtin/pack-objects.c:2261 +#: builtin/pack-objects.c:2274 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:2426 +#: builtin/pack-objects.c:2439 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 -#: builtin/pack-objects.c:2522 +#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525 +#: builtin/pack-objects.c:2535 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2536 +#: builtin/pack-objects.c:2549 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2851 +#: builtin/pack-objects.c:2864 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3003 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no es posible empaquetar objetos alcanzables desde tag %s" -#: builtin/pack-objects.c:3076 +#: builtin/pack-objects.c:3089 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:3095 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3174 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18861,7 +19193,7 @@ msgstr "" "valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-" "objeto> <hash-de-pack> <uri>' (se tuvo '%s')" -#: builtin/pack-objects.c:3164 +#: builtin/pack-objects.c:3177 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18869,17 +19201,18 @@ msgstr "" "objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo " "'%s')" -#: builtin/pack-objects.c:3199 +#: builtin/pack-objects.c:3212 #, c-format msgid "could not get type of object %s in pack %s" msgstr "no se puede obtener el tipo de objeto %s en pack %s" -#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 +#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351 +#: builtin/pack-objects.c:3365 #, c-format msgid "could not find pack '%s'" msgstr "no se pudo encontrar pack '%s'" -#: builtin/pack-objects.c:3378 +#: builtin/pack-objects.c:3408 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18888,261 +19221,260 @@ msgstr "" "se esperaba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3414 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -"se esperaba ID de objeto, se obtuvo basuta:\n" +"se esperaba ID de objeto, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:3482 +#: builtin/pack-objects.c:3507 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 +#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:3572 +#: builtin/pack-objects.c:3541 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto suelto en %s no pudo ser examinado" -#: builtin/pack-objects.c:3658 +#: builtin/pack-objects.c:3627 msgid "unable to force loose object" msgstr "incapaz de forzar que el objecto se suelte" -#: builtin/pack-objects.c:3788 +#: builtin/pack-objects.c:3757 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 +#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3819 +#: builtin/pack-objects.c:3788 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3872 +#: builtin/pack-objects.c:3841 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3876 +#: builtin/pack-objects.c:3845 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3915 +#: builtin/pack-objects.c:3884 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3916 +#: builtin/pack-objects.c:3885 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:3919 +#: builtin/pack-objects.c:3888 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3921 +#: builtin/pack-objects.c:3890 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3923 +#: builtin/pack-objects.c:3892 msgid "ignore packed objects" msgstr "ignorar objetos empaquetados" -#: builtin/pack-objects.c:3925 +#: builtin/pack-objects.c:3894 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3927 +#: builtin/pack-objects.c:3896 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:3929 +#: builtin/pack-objects.c:3898 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:3931 +#: builtin/pack-objects.c:3900 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3933 +#: builtin/pack-objects.c:3902 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3935 +#: builtin/pack-objects.c:3904 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3937 +#: builtin/pack-objects.c:3906 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3939 +#: builtin/pack-objects.c:3908 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:3910 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3943 +#: builtin/pack-objects.c:3912 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no hayan sido empaquetados todavía" -#: builtin/pack-objects.c:3946 +#: builtin/pack-objects.c:3915 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3949 +#: builtin/pack-objects.c:3918 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:3921 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3955 +#: builtin/pack-objects.c:3924 msgid "read packs from stdin" msgstr "leer packs de stdin" -#: builtin/pack-objects.c:3957 +#: builtin/pack-objects.c:3926 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3959 +#: builtin/pack-objects.c:3928 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieran a objetos a ser empaquetados" -#: builtin/pack-objects.c:3961 +#: builtin/pack-objects.c:3930 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3963 +#: builtin/pack-objects.c:3932 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3965 +#: builtin/pack-objects.c:3934 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3968 +#: builtin/pack-objects.c:3937 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3970 +#: builtin/pack-objects.c:3939 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3972 +#: builtin/pack-objects.c:3941 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3974 +#: builtin/pack-objects.c:3943 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tengan un archivo .keep acompañante" -#: builtin/pack-objects.c:3976 +#: builtin/pack-objects.c:3945 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3978 +#: builtin/pack-objects.c:3947 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3980 +#: builtin/pack-objects.c:3949 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3982 +#: builtin/pack-objects.c:3951 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:3984 +#: builtin/pack-objects.c:3953 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3988 +#: builtin/pack-objects.c:3957 msgid "write a bitmap index if possible" msgstr "escribir un índice de bitmap si es posible" -#: builtin/pack-objects.c:3992 +#: builtin/pack-objects.c:3961 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3995 +#: builtin/pack-objects.c:3964 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3997 +#: builtin/pack-objects.c:3966 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3999 +#: builtin/pack-objects.c:3968 msgid "protocol" msgstr "protocolo" -#: builtin/pack-objects.c:4000 +#: builtin/pack-objects.c:3969 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" -"excluyendo cualquier uploadpack.blobpackfileuri configurado con este " -"protocolo" +"excluir cualquier uploadpack.blobpackfileuri configurado con este protocolo" -#: builtin/pack-objects.c:4033 +#: builtin/pack-objects.c:4002 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "profundidad de cadena de delta %d es demasiada profunda, forzando %d" -#: builtin/pack-objects.c:4038 +#: builtin/pack-objects.c:4007 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es demasiado grande, forzando %d" -#: builtin/pack-objects.c:4094 +#: builtin/pack-objects.c:4063 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size no puede ser usado para construir un paquete para " "transferencia" -#: builtin/pack-objects.c:4096 +#: builtin/pack-objects.c:4065 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:4101 +#: builtin/pack-objects.c:4070 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin no puede ser usado para construir un paquete indexable" -#: builtin/pack-objects.c:4104 +#: builtin/pack-objects.c:4073 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:4110 +#: builtin/pack-objects.c:4079 msgid "cannot use --filter without --stdout" msgstr "no se puede usar --filter sin --stdout" -#: builtin/pack-objects.c:4112 +#: builtin/pack-objects.c:4081 msgid "cannot use --filter with --stdin-packs" msgstr "no se puede usar --filter con --stdin-packs" -#: builtin/pack-objects.c:4116 +#: builtin/pack-objects.c:4085 msgid "cannot use internal rev list with --stdin-packs" msgstr "no se puede usar un lista interna de rev con --stdin-packs" -#: builtin/pack-objects.c:4175 +#: builtin/pack-objects.c:4144 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:4212 +#: builtin/pack-objects.c:4181 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19160,9 +19492,9 @@ msgid "" "to <git@vger.kernel.org>. Thanks.\n" msgstr "" "'git pack-redundant' está nominado para su eliminación.\n" -"Si todavía usa este comando, agregue una extra\n" +"Si todavía usas este comando, agrega una extra\n" "opción, '--i-still-use-this', en la línea de comando\n" -"y háganos saber que todavía lo usa enviando un correo electrónico\n" +"y háganos saber que todavía lo usas enviando un correo electrónico\n" "a <git@vger.kernel.org>. Gracias.\n" #: builtin/pack-refs.c:8 @@ -19197,7 +19529,7 @@ msgstr "caducar objetos más viejos a <tiempo>" msgid "limit traversal to objects outside promisor packfiles" msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" -#: builtin/prune.c:152 +#: builtin/prune.c:151 msgid "cannot prune in a precious-objects repo" msgstr "no se puede recortar en un repositorio de objetos preciosos" @@ -19223,11 +19555,11 @@ msgstr "Opciones relacionadas a fusión" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: builtin/pull.c:167 parse-options.h:340 +#: builtin/pull.c:167 parse-options.h:339 msgid "automatically stash/stash pop before and after" msgstr "ejecutar automáticamente stash/stash pop antes y después" @@ -19280,7 +19612,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:456 builtin/rebase.c:1248 +#: builtin/pull.c:456 builtin/rebase.c:951 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en una rama." @@ -19297,7 +19629,7 @@ msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1254 +#: builtin/rebase.c:957 msgid "<remote>" msgstr "<remoto>" @@ -19305,7 +19637,7 @@ msgstr "<remoto>" msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:471 builtin/rebase.c:1246 +#: builtin/pull.c:471 builtin/rebase.c:949 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." @@ -19334,11 +19666,11 @@ msgstr "no es posible acceder al commit %s" msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:930 +#: builtin/pull.c:936 msgid "" -"Pulling without specifying how to reconcile divergent branches is\n" -"discouraged. You can squelch this message by running one of the following\n" -"commands sometime before your next pull:\n" +"You have divergent branches and need to specify how to reconcile them.\n" +"You can do so by running one of the following commands sometime before\n" +"your next pull:\n" "\n" " git config pull.rebase false # merge (the default strategy)\n" " git config pull.rebase true # rebase\n" @@ -19362,21 +19694,20 @@ msgstr "" "la preferencia en todos los repositorios. Puedes también pasar --rebase,\n" "--no-rebase, o --ff-only en el comando para sobrescribir la configuración\n" "por defecto en cada invocación.\n" -"\n" -#: builtin/pull.c:990 +#: builtin/pull.c:1010 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nacida con cambios agregados al índice." -#: builtin/pull.c:994 +#: builtin/pull.c:1014 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:995 +#: builtin/pull.c:1015 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:1020 +#: builtin/pull.c:1040 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19387,7 +19718,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:1026 +#: builtin/pull.c:1046 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19398,21 +19729,29 @@ msgid "" "to recover." msgstr "" "No se puede realizar fast-forward en tu árbol de trabajo.\n" -"Tras asegurarse que haya guardado todo lo preciado de la salida de\n" +"Tras asegurarte que hayas guardado todo lo preciado de la salida de\n" "$ git diff %s\n" -",ejecute\n" +",ejecuta\n" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:1041 +#: builtin/pull.c:1061 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:1045 +#: builtin/pull.c:1066 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:1065 +#: builtin/pull.c:1068 +msgid "Cannot fast-forward to multiple branches." +msgstr "No se puede hacer fast-forward en múltiples ramas." + +#: builtin/pull.c:1082 +msgid "Need to specify how to reconcile divergent branches." +msgstr "Necesita especificar cómo reconciliar las ramas divergentes." + +#: builtin/pull.c:1096 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -19475,7 +19814,7 @@ msgid "" msgstr "" "Actualmente no estás en una rama.\n" "Para hacer un push a la historia que lleva al estado actual\n" -"(HEAD desacoplado), use\n" +"(HEAD desacoplado), usa\n" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" @@ -19489,7 +19828,7 @@ msgid "" msgstr "" "La rama actual %s no tiene una rama upstream.\n" "Para realizar un push de la rama actual y configurar el remoto como " -"upstream, use\n" +"upstream, usa\n" "\n" "\tgit push --set-upstream %s %s\n" @@ -19536,10 +19875,10 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Actualizaciones fueron rechazadas porque una punta de rama en el push está\n" -"detrás de su contraparte remota. Verifique esta rama e integre los cambios " +"detrás de su contraparte remota. Cambia a esta rama e integra los cambios " "remotos\n" "(ejem. 'git pull ...') antes de volver a hacer push.\n" -"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." +"Mira las 'Notes about fast-forwards' en 'git push --help' para más detalles." #: builtin/push.c:270 msgid "" @@ -19551,9 +19890,9 @@ msgid "" msgstr "" "Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n" "no existe localmente. Esto es causado usualmente por otro repositorio\n" -"realizando push a la misma ref. Quizás quiera integrar primero los cambios\n" +"realizando push a la misma ref. Quizás quieras integrar primero los cambios\n" "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" -"Vea 'Notes about fast-forwards' en 'git push --help' para detalles." +"Mira 'Notes about fast-forwards' en 'git push --help' para detalles." #: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." @@ -19579,7 +19918,7 @@ msgid "" msgstr "" "Las actualizaciones se rechazaron porque la punta de la rama de seguimiento\n" "remoto se ha actualizado desde la última vez que se realizó checkout. Es " -"posible que desee\n" +"posible que desees\n" "integrar esos cambios localmente (por ejemplo, 'git pull ...')\n" "antes de forzar una actualización.\n" @@ -19593,15 +19932,15 @@ msgstr "Haciendo push a %s\n" msgid "failed to push some refs to '%s'" msgstr "falló el push de algunas referencias a '%s'" -#: builtin/push.c:544 +#: builtin/push.c:544 builtin/submodule--helper.c:3258 msgid "repository" msgstr "repositorio" -#: builtin/push.c:545 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:193 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:546 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:195 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" @@ -19613,32 +19952,32 @@ msgstr "borrar refs" 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:552 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:196 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:553 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:208 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:554 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:209 msgid "require old value of ref to be at this value" -msgstr "requiere que el valor viejo de ref sea este valor" +msgstr "requerir que el valor viejo de ref sea este valor" -#: builtin/push.c:557 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:212 msgid "require remote updates to be integrated locally" -msgstr "requieren que las actualizaciones remotas se integren localmente" +msgstr "requerir que las actualizaciones remotas se integren localmente" #: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:561 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:203 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 -#: builtin/send-pack.c:187 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190 +#: builtin/send-pack.c:191 msgid "receive pack program" msgstr "programa de recepción de paquetes" @@ -19658,11 +19997,11 @@ msgstr "hacer un bypass al hook pre-push" msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:572 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:197 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:574 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:204 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" @@ -19775,83 +20114,82 @@ msgstr "se necesitan dos rangos de commits" #: builtin/read-tree.c:41 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" +"ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" -"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" -"sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-" -"ismo2> [<árbol-ismo3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " +"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" +"ish1> [<tree-ish2> [<tree-ish3>]])" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:116 msgid "write resulting index to <file>" msgstr "escribir índice resultante en <archivo>" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:119 msgid "only empty the index" msgstr "solo vaciar el índice" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:121 msgid "Merging" msgstr "Fusionando" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:123 msgid "perform a merge in addition to a read" msgstr "realizar un merge en adición a una lectura" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:125 msgid "3-way merge if no file level merging required" msgstr "fusión de 3 vías si no se requiere ninguna fusión a nivel de archivo" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:127 msgid "3-way merge in presence of adds and removes" msgstr "fusión de 3 vías en presencia de adiciones y eliminaciones" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:129 msgid "same as -m, but discard unmerged entries" msgstr "igual que -m, pero descarta entradas sin fusionar" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:130 msgid "<subdirectory>/" msgstr "<subdirectorio>/" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:131 msgid "read the tree into the index under <subdirectory>/" -msgstr "lea el árbol en el índice bajo <subdirectorio>/" +msgstr "leer el árbol en el índice bajo <subdirectorio>/" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:134 msgid "update working tree with merge result" msgstr "actualiza el árbol de trabajo con el resultado de la fusión" -#: builtin/read-tree.c:144 +#: builtin/read-tree.c:136 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:137 msgid "allow explicitly ignored files to be overwritten" msgstr "permitir sobrescritura de archivos explícitamente ignorados" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:140 msgid "don't check the working tree after merging" msgstr "no revisar el árbol de trabajo tras fusionar" -#: builtin/read-tree.c:149 +#: builtin/read-tree.c:141 msgid "don't update the index or the work tree" msgstr "no actualizar el índice o el árbol de trabajo" -#: builtin/read-tree.c:151 +#: builtin/read-tree.c:143 msgid "skip applying sparse checkout filter" msgstr "saltar aplicación de filtro de sparse checkout" -#: builtin/read-tree.c:153 +#: builtin/read-tree.c:145 msgid "debug unpack-trees" msgstr "debug unpack-trees" -#: builtin/read-tree.c:157 +#: builtin/read-tree.c:149 msgid "suppress feedback messages" msgstr "suprimir mensajes de feedback" -#: builtin/read-tree.c:188 +#: builtin/read-tree.c:183 msgid "You need to resolve your current index first" msgstr "Necesitas resolver tu índice actual primero" @@ -19873,193 +20211,44 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "lista de pendientes inutilizable: '%s'" - -#: builtin/rebase.c:311 +#: builtin/rebase.c:230 #, c-format msgid "could not create temporary %s" msgstr "no se pudo crear archivo temporal %s" -#: builtin/rebase.c:317 +#: builtin/rebase.c:236 msgid "could not mark as interactive" msgstr "no se pudo marcar como interactivo" -#: builtin/rebase.c:370 +#: builtin/rebase.c:289 msgid "could not generate todo list" msgstr "no se pudo generar lista de pendientes" -#: builtin/rebase.c:412 +#: builtin/rebase.c:331 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:481 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<opciones>]" - -#: builtin/rebase.c:494 builtin/rebase.c:1389 -msgid "keep commits which start empty" -msgstr "mantener commits que comiencen con vacío" - -#: builtin/rebase.c:498 builtin/revert.c:128 -msgid "allow commits with empty messages" -msgstr "permitir commits con mensajes vacíos" - -#: builtin/rebase.c:500 -msgid "rebase merge commits" -msgstr "rebasar commits de fusión" - -#: builtin/rebase.c:502 -msgid "keep original branch points of cousins" -msgstr "mantener puntas de bifurcación originales de los primos" - -#: builtin/rebase.c:504 -msgid "move commits that begin with squash!/fixup!" -msgstr "mover commits que comiencen con squash!/fixup!" - -#: builtin/rebase.c:505 -msgid "sign commits" -msgstr "firmar commits" - -#: builtin/rebase.c:507 builtin/rebase.c:1328 -msgid "display a diffstat of what changed upstream" -msgstr "mostrar un diffstat de lo que cambió en upstream" - -#: builtin/rebase.c:509 -msgid "continue rebase" -msgstr "continuar rebase" - -#: builtin/rebase.c:511 -msgid "skip commit" -msgstr "saltar commit" - -#: builtin/rebase.c:512 -msgid "edit the todo list" -msgstr "editar la lista de pendientes" - -#: builtin/rebase.c:514 -msgid "show the current patch" -msgstr "mostrar el parche actual" - -#: builtin/rebase.c:517 -msgid "shorten commit ids in the todo list" -msgstr "ids de commits cortos en la lista de pendientes" - -#: builtin/rebase.c:519 -msgid "expand commit ids in the todo list" -msgstr "expandir ids de commits en la lista de pendientes" - -#: builtin/rebase.c:521 -msgid "check the todo list" -msgstr "revisar la lista de pendientes" - -#: builtin/rebase.c:523 -msgid "rearrange fixup/squash lines" -msgstr "reordenar líneas fixup/squash" - -#: builtin/rebase.c:525 -msgid "insert exec commands in todo list" -msgstr "insertar comando exec en la lista de pendientes" - -#: builtin/rebase.c:526 -msgid "onto" -msgstr "sobre" - -#: builtin/rebase.c:529 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase.c:529 -msgid "restrict revision" -msgstr "restringir revision" - -#: builtin/rebase.c:531 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase.c:532 -msgid "squash onto" -msgstr "squash a" - -#: builtin/rebase.c:534 -msgid "the upstream commit" -msgstr "el commit de upstream" - -#: builtin/rebase.c:536 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase.c:536 -msgid "head name" -msgstr "nombre de head" - -#: builtin/rebase.c:541 -msgid "rebase strategy" -msgstr "estrategia de rebase" - -#: builtin/rebase.c:542 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase.c:543 -msgid "strategy options" -msgstr "opciones de estrategia" - -#: builtin/rebase.c:544 -msgid "switch-to" -msgstr "cambiar a" - -#: builtin/rebase.c:545 -msgid "the branch or commit to checkout" -msgstr "la rama o commit para hacer checkout" - -#: builtin/rebase.c:546 -msgid "onto-name" -msgstr "sobre-nombre" - -#: builtin/rebase.c:546 -msgid "onto name" -msgstr "sobre nombre" - -#: builtin/rebase.c:547 -msgid "cmd" -msgstr "cmd" - -#: builtin/rebase.c:547 -msgid "the command to run" -msgstr "el comando para ejecutar" - -#: builtin/rebase.c:550 builtin/rebase.c:1422 -msgid "automatically re-schedule any `exec` that fails" -msgstr "reprogramar automaticamente cualquier `exec` que falle" - -#: builtin/rebase.c:566 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" - -#: builtin/rebase.c:582 +#: builtin/rebase.c:390 #, c-format msgid "%s requires the merge backend" msgstr "%s requiere un backend de fusión" -#: builtin/rebase.c:625 +#: builtin/rebase.c:432 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:642 +#: builtin/rebase.c:449 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head inválido: '%s'" -#: builtin/rebase.c:667 +#: builtin/rebase.c:474 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando inválido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:597 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -20067,14 +20256,14 @@ msgid "" "To abort and get back to the state before \"git rebase\", run \"git rebase --" "abort\"." msgstr "" -"Resuelva todos los conflictos manualmente ya sea con\n" -"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue" +"Resuelve todos los conflictos manualmente ya sea con\n" +"\"git add/rm <archivo_conflictivo>\", luego ejecuta \"git rebase --continue" "\".\n" "Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n" "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:896 +#: builtin/rebase.c:680 #, c-format msgid "" "\n" @@ -20093,7 +20282,7 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1222 +#: builtin/rebase.c:925 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -20102,7 +20291,7 @@ msgstr "" "tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y " "\"ask\"." -#: builtin/rebase.c:1240 +#: builtin/rebase.c:943 #, c-format msgid "" "%s\n" @@ -20119,7 +20308,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1256 +#: builtin/rebase.c:959 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -20132,184 +20321,194 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1286 +#: builtin/rebase.c:989 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1290 +#: builtin/rebase.c:993 msgid "empty exec command" msgstr "comando exec vacío" -#: builtin/rebase.c:1319 +#: builtin/rebase.c:1023 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase sobre rama dada en lugar de upstream" -#: builtin/rebase.c:1321 +#: builtin/rebase.c:1025 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:1323 +#: builtin/rebase.c:1027 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1325 +#: builtin/rebase.c:1029 msgid "be quiet. implies --no-stat" msgstr "ser silencioso. implica --no-stat" -#: builtin/rebase.c:1331 +#: builtin/rebase.c:1032 +msgid "display a diffstat of what changed upstream" +msgstr "mostrar un diffstat de lo que cambió en upstream" + +#: builtin/rebase.c:1035 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1038 msgid "add a Signed-off-by trailer to each commit" msgstr "agregar una línea \"Signed-off-by\" al mensaje de cada commit" -#: builtin/rebase.c:1337 +#: builtin/rebase.c:1041 msgid "make committer date match author date" msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1043 msgid "ignore author date and use current date" msgstr "ignorar la fecha del autor y usar la fecha actual" -#: builtin/rebase.c:1341 +#: builtin/rebase.c:1045 msgid "synonym of --reset-author-date" msgstr "sinónimo para --reset-author-date" -#: builtin/rebase.c:1343 builtin/rebase.c:1347 +#: builtin/rebase.c:1047 builtin/rebase.c:1051 msgid "passed to 'git apply'" msgstr "pasado a 'git apply'" -#: builtin/rebase.c:1345 +#: builtin/rebase.c:1049 msgid "ignore changes in whitespace" msgstr "ignorar cambios en espacios en blanco" -#: builtin/rebase.c:1349 builtin/rebase.c:1352 +#: builtin/rebase.c:1053 builtin/rebase.c:1056 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1354 +#: builtin/rebase.c:1058 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1357 +#: builtin/rebase.c:1061 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1063 msgid "abort and check out the original branch" -msgstr "aborta y revisa la rama original" +msgstr "abortar y cambiar a la rama original" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1066 msgid "abort but keep HEAD where it is" -msgstr "aborta pero mantiene HEAD donde está" +msgstr "abortar pero mantiene HEAD donde está" -#: builtin/rebase.c:1363 +#: builtin/rebase.c:1067 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1070 msgid "show the patch file being applied or merged" -msgstr "muestra el archivo parche siendo aplicado o fusionado" +msgstr "mostrar el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1369 +#: builtin/rebase.c:1073 msgid "use apply strategies to rebase" msgstr "usar estrategias de apply para el rebase" -#: builtin/rebase.c:1373 +#: builtin/rebase.c:1077 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusión para el rebase" -#: builtin/rebase.c:1377 +#: builtin/rebase.c:1081 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:1381 +#: builtin/rebase.c:1085 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1090 msgid "how to handle commits that become empty" msgstr "como manejar commits que se vuelven vacíos" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1093 +msgid "keep commits which start empty" +msgstr "mantener commits que comiencen con vacío" + +#: builtin/rebase.c:1097 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comiencen con squash!/fixup! bajo -i" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1104 msgid "add exec lines after each commit of the editable list" msgstr "agregar líneas exec tras cada commit de la lista editable" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1108 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase de commits con mensajes vacíos" -#: builtin/rebase.c:1408 +#: builtin/rebase.c:1112 msgid "try to rebase merges instead of skipping them" msgstr "intentar rebase de fusiones en lugar de saltarlas" -#: builtin/rebase.c:1411 +#: builtin/rebase.c:1115 msgid "use 'merge-base --fork-point' to refine upstream" -msgstr "use 'merge-base --fork-point' para refinar upstream" +msgstr "usar 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1117 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1415 builtin/revert.c:115 +#: builtin/rebase.c:1119 builtin/revert.c:115 msgid "option" msgstr "opción" -#: builtin/rebase.c:1416 +#: builtin/rebase.c:1120 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusión" -#: builtin/rebase.c:1419 +#: builtin/rebase.c:1123 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:1424 +#: builtin/rebase.c:1126 +msgid "automatically re-schedule any `exec` that fails" +msgstr "reprogramar automaticamente cualquier `exec` que falle" + +#: builtin/rebase.c:1128 msgid "apply all changes, even those already present upstream" msgstr "" "aplicar todos los cambios, incluso aquellos que ya están presentes en " "upstream" -#: builtin/rebase.c:1442 +#: builtin/rebase.c:1149 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:1483 -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:1180 +msgid "--preserve-merges was replaced by --rebase-merges" +msgstr "--preserve-merges fue reemplazado por --rebase-merges" -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1193 msgid "cannot combine '--keep-base' with '--onto'" msgstr "no se puede combinar '--keep-base' con '--onto'" -#: builtin/rebase.c:1490 +#: builtin/rebase.c:1195 msgid "cannot combine '--keep-base' with '--root'" msgstr "no se puede combinar '--keep-base' con '--root'" -#: builtin/rebase.c:1494 +#: builtin/rebase.c:1199 msgid "cannot combine '--root' with '--fork-point'" msgstr "no se puede combinar '--root' con '--fork-point'" -#: builtin/rebase.c:1497 +#: builtin/rebase.c:1202 msgid "No rebase in progress?" msgstr "¿No hay rebase en progreso?" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1206 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "La acción --edit-todo solo puede ser usada al rebasar interactivamente." -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 +#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1536 +#: builtin/rebase.c:1241 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -20317,16 +20516,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1260 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del árbol de trabajo" -#: builtin/rebase.c:1574 +#: builtin/rebase.c:1279 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1620 +#: builtin/rebase.c:1325 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -20347,144 +20546,133 @@ msgstr "" "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahí.\n" -#: builtin/rebase.c:1648 +#: builtin/rebase.c:1353 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numérico" -#: builtin/rebase.c:1690 +#: builtin/rebase.c:1395 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1729 +#: builtin/rebase.c:1434 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1759 +#: builtin/rebase.c:1463 msgid "cannot combine apply options with merge options" msgstr "no se pueden combinar opciones de apply con opciones de merge" -#: builtin/rebase.c:1772 +#: builtin/rebase.c:1476 #, c-format msgid "Unknown rebase backend: %s" msgstr "Backend de rebase desconocido: %s" -#: builtin/rebase.c:1802 +#: builtin/rebase.c:1505 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: builtin/rebase.c:1822 -msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" - -#: builtin/rebase.c:1826 -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:1850 +#: builtin/rebase.c:1536 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inválido '%s'" -#: builtin/rebase.c:1856 +#: builtin/rebase.c:1542 msgid "Could not create new root commit" msgstr "No se pudo crear commit raíz nuevo" -#: builtin/rebase.c:1882 +#: builtin/rebase.c:1568 #, 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:1885 +#: builtin/rebase.c:1571 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusión" -#: builtin/rebase.c:1893 +#: builtin/rebase.c:1580 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit válido '%s'" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1607 #, c-format -msgid "fatal: no such branch/commit '%s'" -msgstr "fatal: no existe la rama/commit: '%s'" +msgid "no such branch/commit '%s'" +msgstr "no existe la rama/commit: '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2431 +#: builtin/rebase.c:1618 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2658 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1629 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisión" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1650 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: builtin/rebase.c:1997 +#: builtin/rebase.c:1686 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:2008 +#: builtin/rebase.c:1697 msgid "HEAD is up to date." msgstr "HEAD está actualizado." -#: builtin/rebase.c:2010 +#: builtin/rebase.c:1699 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s está actualizada.\n" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:1707 msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1709 #, 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:2028 +#: builtin/rebase.c:1717 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: builtin/rebase.c:2035 +#: builtin/rebase.c:1724 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:1727 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:1752 #, 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 esta...\n" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:1761 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2081 +#: builtin/rebase.c:1770 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rápido de %s a %s.\n" -#: builtin/receive-pack.c:34 +#: builtin/receive-pack.c:35 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1275 +#: builtin/receive-pack.c:1280 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20517,7 +20705,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:1295 +#: builtin/receive-pack.c:1300 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20538,11 +20726,11 @@ msgstr "" "\n" "Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:2478 +#: builtin/receive-pack.c:2480 msgid "quiet" msgstr "silencioso" -#: builtin/receive-pack.c:2492 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." @@ -20583,7 +20771,7 @@ msgstr "Marcando objectos alcanzables..." msgid "%s points nowhere!" msgstr "¡%s no apunta a ningún lado!" -#: builtin/reflog.c:699 +#: builtin/reflog.c:700 msgid "no reflog specified to delete" msgstr "no reflog especificado para borrar" @@ -20740,7 +20928,7 @@ msgstr "especificar una rama master no tiene sentido con --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors" -#: builtin/remote.c:195 builtin/remote.c:700 +#: builtin/remote.c:195 builtin/remote.c:705 #, c-format msgid "remote %s already exists." msgstr "remoto %s ya existe." @@ -20750,25 +20938,30 @@ msgstr "remoto %s ya existe." msgid "Could not setup master '%s'" msgstr "No se pudo configurar master '%s'" -#: builtin/remote.c:355 +#: builtin/remote.c:322 +#, c-format +msgid "unhandled branch.%s.rebase=%s; assuming 'true'" +msgstr "branch.%s.rebase=%s no manejado; se asume 'true'" + +#: builtin/remote.c:366 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "No se pudo obtener el mapa de fetch para refspec %s" -#: builtin/remote.c:454 builtin/remote.c:462 +#: builtin/remote.c:460 builtin/remote.c:468 msgid "(matching)" msgstr "(concordando)" -#: builtin/remote.c:466 +#: builtin/remote.c:472 msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:655 +#: builtin/remote.c:660 #, c-format msgid "could not set '%s'" msgstr "no se pudo configurar '%s'" -#: builtin/remote.c:660 +#: builtin/remote.c:665 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -20779,17 +20972,17 @@ msgstr "" "\t%s:%d\n" "ahora nombra al remoto inexistente '%s'" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 +#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:710 +#: builtin/remote.c:715 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'" -#: builtin/remote.c:730 +#: builtin/remote.c:735 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -20798,19 +20991,19 @@ msgid "" msgstr "" "No se actualiza refspec de fetch no predeterminada\n" "\t%s\n" -"\tPor favor actualice la configuración manualmente si es necesario." +"\tPor favor actualiza la configuración manualmente si es necesario." -#: builtin/remote.c:770 +#: builtin/remote.c:775 #, c-format msgid "deleting '%s' failed" msgstr "borrar '%s' falló" -#: builtin/remote.c:804 +#: builtin/remote.c:809 #, c-format msgid "creating '%s' failed" msgstr "crear '%s' falló" -#: builtin/remote.c:882 +#: builtin/remote.c:887 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -20819,124 +21012,124 @@ msgid_plural "" "to delete them, use:" msgstr[0] "" "Nota: Una rama fuera de la jerarquía refs/remotes/ no fue eliminada;\n" -"para borrarla, use:" +"para borrarla, usa:" msgstr[1] "" "Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron " "eliminadas;\n" -"para borrarlas, use:" +"para borrarlas, usa:" -#: builtin/remote.c:896 +#: builtin/remote.c:901 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la sección de configuración '%s'" -#: builtin/remote.c:999 +#: builtin/remote.c:1009 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" -#: builtin/remote.c:1002 +#: builtin/remote.c:1012 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:1004 +#: builtin/remote.c:1014 msgid " stale (use 'git remote prune' to remove)" -msgstr " viejo (use 'git remote prune' para eliminar)" +msgstr " viejo (usa 'git remote prune' para eliminar)" -#: builtin/remote.c:1006 +#: builtin/remote.c:1016 msgid " ???" msgstr " ???" -#: builtin/remote.c:1047 +#: builtin/remote.c:1057 #, 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:1056 +#: builtin/remote.c:1066 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:1058 +#: builtin/remote.c:1068 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:1061 +#: builtin/remote.c:1071 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:1075 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:1068 +#: builtin/remote.c:1078 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:1071 +#: builtin/remote.c:1081 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1114 +#: builtin/remote.c:1124 msgid "create" msgstr "crear" -#: builtin/remote.c:1117 +#: builtin/remote.c:1127 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1121 +#: builtin/remote.c:1131 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1124 +#: builtin/remote.c:1134 msgid "fast-forwardable" msgstr "se puede realizar fast-forward" -#: builtin/remote.c:1127 +#: builtin/remote.c:1137 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1134 +#: builtin/remote.c:1144 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1137 +#: builtin/remote.c:1147 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1141 +#: builtin/remote.c:1151 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1144 +#: builtin/remote.c:1154 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1212 +#: builtin/remote.c:1222 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1239 +#: builtin/remote.c:1243 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 +#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398 msgid "(no URL)" msgstr "(sin URL)" @@ -20944,330 +21137,348 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1259 builtin/remote.c:1261 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 +#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1259 +#: builtin/remote.c:1263 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1261 +#: builtin/remote.c:1265 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1265 +#: builtin/remote.c:1269 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " Rama HEAD (HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" -#: builtin/remote.c:1277 +#: builtin/remote.c:1281 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1280 builtin/remote.c:1306 +#: builtin/remote.c:1284 builtin/remote.c:1310 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1289 +#: builtin/remote.c:1293 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:1297 +#: builtin/remote.c:1301 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales serán reflejadas por 'git push'" -#: builtin/remote.c:1303 +#: builtin/remote.c:1307 #, 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:1324 +#: builtin/remote.c:1328 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1341 +#: builtin/remote.c:1344 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1343 +#: builtin/remote.c:1346 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:1353 +#: builtin/remote.c:1356 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1361 +#: builtin/remote.c:1364 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref válido: %s" -#: builtin/remote.c:1363 +#: builtin/remote.c:1366 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1381 +#: builtin/remote.c:1384 #, c-format msgid " %s will become dangling!" msgstr " ¡%s se volverá colgante!" -#: builtin/remote.c:1382 +#: builtin/remote.c:1385 #, c-format msgid " %s has become dangling!" msgstr " ¡%s se ha vuelto colgante!" -#: builtin/remote.c:1392 +#: builtin/remote.c:1394 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1393 +#: builtin/remote.c:1395 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1409 +#: builtin/remote.c:1411 #, c-format msgid " * [would prune] %s" msgstr " * [se acortará] %s" -#: builtin/remote.c:1412 +#: builtin/remote.c:1414 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1457 +#: builtin/remote.c:1459 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 +#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1539 +#: builtin/remote.c:1541 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1546 +#: builtin/remote.c:1548 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1563 +#: builtin/remote.c:1565 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1565 +#: builtin/remote.c:1567 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1621 +#: builtin/remote.c:1623 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1623 +#: builtin/remote.c:1625 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1625 +#: builtin/remote.c:1627 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1632 +#: builtin/remote.c:1634 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1673 +#: builtin/remote.c:1675 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrón de URL viejo inválido: %s" -#: builtin/remote.c:1681 +#: builtin/remote.c:1683 #, c-format msgid "No such URL found: %s" msgstr "No se encontró URL: %s" -#: builtin/remote.c:1683 +#: builtin/remote.c:1685 msgid "Will not delete all non-push URLs" msgstr "No borrará todos los URLs no de push" -#: builtin/repack.c:26 +#: builtin/remote.c:1702 +msgid "be verbose; must be placed before a subcommand" +msgstr "ser verboso; tiene que ser agregado antes de un subcomando" + +#: builtin/repack.c:28 msgid "git repack [<options>]" msgstr "git repack [<opciones>]" -#: builtin/repack.c:31 +#: builtin/repack.c:33 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Reempaquetados incrementales son incompatibles con índices bitmap. Use\n" -"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." +"Reempaquetados incrementales son incompatibles con índices bitmap. Usa\n" +"--no-write-bitmap-index o deshabilita la configuración pack.writebitmaps." -#: builtin/repack.c:198 +#: builtin/repack.c:201 msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:270 builtin/repack.c:630 +#: builtin/repack.c:273 builtin/repack.c:816 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Esperando líneas de ID de objeto completas en hex solo desde pack-" "objects." -#: builtin/repack.c:294 +#: builtin/repack.c:297 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no se puede finalizar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:309 +#: builtin/repack.c:312 #, c-format msgid "cannot open index for %s" msgstr "no se puede abrir index para %s" -#: builtin/repack.c:368 +#: builtin/repack.c:371 #, c-format msgid "pack %s too large to consider in geometric progression" -msgstr "pack %s es muy grande para considerar en la progresión geométrica" +msgstr "" +"pack %s es demasiado grande para considerar en la progresión geométrica" -#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416 #, c-format msgid "pack %s too large to roll up" -msgstr "pack %s es muy grande para hacer un roll up" +msgstr "pack %s es demasiado grande para hacer un roll up" + +#: builtin/repack.c:496 +#, c-format +msgid "could not open tempfile %s for writing" +msgstr "no se pudo abrir %s para escritura" -#: builtin/repack.c:460 +#: builtin/repack.c:514 +msgid "could not close refs snapshot tempfile" +msgstr "no se pudo cerrar snapshot de refs temporal" + +#: builtin/repack.c:628 msgid "pack everything in a single pack" msgstr "empaquetar todo en un único paquete" -#: builtin/repack.c:462 +#: builtin/repack.c:630 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y soltar objetos inalcanzables" -#: builtin/repack.c:465 +#: builtin/repack.c:633 msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:467 +#: builtin/repack.c:635 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:469 +#: builtin/repack.c:637 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:471 +#: builtin/repack.c:639 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:474 +#: builtin/repack.c:642 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:476 +#: builtin/repack.c:644 msgid "write bitmap index" msgstr "escribir un índice de bitmap" -#: builtin/repack.c:478 +#: builtin/repack.c:646 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:479 +#: builtin/repack.c:647 msgid "approxidate" msgstr "approxidate" -#: builtin/repack.c:480 +#: builtin/repack.c:648 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos más antiguos que este" -#: builtin/repack.c:482 +#: builtin/repack.c:650 msgid "with -a, repack unreachable objects" msgstr "con -a, reempaquetar objetos inalcanzables" -#: builtin/repack.c:484 +#: builtin/repack.c:652 msgid "size of the window used for delta compression" msgstr "tamaño de la ventana usada para la compresión delta" -#: builtin/repack.c:485 builtin/repack.c:491 +#: builtin/repack.c:653 builtin/repack.c:659 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:486 +#: builtin/repack.c:654 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 del número de " "entradas" -#: builtin/repack.c:488 +#: builtin/repack.c:656 msgid "limits the maximum delta depth" msgstr "limita la profundidad máxima del delta" -#: builtin/repack.c:490 +#: builtin/repack.c:658 msgid "limits the maximum number of threads" msgstr "limita el número máximo de hilos" -#: builtin/repack.c:492 +#: builtin/repack.c:660 msgid "maximum size of each packfile" msgstr "tamaño máximo de cada paquete" -#: builtin/repack.c:494 +#: builtin/repack.c:662 msgid "repack objects in packs marked with .keep" msgstr "reempaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:496 +#: builtin/repack.c:664 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:498 +#: builtin/repack.c:666 msgid "find a geometric progression with factor <N>" msgstr "encontrar una progresión geométrica con factor <N>" -#: builtin/repack.c:508 +#: builtin/repack.c:668 +msgid "write a multi-pack index of the resulting packs" +msgstr "escribir un índice multi-pack de los paquetes resultantes" + +#: builtin/repack.c:678 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos preciosos" -#: builtin/repack.c:512 +#: builtin/repack.c:682 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:527 +#: builtin/repack.c:713 msgid "--geometric is incompatible with -A, -a" msgstr "--geometric es incompatible con -A, -a" -#: builtin/repack.c:639 +#: builtin/repack.c:825 msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#: builtin/repack.c:669 +#: builtin/repack.c:855 #, c-format msgid "missing required file: %s" msgstr "falta archivo requerido: %s" -#: builtin/repack.c:671 +#: builtin/repack.c:857 #, c-format msgid "could not unlink: %s" msgstr "no se pudo desvincular: %s" @@ -21416,7 +21627,7 @@ msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit " +"commit original '%s' contiene un mergetag '%s' que es descartado; usa --edit " "en lugar de --graft" #: builtin/replace.c:469 @@ -21577,92 +21788,92 @@ msgstr "fusionar" msgid "keep" msgstr "mantener" -#: builtin/reset.c:83 +#: builtin/reset.c:89 msgid "You do not have a valid HEAD." msgstr "No hay un HEAD válido." -#: builtin/reset.c:85 +#: builtin/reset.c:91 msgid "Failed to find tree of HEAD." msgstr "Falló al encontrar el árbol de HEAD." -#: builtin/reset.c:91 +#: builtin/reset.c:97 #, c-format msgid "Failed to find tree of %s." msgstr "Falló al encontrar árbol de %s." -#: builtin/reset.c:116 +#: builtin/reset.c:122 #, c-format msgid "HEAD is now at %s" msgstr "HEAD está ahora en %s" -#: builtin/reset.c:195 +#: builtin/reset.c:201 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "No se puede realizar un reset %s en medio de una fusión." -#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 -#: builtin/stash.c:687 +#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679 +#: builtin/stash.c:703 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" -#: builtin/reset.c:297 +#: builtin/reset.c:303 msgid "reset HEAD and index" msgstr "reiniciar HEAD e índice" -#: builtin/reset.c:298 +#: builtin/reset.c:304 msgid "reset only HEAD" msgstr "reiniciar solo HEAD" -#: builtin/reset.c:300 builtin/reset.c:302 +#: builtin/reset.c:306 builtin/reset.c:308 msgid "reset HEAD, index and working tree" msgstr "reiniciar HEAD, índice y árbol de trabajo" -#: builtin/reset.c:304 +#: builtin/reset.c:310 msgid "reset HEAD but keep local changes" msgstr "reiniciar HEAD pero mantener cambios locales" -#: builtin/reset.c:310 +#: builtin/reset.c:316 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 luego" -#: builtin/reset.c:344 +#: builtin/reset.c:350 #, 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:352 +#: builtin/reset.c:358 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Falló al resolver '%s' como un árbol válido." -#: builtin/reset.c:361 +#: builtin/reset.c:367 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch es incompatible con --{hard,mixed,soft}" -#: builtin/reset.c:371 +#: builtin/reset.c:377 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio." +"--mixed con rutas ha sido deprecado; usa 'git reset -- <rutas>' en cambio." -#: builtin/reset.c:373 +#: builtin/reset.c:379 #, c-format msgid "Cannot do %s reset with paths." msgstr "No se puede hacer un reset %s con rutas." -#: builtin/reset.c:388 +#: builtin/reset.c:394 #, 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:392 +#: builtin/reset.c:398 msgid "-N can only be used with --mixed" msgstr "-N solo puede ser usada con --mixed" -#: builtin/reset.c:413 +#: builtin/reset.c:419 msgid "Unstaged changes after reset:" msgstr "Cambios fuera del área de stage tras el reset:" -#: builtin/reset.c:416 +#: builtin/reset.c:422 #, c-format msgid "" "\n" @@ -21676,12 +21887,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:434 +#: builtin/reset.c:440 #, 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:439 +#: builtin/reset.c:445 msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." @@ -21741,7 +21952,7 @@ msgstr "" " or: git rev-parse --sq-quote [<arg>...]\n" " or: git rev-parse [<opciones>] [<arg>...]\n" "\n" -"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer " +"Ejecuta \"git rev-parse --parseopt -h\" para más información sobre el primer " "uso." #: builtin/rev-parse.c:712 @@ -21786,7 +21997,7 @@ msgstr "modo desconocido para --abbrev-ref: %s" #: builtin/rev-parse.c:1023 #, c-format msgid "unknown mode for --show-object-format: %s" -msgstr "modo desconocidopara --show-object-format: %s" +msgstr "modo desconocido para --show-object-format: %s" #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." @@ -21862,15 +22073,19 @@ msgstr "adjuntar el nombre del commit" msgid "preserve initially empty commits" msgstr "preservar commits iniciales vacíos" +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "permitir commits con mensajes vacíos" + #: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "mantener commits redundantes, vacíos" -#: builtin/revert.c:237 +#: builtin/revert.c:241 msgid "revert failed" msgstr "falló al revertir" -#: builtin/revert.c:250 +#: builtin/revert.c:254 msgid "cherry-pick failed" msgstr "cherry-pick falló" @@ -21920,71 +22135,71 @@ msgid_plural "the following files have local modifications:" msgstr[0] "el siguiente archivo tiene modificaciones locales:" msgstr[1] "los siguientes archivos tienen modificaciones locales:" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "do not list removed files" msgstr "no listar archivos eliminados" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "only remove from the index" msgstr "solo eliminar del índice" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "override the up-to-date check" -msgstr "salta el check de actualización" +msgstr "saltar el check de actualización" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "allow recursive removal" msgstr "permitir eliminar de forma recursiva" -#: builtin/rm.c:249 +#: builtin/rm.c:250 msgid "exit with a zero status even if nothing matched" msgstr "salir con estado cero incluso si nada coincide" -#: builtin/rm.c:283 +#: builtin/rm.c:285 msgid "No pathspec was given. Which files should I remove?" msgstr "No se entregó un pathspec. ¿Qué archivos se deberían eliminar?" -#: builtin/rm.c:310 +#: builtin/rm.c:315 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "por favor agrega tus cambios a .gitmodules al stage o realiza un stash para " "proceder" -#: builtin/rm.c:331 +#: builtin/rm.c:337 #, c-format msgid "not removing '%s' recursively without -r" msgstr "no eliminando '%s' de manera recursiva sin -r" -#: builtin/rm.c:379 +#: builtin/rm.c:385 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no es posible eliminar %s" #: builtin/send-pack.c:20 msgid "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " -"[<ref>...]\n" -" --all and explicit <ref> specification are mutually exclusive." +"git send-pack [--mirror] [--dry-run] [--force]\n" +" [--receive-pack=<git-receive-pack>]\n" +" [--verbose] [--thin] [--atomic]\n" +" [<host>:]<directory> (--all | <ref>...)" msgstr "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " -"[<ref>...]\n" -" --all y especificaciones <ref> explícitas son mutuamente exclusivas." +"git send-pack [--mirror] [--dry-run] [--force]\n" +" [--receive-pack=<git-receive-pack>]\n" +" [--verbose] [--thin] [--atomic]\n" +" [<host>:]<directorio> (--all | <ref>...)" -#: builtin/send-pack.c:188 +#: builtin/send-pack.c:192 msgid "remote name" msgstr "nombre remoto" -#: builtin/send-pack.c:201 +#: builtin/send-pack.c:205 msgid "use stateless RPC protocol" msgstr "usar protocolo RPC sin estado" -#: builtin/send-pack.c:202 +#: builtin/send-pack.c:206 msgid "read refs from stdin" msgstr "leer refs de stdin" -#: builtin/send-pack.c:203 +#: builtin/send-pack.c:207 msgid "print status from remote helper" msgstr "mostrar status del remote helper" @@ -22041,21 +22256,21 @@ msgstr "campo" msgid "group by field" msgstr "agrupar por campo" -#: builtin/shortlog.c:391 +#: builtin/shortlog.c:394 msgid "too many arguments given outside repository" msgstr "demasiados argumentos dados fuera del repositorio" #: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--current] [--color[=<when>] | --no-color] [--sparse]\n" +" [--more=<n> | --list | --independent | --merge-base]\n" +" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--current] [--color[=<when>] | --no-color] [--sparse]\n" +" [--more=<n> | --list | --independent | --merge-base]\n" +" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" #: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" @@ -22068,114 +22283,114 @@ msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorando %s; no se puede manejar más de %d ref" msgstr[1] "ignorando %s; no se puede manejar más de %d refs" -#: builtin/show-branch.c:548 +#: builtin/show-branch.c:547 #, c-format msgid "no matching refs with %s" msgstr "no hay refs que concuerden con %s" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:644 msgid "show remote-tracking and local branches" msgstr "mostrar ramas locales y de rastreo remoto" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:646 msgid "show remote-tracking branches" msgstr "mostrar ramas de rastreo remoto" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:648 msgid "color '*!+-' corresponding to the branch" msgstr "colorear '*!+-' correspondiendo a la rama" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "show <n> more commits after the common ancestor" msgstr "mostrar <n> commits más tras encontrar el ancestro común" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "synonym to more=-1" msgstr "sinónimo de más=-1" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "suppress naming strings" msgstr "suprimir strings de nombre" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "include the current branch" msgstr "incluir la rama actual" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "name commits with their object names" msgstr "nombrar commits con sus nombres de objeto" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:659 msgid "show possible merge bases" msgstr "mostrar bases de fusión posibles" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "show refs unreachable from any other ref" msgstr "mostrar refs inalcanzables por ningún otro ref" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "show commits in topological order" msgstr "mostrar commits en orden topológico" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show only commits not on the first branch" msgstr "mostrar solo commits que no estén en la primera rama" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show merges reachable from only one tip" msgstr "mostrar fusiones alcanzables por solo una punta" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c:670 msgid "topologically sort, maintaining date order where possible" msgstr "orden topológico, manteniendo el orden de fechas donde sea posible" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base" -#: builtin/show-branch.c:711 +#: builtin/show-branch.c:710 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog no es compatible con --all, --remotes, --independent o --merge-base" -#: builtin/show-branch.c:735 +#: builtin/show-branch.c:734 msgid "no branches given, and HEAD is not valid" msgstr "no se dieron ramas, y el HEAD no es válido" -#: builtin/show-branch.c:738 +#: builtin/show-branch.c:737 msgid "--reflog option needs one branch name" msgstr "opción --reflog necesita un nombre de rama" -#: builtin/show-branch.c:741 +#: builtin/show-branch.c:740 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "solo %d entrada puede ser mostrada a la vez." msgstr[1] "solo %d entradas pueden ser mostradas a la vez." -#: builtin/show-branch.c:745 +#: builtin/show-branch.c:744 #, c-format msgid "no such ref %s" msgstr "no existe el ref %s" -#: builtin/show-branch.c:831 +#: builtin/show-branch.c:828 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "no se puede manejar más de %d rev." msgstr[1] "no se puede manejar más de %d revs." -#: builtin/show-branch.c:835 +#: builtin/show-branch.c:832 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' no es una ref válida." -#: builtin/show-branch.c:838 +#: builtin/show-branch.c:835 #, c-format msgid "cannot find commit %s (%s)" msgstr "no se puede encontrar el commit %s (%s)" @@ -22246,72 +22461,86 @@ msgstr "" "este árbol de trabajo no es sparse (archivo sparse-checkout tal vez no " "existe)" -#: builtin/sparse-checkout.c:227 +#: builtin/sparse-checkout.c:173 +#, c-format +msgid "" +"directory '%s' contains untracked files, but is not in the sparse-checkout " +"cone" +msgstr "" +"directorio '%s' contiene archivos no rastreados, pero no está en el cono de " +"sparse-checkout" + +#: builtin/sparse-checkout.c:181 +#, c-format +msgid "failed to remove directory '%s'" +msgstr "falló al borrar directorio '%s'" + +#: builtin/sparse-checkout.c:321 msgid "failed to create directory for sparse-checkout file" msgstr "falló al crear directorio para el archivo sparse-checkout" -#: builtin/sparse-checkout.c:268 +#: builtin/sparse-checkout.c:362 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" "no es posible actualizar el formato de repositorio para habilitar " "worktreeConfig" -#: builtin/sparse-checkout.c:270 +#: builtin/sparse-checkout.c:364 msgid "failed to set extensions.worktreeConfig setting" msgstr "falló al configurar opción extensions.worktreeConfig" -#: builtin/sparse-checkout.c:290 +#: builtin/sparse-checkout.c:384 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:310 +#: builtin/sparse-checkout.c:404 msgid "initialize the sparse-checkout in cone mode" msgstr "inicializa el sparse-checkout en modo cono" -#: builtin/sparse-checkout.c:312 +#: builtin/sparse-checkout.c:406 msgid "toggle the use of a sparse index" msgstr "activar el uso de un índice sparse" -#: builtin/sparse-checkout.c:340 +#: builtin/sparse-checkout.c:434 msgid "failed to modify sparse-index config" msgstr "falló al modificar la configuración del índice sparse" -#: builtin/sparse-checkout.c:361 +#: builtin/sparse-checkout.c:455 #, c-format msgid "failed to open '%s'" msgstr "falló al abrir '%s'" -#: builtin/sparse-checkout.c:413 +#: builtin/sparse-checkout.c:507 #, c-format msgid "could not normalize path %s" msgstr "no se pudo normalizar la ruta %s" -#: builtin/sparse-checkout.c:425 +#: builtin/sparse-checkout.c:519 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" -#: builtin/sparse-checkout.c:450 +#: builtin/sparse-checkout.c:544 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "no es posible dequote la cadena de estilo C '%s'" -#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 +#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622 msgid "unable to load existing sparse-checkout patterns" msgstr "no se pudo cargar patrones de sparse-checkout existentes" -#: builtin/sparse-checkout.c:573 +#: builtin/sparse-checkout.c:667 msgid "read patterns from standard in" msgstr "leer patrones de standard in" -#: builtin/sparse-checkout.c:588 +#: builtin/sparse-checkout.c:682 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:607 +#: builtin/sparse-checkout.c:701 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:638 +#: builtin/sparse-checkout.c:732 msgid "error while refreshing working directory" msgstr "error al refrescar directorio de trabajo" @@ -22347,7 +22576,7 @@ msgstr "" " [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" -#: builtin/stash.c:34 builtin/stash.c:87 +#: builtin/stash.c:34 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -22377,6 +22606,14 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" " [--] [<pathspec>...]]" +#: builtin/stash.c:87 +msgid "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<message>]" +msgstr "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<mensaje>]" + #: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" @@ -22400,7 +22637,7 @@ msgstr "%s no es una referencia válida" msgid "git stash clear with arguments is unimplemented" msgstr "git stash clear con argumentos no está implementado" -#: builtin/stash.c:431 +#: builtin/stash.c:447 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -22412,172 +22649,172 @@ msgstr "" " %s ->%s\n" " Para hacer espacio.\n" -#: builtin/stash.c:492 +#: builtin/stash.c:508 msgid "cannot apply a stash in the middle of a merge" msgstr "no se puede aplicar un stash en medio de un merge" -#: builtin/stash.c:503 +#: builtin/stash.c:519 #, c-format msgid "could not generate diff %s^!." msgstr "¡no se pudo generar diff %s^!." -#: builtin/stash.c:510 +#: builtin/stash.c:526 msgid "conflicts in index. Try without --index." -msgstr "conflictos en índice. Intente sin --index." +msgstr "conflictos en índice. Intenta sin --index." -#: builtin/stash.c:516 +#: builtin/stash.c:532 msgid "could not save index tree" msgstr "no se pudo guardar el árbol de índice" -#: builtin/stash.c:525 -msgid "could not restore untracked files from stash" -msgstr "no se pudo restaurar archivos no rastreados de la entrada stash" - -#: builtin/stash.c:539 +#: builtin/stash.c:552 #, c-format msgid "Merging %s with %s" msgstr "Fusionando %s con %s" -#: builtin/stash.c:549 +#: builtin/stash.c:562 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: builtin/stash.c:591 builtin/stash.c:689 +#: builtin/stash.c:575 +msgid "could not restore untracked files from stash" +msgstr "no se pudo restaurar archivos no rastreados de la entrada stash" + +#: builtin/stash.c:607 builtin/stash.c:705 msgid "attempt to recreate the index" msgstr "intento de recrear el índice" -#: builtin/stash.c:635 +#: builtin/stash.c:651 #, c-format msgid "Dropped %s (%s)" msgstr "Descartado %s (%s)" -#: builtin/stash.c:638 +#: builtin/stash.c:654 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: No se pudo borrar entrada stash" -#: builtin/stash.c:651 +#: builtin/stash.c:667 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' no es una referencia stash" -#: builtin/stash.c:701 +#: builtin/stash.c:717 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:724 +#: builtin/stash.c:740 msgid "No branch name specified" msgstr "No se especificó el nombre de la rama" -#: builtin/stash.c:808 +#: builtin/stash.c:824 msgid "failed to parse tree" msgstr "falló al analizar el árbol" -#: builtin/stash.c:819 +#: builtin/stash.c:835 msgid "failed to unpack trees" msgstr "falló al desempaquetar árboles" -#: builtin/stash.c:839 +#: builtin/stash.c:855 msgid "include untracked files in the stash" msgstr "incluir archivos no rastreados en el stash" -#: builtin/stash.c:842 +#: builtin/stash.c:858 msgid "only show untracked files in the stash" msgstr "solo mostrar archivos no rastreados en el stash" -#: builtin/stash.c:929 builtin/stash.c:966 +#: builtin/stash.c:945 builtin/stash.c:982 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:957 +#: builtin/stash.c:973 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1171 +#: builtin/stash.c:1187 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1271 +#: builtin/stash.c:1287 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial" -#: builtin/stash.c:1298 +#: builtin/stash.c:1314 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: builtin/stash.c:1307 +#: builtin/stash.c:1323 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1318 builtin/stash.c:1327 +#: builtin/stash.c:1334 builtin/stash.c:1343 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: builtin/stash.c:1355 +#: builtin/stash.c:1371 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: builtin/stash.c:1404 +#: builtin/stash.c:1420 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: builtin/stash.c:1422 +#: builtin/stash.c:1438 msgid "Did you forget to 'git add'?" msgstr "¿Olvidaste 'git add'?" -#: builtin/stash.c:1437 +#: builtin/stash.c:1453 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1444 +#: builtin/stash.c:1460 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1459 +#: builtin/stash.c:1475 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1464 +#: builtin/stash.c:1480 #, c-format msgid "Saved working directory and index state %s" msgstr "Directorio de trabajo y estado de índice %s guardados" -#: builtin/stash.c:1554 +#: builtin/stash.c:1571 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del árbol de trabajo" -#: builtin/stash.c:1593 builtin/stash.c:1658 +#: builtin/stash.c:1610 builtin/stash.c:1675 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1595 builtin/stash.c:1660 +#: builtin/stash.c:1612 builtin/stash.c:1677 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1596 builtin/stash.c:1661 +#: builtin/stash.c:1613 builtin/stash.c:1678 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1598 builtin/stash.c:1663 +#: builtin/stash.c:1615 builtin/stash.c:1680 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1617 builtin/stash.c:1682 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1700 +#: builtin/stash.c:1717 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" "¡el soporte para stash.useBuiltin ha sido eliminado!\n" -"Vea su entrada en 'git help config' para detalles." +"Mira su entrada en 'git help config' para detalles." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -22596,7 +22833,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" @@ -22610,27 +22847,35 @@ msgstr "submodule--helper print-default-remote no toma argumentos" msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 -#: builtin/submodule--helper.c:2891 +#: builtin/submodule--helper.c:211 +#, c-format +msgid "" +"could not look up configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" +"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " +"su propio upstream autoritario." + +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:416 +#: builtin/submodule--helper.c:410 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:654 +#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:628 #, 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:526 +#: builtin/submodule--helper.c:520 #, c-format msgid "Entering '%s'\n" msgstr "Entrando '%s'\n" -#: builtin/submodule--helper.c:529 +#: builtin/submodule--helper.c:523 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22639,7 +22884,7 @@ msgstr "" "run_command devolvió estado no cero para %s\n" "." -#: builtin/submodule--helper.c:551 +#: builtin/submodule--helper.c:545 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22650,79 +22895,70 @@ msgstr "" "anidados de %s\n" "." -#: builtin/submodule--helper.c:567 +#: builtin/submodule--helper.c:561 msgid "suppress output of entering each submodule command" msgstr "suprime la salida de inicializar cada comando de submódulo" -#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 -#: builtin/submodule--helper.c:1489 +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864 +#: builtin/submodule--helper.c:1453 msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -#: builtin/submodule--helper.c:574 +#: builtin/submodule--helper.c:568 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:601 -#, c-format -msgid "" -"could not look up configuration '%s'. Assuming this repository is its own " -"authoritative upstream." -msgstr "" -"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " -"su propio upstream autoritativo." - -#: builtin/submodule--helper.c:668 +#: builtin/submodule--helper.c:642 #, 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:672 +#: builtin/submodule--helper.c:646 #, 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:682 +#: builtin/submodule--helper.c:656 #, 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:689 +#: builtin/submodule--helper.c:663 #, 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:711 +#: builtin/submodule--helper.c:685 msgid "suppress output for initializing a submodule" msgstr "suprime la salida de inicializar un submódulo" -#: builtin/submodule--helper.c:716 +#: builtin/submodule--helper.c:690 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:811 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no se pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 +#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589 msgid "suppress submodule status output" msgstr "suprimir salida del estado del submódulo" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:863 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22730,109 +22966,109 @@ msgstr "" "usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:869 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:893 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:991 +#: builtin/submodule--helper.c:965 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:994 +#: builtin/submodule--helper.c:968 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:981 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1057 +#: builtin/submodule--helper.c:1031 #, c-format msgid "couldn't hash object from '%s'" msgstr "no se pudo realizar hash del objeto '%s'" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1035 #, c-format msgid "unexpected mode %o\n" msgstr "modo %o inesperado\n" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1276 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "" "usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1278 msgid "compare the commit in the index with that in the submodule HEAD" msgstr "" "usar el commit guardado en el índice para comparar con el guardado en el " "submódulo HEAD" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1280 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'" -#: builtin/submodule--helper.c:1308 +#: builtin/submodule--helper.c:1282 msgid "limit the summary size" msgstr "limitar el tamaño de resumen" -#: builtin/submodule--helper.c:1313 +#: builtin/submodule--helper.c:1287 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -#: builtin/submodule--helper.c:1337 +#: builtin/submodule--helper.c:1311 msgid "could not fetch a revision for HEAD" msgstr "no se puede obtener la revisión para HEAD" -#: builtin/submodule--helper.c:1342 +#: builtin/submodule--helper.c:1316 msgid "--cached and --files are mutually exclusive" msgstr "--cached y --files son mutuamente exclusivos" -#: builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1373 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:1415 +#: builtin/submodule--helper.c:1379 #, 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:1429 +#: builtin/submodule--helper.c:1393 #, 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:1440 +#: builtin/submodule--helper.c:1404 #, 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:1487 +#: builtin/submodule--helper.c:1451 msgid "suppress output of synchronizing submodule url" msgstr "suprime la salida de sincronizar el url del submódulo" -#: builtin/submodule--helper.c:1494 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1548 +#: builtin/submodule--helper.c:1512 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -"El árbol de trabajo de submódulo '%s' contiene un directorio .git (use 'rm -" +"El árbol de trabajo de submódulo '%s' contiene un directorio .git (usa 'rm -" "rf' si realmente quieres eliminarlo incluyendo todo en su historia)" -#: builtin/submodule--helper.c:1560 +#: builtin/submodule--helper.c:1524 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22841,46 +23077,46 @@ msgstr "" "El árbol de trabajo de submódulo '%s' contiene modificaciones locales; usa '-" "f' para descartarlas" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1532 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1570 +#: builtin/submodule--helper.c:1534 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No se pudo eliminar el árbol de trabajo de submódulo '%s'\n" -#: builtin/submodule--helper.c:1581 +#: builtin/submodule--helper.c:1545 #, 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:1597 +#: builtin/submodule--helper.c:1561 #, 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:1626 +#: builtin/submodule--helper.c:1590 msgid "remove submodule working trees even if they contain local changes" msgstr "" "quitar árboles de trabajo de submódulos incluso si contienen cambios locales" -#: builtin/submodule--helper.c:1627 +#: builtin/submodule--helper.c:1591 msgid "unregister all submodules" msgstr "quitar todos los submódulos" -#: builtin/submodule--helper.c:1632 +#: builtin/submodule--helper.c:1596 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1646 +#: builtin/submodule--helper.c:1610 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' si realmente quieres desinicializar todos los submódulos" -#: builtin/submodule--helper.c:1690 +#: builtin/submodule--helper.c:1655 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" @@ -22889,72 +23125,72 @@ msgid "" 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 " +"Para permitir que Git clone sin una alternativa en ese caso, establece\n" +"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clona " "con\n" "'--reference-if-able' en lugar de '--reference'." -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1768 +#: builtin/submodule--helper.c:1739 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1775 +#: builtin/submodule--helper.c:1746 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1800 +#: builtin/submodule--helper.c:1771 #, 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:1841 +#: builtin/submodule--helper.c:1812 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clonación de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:1846 +#: builtin/submodule--helper.c:1817 #, c-format msgid "directory not empty: '%s'" msgstr "directorio no está vacío: '%s'" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1829 #, 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:1890 builtin/submodule--helper.c:2894 +#: builtin/submodule--helper.c:1861 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 +#: builtin/submodule--helper.c:1864 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 +#: builtin/submodule--helper.c:1867 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 -#: builtin/submodule--helper.c:2909 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525 +#: builtin/submodule--helper.c:3257 msgid "force cloning progress" msgstr "forzar el proceso de clonación" -#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 +#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527 msgid "disallow cloning into non-empty directory" msgstr "no permitir clonar en directorios no vacíos" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1887 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22964,83 +23200,182 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" "url <url> --path <ruta>" -#: builtin/submodule--helper.c:1953 +#: builtin/submodule--helper.c:1924 #, 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:1957 +#: builtin/submodule--helper.c:1928 #, 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:2058 +#: builtin/submodule--helper.c:2043 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:2062 +#: builtin/submodule--helper.c:2047 msgid "Maybe you want to use 'update --init'?" msgstr "¿Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:2092 +#: builtin/submodule--helper.c:2077 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:2121 +#: builtin/submodule--helper.c:2106 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:2271 +#: builtin/submodule--helper.c:2256 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:2282 +#: builtin/submodule--helper.c:2267 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 +#: builtin/submodule--helper.c:2372 +#, c-format +msgid "Unable to checkout '%s' in submodule path '%s'" +msgstr "No es posible revisar '%s' en la ruta de submódulo '%s'" + +#: builtin/submodule--helper.c:2376 +#, c-format +msgid "Unable to rebase '%s' in submodule path '%s'" +msgstr "No es posible ejecutar rebase a '%s' en la ruta de submódulo '%s'" + +#: builtin/submodule--helper.c:2380 +#, c-format +msgid "Unable to merge '%s' in submodule path '%s'" +msgstr "Incapaz de fusionar '%s' en la ruta del submódulo '%s'" + +#: builtin/submodule--helper.c:2384 +#, c-format +msgid "Execution of '%s %s' failed in submodule path '%s'" +msgstr "Falló la ejecución de '%s %s' en la ruta de submódulo '%s'" + +#: builtin/submodule--helper.c:2408 +#, c-format +msgid "Submodule path '%s': checked out '%s'\n" +msgstr "Ruta de submódulo '%s': check out realizado a '%s'\n" + +#: builtin/submodule--helper.c:2412 +#, c-format +msgid "Submodule path '%s': rebased into '%s'\n" +msgstr "Ruta de submódulo '%s': rebasado a '%s'\n" + +#: builtin/submodule--helper.c:2416 +#, c-format +msgid "Submodule path '%s': merged in '%s'\n" +msgstr "Ruta de submódulo '%s': fusionado en '%s'\n" + +#: builtin/submodule--helper.c:2420 +#, c-format +msgid "Submodule path '%s': '%s %s'\n" +msgstr "Ruta de submódulo '%s': '%s %s'\n" + +#: builtin/submodule--helper.c:2444 +#, c-format +msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" +msgstr "" +"No es posible realizar fetch en la ruta de submódulo '%s'; intentando hacer " +"un fetch directo de %s:" + +#: builtin/submodule--helper.c:2453 +#, c-format +msgid "" +"Fetched in submodule path '%s', but it did not contain %s. Direct fetching " +"of that commit failed." +msgstr "" +"Fetch realizado en la ruta de submódulo '%s', pero no contenía %s. Fetch " +"directo del commit falló." + +#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2812 msgid "path into the working tree" msgstr "ruta al árbol de trabajo" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579 msgid "path into the working tree, across nested submodule boundaries" msgstr "ruta al árbol de trabajo, a través de fronteras de submódulos anidados" -#: builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2517 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "crea un clon superficial truncado al número especificado de revisiones" -#: builtin/submodule--helper.c:2360 +#: builtin/submodule--helper.c:2520 msgid "parallel jobs" msgstr "tareas paralelas" -#: builtin/submodule--helper.c:2362 +#: builtin/submodule--helper.c:2522 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación de superficialidad" -#: builtin/submodule--helper.c:2363 +#: builtin/submodule--helper.c:2523 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonación" -#: builtin/submodule--helper.c:2374 +#: builtin/submodule--helper.c:2534 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:2387 +#: builtin/submodule--helper.c:2547 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:2435 +#: builtin/submodule--helper.c:2565 +msgid "suppress output for update by rebase or merge" +msgstr "suprime la salida para actualización por rebase o fusión" + +#: builtin/submodule--helper.c:2566 +msgid "force checkout updates" +msgstr "forzar actualizaciones de checkout" + +#: builtin/submodule--helper.c:2568 +msgid "don't fetch new objects from the remote site" +msgstr "no recuperar objetos nuevos del sitio remoto" + +#: builtin/submodule--helper.c:2570 +msgid "overrides update mode in case the repository is a fresh clone" +msgstr "" +"sobreescribe el modo de actualización en caso de que el respositorio sea un " +"clon fresco" + +#: builtin/submodule--helper.c:2571 +msgid "depth for shallow fetch" +msgstr "profundidad para recuperación superficial" + +#: builtin/submodule--helper.c:2581 +msgid "sha1" +msgstr "sha1" + +#: builtin/submodule--helper.c:2582 +msgid "SHA1 expected by superproject" +msgstr "SHA1 esperado para superproyecto" + +#: builtin/submodule--helper.c:2584 +msgid "subsha1" +msgstr "subsha1" + +#: builtin/submodule--helper.c:2585 +msgid "SHA1 of submodule's HEAD" +msgstr "SHA1 del submódulo de HEAD" + +#: builtin/submodule--helper.c:2591 +msgid "git submodule--helper run-update-procedure [<options>] <path>" +msgstr "git submodule--helper run-update-procedure [<options>] <path>" + +#: builtin/submodule--helper.c:2662 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -23049,144 +23384,194 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " "el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2558 +#: builtin/submodule--helper.c:2780 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no se pudo conseguir un handle de repositorio para el submódulo '%s'" -#: builtin/submodule--helper.c:2591 +#: builtin/submodule--helper.c:2813 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2597 +#: builtin/submodule--helper.c:2819 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2653 +#: builtin/submodule--helper.c:2875 msgid "check if it is safe to write to the .gitmodules file" msgstr "revisar si es seguro escribir al archivo .gitmodules" -#: builtin/submodule--helper.c:2656 +#: builtin/submodule--helper.c:2878 msgid "unset the config in the .gitmodules file" -msgstr "desconfigura la opción en el archivo .gitmodules" +msgstr "desconfigurar la opción en el archivo .gitmodules" -#: builtin/submodule--helper.c:2661 +#: builtin/submodule--helper.c:2883 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2662 +#: builtin/submodule--helper.c:2884 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2663 +#: builtin/submodule--helper.c:2885 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2682 git-submodule.sh:150 -#, sh-format +#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120 +#: builtin/submodule--helper.c:3276 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:2698 +#: builtin/submodule--helper.c:2920 msgid "suppress output for setting url of a submodule" msgstr "suprime la salida de inicializar la url de un submódulo" -#: builtin/submodule--helper.c:2702 +#: builtin/submodule--helper.c:2924 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2957 msgid "set the default tracking branch to master" msgstr "configurar la rama de rastreo por defecto a master" -#: builtin/submodule--helper.c:2737 +#: builtin/submodule--helper.c:2959 msgid "set the default tracking branch" msgstr "configurar la rama de rastreo por defecto" -#: builtin/submodule--helper.c:2741 +#: builtin/submodule--helper.c:2963 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>" -#: builtin/submodule--helper.c:2742 +#: builtin/submodule--helper.c:2964 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>" -#: builtin/submodule--helper.c:2749 +#: builtin/submodule--helper.c:2971 msgid "--branch or --default required" msgstr "--branch o --default requerido" -#: builtin/submodule--helper.c:2752 +#: builtin/submodule--helper.c:2974 msgid "--branch and --default are mutually exclusive" msgstr "--branch y --default son mutuamente exclusivos" -#: builtin/submodule--helper.c:2815 +#: builtin/submodule--helper.c:3037 #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "Agregando el repositorio existente en '%s' al índice\n" -#: builtin/submodule--helper.c:2818 +#: builtin/submodule--helper.c:3040 #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "'%s' ya existe y no es un repositorio git válido" -#: builtin/submodule--helper.c:2828 +#: builtin/submodule--helper.c:3053 #, c-format -msgid "A git directory for '%s' is found locally with remote(s):" +msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "" -"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):" +"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):\n" -#: builtin/submodule--helper.c:2833 +#: builtin/submodule--helper.c:3060 #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" " %s\n" "use the '--force' option. If the local git directory is not the correct " "repo\n" -"or if you are unsure what this means, choose another name with the '--name' " -"option.\n" +"or you are unsure what this means choose another name with the '--name' " +"option." msgstr "" -"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n" +"Si quieres reusar este directorio git local en lugar de clonar nuevamente " +"de\n" " %s\n" "usa la opción '--force'. Si el directorio git local no es el repositorio " "correcto\n" "o no estás seguro de lo que esto significa, escoge otro nombre con la opción " -"'--name'.\n" +"'--name'." -#: builtin/submodule--helper.c:2842 +#: builtin/submodule--helper.c:3072 #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "Reactivando directorio git local para el submódulo '%s'.\n" -#: builtin/submodule--helper.c:2875 +#: builtin/submodule--helper.c:3109 #, c-format msgid "unable to checkout submodule '%s'" msgstr "no es posible hacer checkout al submódulo '%s'" -#: builtin/submodule--helper.c:2888 -msgid "branch of repository to checkout on cloning" -msgstr "la rama del repositorio para hacer checkout durante clonado" +#: builtin/submodule--helper.c:3148 +#, c-format +msgid "Failed to add submodule '%s'" +msgstr "Falló al agregar el submódulo '%s'" + +#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157 +#: builtin/submodule--helper.c:3165 +#, c-format +msgid "Failed to register submodule '%s'" +msgstr "Falló al registrar el submódulo '%s'" + +#: builtin/submodule--helper.c:3221 +#, c-format +msgid "'%s' already exists in the index" +msgstr "'%s' ya existe en el índice" + +#: builtin/submodule--helper.c:3224 +#, c-format +msgid "'%s' already exists in the index and is not a submodule" +msgstr "'%s' ya existe en el índice y no es un submódulo" + +#: builtin/submodule--helper.c:3253 +msgid "branch of repository to add as submodule" +msgstr "rama del repositorio para agregar como submódulo" -#: builtin/submodule--helper.c:2910 +#: builtin/submodule--helper.c:3254 msgid "allow adding an otherwise ignored submodule path" -msgstr "permitir agregar una ruta de submódulo sino ignorada" +msgstr "permitir agregar una ruta de submódulo que de otro modo se ignora" -#: builtin/submodule--helper.c:2917 +#: builtin/submodule--helper.c:3256 +msgid "print only error messages" +msgstr "mostrar solo mensajes de error" + +#: builtin/submodule--helper.c:3260 +msgid "borrow the objects from reference repositories" +msgstr "prestar los objetos de los repositorios de referencia" + +#: builtin/submodule--helper.c:3262 msgid "" -"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" -"name <name>" +"sets the submodule’s name to the given string instead of defaulting to its " +"path" +msgstr "" +"configura el nombre del submódulo para el string dado en lugar de ir a la " +"ruta por defecto" + +#: builtin/submodule--helper.c:3269 +msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" +msgstr "git submodule--helper add [<options>] [--] <repository> [<path>]" + +#: builtin/submodule--helper.c:3297 +msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -"git submodule--helper add-clone [<options>...] --url <url> --path <ruta> --" -"name <nombre>" +"La ruta relativa solo se puede usar desde el nivel superior del árbol de " +"trabajo" + +#: builtin/submodule--helper.c:3305 +#, c-format +msgid "repo URL: '%s' must be absolute or begin with ./|../" +msgstr "repo URL: '%s' debe ser absoluta o iniciar con ./|../" + +#: builtin/submodule--helper.c:3340 +#, c-format +msgid "'%s' is not a valid submodule name" +msgstr "'%s' no es un nombre de submódulo válido" -#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 +#: builtin/submodule--helper.c:3404 git.c:449 git.c:723 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2991 +#: builtin/submodule--helper.c:3410 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper válido" @@ -23211,21 +23596,21 @@ msgstr "eliminar referencia simbólica" msgid "shorten ref output" msgstr "salida de referencia más corta" -#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505 msgid "reason" msgstr "razón" -#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505 msgid "reason of the update" msgstr "razón de la actualización" #: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -"\t\t<tagname> [<head>]" +" <tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <archivo>]\n" -"\t\t<nombre-tag> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +" <tagname> [<head>]" #: builtin/tag.c:27 msgid "git tag -d <tagname>..." @@ -23235,13 +23620,13 @@ msgstr "git tag -d <nombre-de-tag>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " "[<pattern>...]" msgstr "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <objeto>]\n" -"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] " -"[<patrón>...]" +"points-at <object>]\n" +" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -23306,130 +23691,130 @@ msgstr "" msgid "bad object type." msgstr "tipo de objeto erróneo." -#: builtin/tag.c:328 +#: builtin/tag.c:326 msgid "no tag message?" msgstr "¿sin mensaje de tag?" -#: builtin/tag.c:335 +#: builtin/tag.c:333 #, c-format msgid "The tag message has been left in %s\n" msgstr "El mensaje del tag ha sido dejado en %s\n" -#: builtin/tag.c:446 +#: builtin/tag.c:444 msgid "list tag names" msgstr "listar nombres de tags" -#: builtin/tag.c:448 +#: builtin/tag.c:446 msgid "print <n> lines of each tag message" msgstr "imprimir <n> líneas de cada mensaje de tag" -#: builtin/tag.c:450 +#: builtin/tag.c:448 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:453 +#: builtin/tag.c:451 msgid "Tag creation options" msgstr "Opciones de creación de tags" -#: builtin/tag.c:455 +#: builtin/tag.c:453 msgid "annotated tag, needs a message" msgstr "tags anotadas necesitan un mensaje" -#: builtin/tag.c:457 +#: builtin/tag.c:455 msgid "tag message" msgstr "mensaje de tag" -#: builtin/tag.c:459 +#: builtin/tag.c:457 msgid "force edit of tag message" msgstr "forzar la edición del mensaje de tag" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "tag anotado y firmado con GPG" -#: builtin/tag.c:463 +#: builtin/tag.c:461 msgid "use another key to sign the tag" msgstr "usar otra clave para firmar el tag" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "replace the tag if exists" msgstr "remplazar tag si existe" -#: builtin/tag.c:465 builtin/update-ref.c:505 +#: builtin/tag.c:463 builtin/update-ref.c:511 msgid "create a reflog" msgstr "crear un reflog" -#: builtin/tag.c:467 +#: builtin/tag.c:465 msgid "Tag listing options" msgstr "Opciones de listado de tag" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "show tag list in columns" msgstr "mostrar lista de tags en columnas" -#: builtin/tag.c:469 builtin/tag.c:471 +#: builtin/tag.c:467 builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "mostrar solo tags que contengan el commit" -#: builtin/tag.c:470 builtin/tag.c:472 +#: builtin/tag.c:468 builtin/tag.c:470 msgid "print only tags that don't contain the commit" msgstr "mostrar solo tags que no contengan el commit" -#: builtin/tag.c:473 +#: builtin/tag.c:471 msgid "print only tags that are merged" msgstr "solo imprimir las tags que estén fusionadas" -#: builtin/tag.c:474 +#: builtin/tag.c:472 msgid "print only tags that are not merged" msgstr "solo imprimir las tags que no estén fusionadas" -#: builtin/tag.c:478 +#: builtin/tag.c:476 msgid "print only tags of the object" msgstr "solo imprimir tags del objeto" -#: builtin/tag.c:526 +#: builtin/tag.c:525 msgid "--column and -n are incompatible" msgstr "--column y -n son incompatibles" -#: builtin/tag.c:548 +#: builtin/tag.c:546 msgid "-n option is only allowed in list mode" msgstr "opción -n solo es permitida en modo lista" -#: builtin/tag.c:550 +#: builtin/tag.c:548 msgid "--contains option is only allowed in list mode" msgstr "opción --contains solo es permitido en modo lista" -#: builtin/tag.c:552 +#: builtin/tag.c:550 msgid "--no-contains option is only allowed in list mode" msgstr "opción --no-contains solo es permitida en modo lista" -#: builtin/tag.c:554 +#: builtin/tag.c:552 msgid "--points-at option is only allowed in list mode" msgstr "opción --points-at solo es permitida en modo lista" -#: builtin/tag.c:556 +#: builtin/tag.c:554 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" -#: builtin/tag.c:567 +#: builtin/tag.c:568 msgid "only one -F or -m option is allowed." msgstr "solo se permite una de las opciones, -m o -F." -#: builtin/tag.c:592 +#: builtin/tag.c:593 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no es un nombre de tag válido." -#: builtin/tag.c:597 +#: builtin/tag.c:598 #, c-format msgid "tag '%s' already exists" msgstr "el tag '%s' ya existe" -#: builtin/tag.c:628 +#: builtin/tag.c:629 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" @@ -23443,202 +23828,197 @@ msgstr "Desempaquetando objetos" msgid "failed to create directory %s" msgstr "falló al crear directorio %s" -#: builtin/update-index.c:100 -#, c-format -msgid "failed to create file %s" -msgstr "falló al crear el archivo %s" - -#: builtin/update-index.c:108 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "falló al eliminar el archivo %s" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "falló al eliminar directorio %s" -#: builtin/update-index.c:140 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Probando mtime en '%s' " -#: builtin/update-index.c:154 +#: builtin/update-index.c:152 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:167 +#: builtin/update-index.c:165 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:180 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "info de estado del directorio cambia tras actualizar un archivo" -#: builtin/update-index.c:191 +#: builtin/update-index.c:189 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:202 +#: builtin/update-index.c:200 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:215 +#: builtin/update-index.c:213 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:222 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opciones>] [--] [<archivo>...]" -#: builtin/update-index.c:976 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "continuar refresh (refrescamiento) incluso cuando el índice necesita " "actualización" -#: builtin/update-index.c:979 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "refresh: ignora submódulos" -#: builtin/update-index.c:982 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "no ignorar archivos nuevos" -#: builtin/update-index.c:984 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "permitir que archivos remplacen directorios y viceversa" -#: builtin/update-index.c:986 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "avisar de archivos faltando del árbol de trabajo" -#: builtin/update-index.c:988 +#: 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:991 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "refrescar información de estado" -#: builtin/update-index.c:995 +#: 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:999 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<ruta>" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "agregar la entrada especificada al índice" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "marcar archivos como \"not changing\"" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "limpiar bit assumed-unchanged" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "marcar archivos como \"index-only\"" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "limpiar bit skip-worktree" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1020 msgid "do not touch index-only entries" msgstr "no tocar entradas index-only" -#: builtin/update-index.c:1024 +#: 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:1026 +#: 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:1028 +#: 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:1030 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "leer la lista de rutas que actualizar desde standard input" -#: builtin/update-index.c:1034 +#: 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:1038 +#: 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:1042 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "solo actualizar entradas que difieran de HEAD" -#: builtin/update-index.c:1046 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignorar archivos faltantes en el árbol de trabajo" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "reportar acciones por standard output" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(para porcelanas) olvidar conflictos guardados sin resolución" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "escribir índice en este formato" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "activar o desactivar índice dividido" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "habilitar o deshabilitar caché no rastreado" -#: builtin/update-index.c:1061 +#: 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:1063 +#: 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:1065 +#: 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:1067 +#: 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:1069 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "marcar archivos como válidos para fsmonitor" -#: builtin/update-index.c:1072 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" -msgstr "limpia el bit de validación fsmonitor" +msgstr "limpiar el bit de validación fsmonitor" -#: builtin/update-index.c:1175 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -23646,7 +24026,7 @@ msgstr "" "core.splitIndex está configurado en false; quítalo o cámbialo, si realmente " "quieres habilitar el índice partido" -#: builtin/update-index.c:1184 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -23654,7 +24034,7 @@ msgstr "" "core.splitIndex está configurado en true; quítalo o cámbialo, si realmente " "quieres deshabilitar el índice partido" -#: builtin/update-index.c:1196 +#: 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" @@ -23662,11 +24042,11 @@ msgstr "" "core.untrackedCache está configurado en true; quítalo o cámbialo, si " "realmente quieres deshabilitar el chaché no rastreado" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Caché no rastreado deshabilitado" -#: builtin/update-index.c:1208 +#: 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" @@ -23674,29 +24054,29 @@ msgstr "" "core.untrackedCache está configurado en false; quítalo o cámbialo, si " "realmente quieres habilitar el caché no rastreado" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Caché no rastreado habilitado para '%s'" -#: builtin/update-index.c:1220 +#: 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:1224 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor activado" -#: builtin/update-index.c:1227 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor está configurado; quítalo si realmente quieres deshabilitar " "el fsmonitor" -#: builtin/update-index.c:1231 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor desactivado" @@ -23714,21 +24094,21 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opciones>] --stdin [-z]" -#: builtin/update-ref.c:500 +#: builtin/update-ref.c:506 msgid "delete the reference" msgstr "eliminar la referencia" -#: builtin/update-ref.c:502 +#: builtin/update-ref.c:508 msgid "update <refname> not the one it points to" -msgstr "actualiza <refname> no la a que apunta" +msgstr "actualizar <refname> no la a que apunta" -#: builtin/update-ref.c:503 +#: builtin/update-ref.c:509 msgid "stdin has NUL-terminated arguments" msgstr "stdin tiene argumentos terminados en NUL" -#: builtin/update-ref.c:504 +#: builtin/update-ref.c:510 msgid "read updates from stdin" -msgstr "lee actualizaciones de stdin" +msgstr "leer actualizaciones de stdin" #: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" @@ -23736,25 +24116,25 @@ msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:15 msgid "update the info files from scratch" -msgstr "actualiza los archivos info desde cero" +msgstr "actualizar los archivos info desde cero" #: builtin/upload-pack.c:11 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opciones>] <directorio>" -#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17 msgid "quit after a single request/response exchange" -msgstr "sale después de un solo intercambio petición/respuesta" +msgstr "salir después de un solo intercambio petición/respuesta" -#: builtin/upload-pack.c:25 -msgid "exit immediately after initial ref advertisement" -msgstr "salir inmediatamente tras el anuncio inicial de ref" +#: builtin/upload-pack.c:26 +msgid "serve up the info/refs for git-http-backend" +msgstr "servir los info/refs para git-http-backend" -#: builtin/upload-pack.c:27 +#: builtin/upload-pack.c:29 msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" +msgstr "no probar <directorio>/.git/ si <directorio> no es un directorio Git" -#: builtin/upload-pack.c:29 +#: builtin/upload-pack.c:31 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrumpir transferencia tras <n> segundos de inactividad" @@ -23768,7 +24148,7 @@ msgstr "imprimir contenido del commit" #: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" -msgstr "muestra la salida de status gpg en formato raw" +msgstr "mostrar la salida de status gpg en formato raw" #: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." @@ -23790,63 +24170,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir contenido del tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree list [<options>]" msgstr "git worktree list [<opciones>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <worktree> <nueva-ruta>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opciones>] <worktree>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:25 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:61 builtin/worktree.c:944 -#, c-format -msgid "failed to delete '%s'" -msgstr "falló al borrar '%s'" - -#: builtin/worktree.c:74 +#: builtin/worktree.c:75 #, c-format msgid "Removing %s/%s: %s" msgstr "Eliminando %s/%s: %s" -#: builtin/worktree.c:147 +#: builtin/worktree.c:148 msgid "report pruned working trees" -msgstr "reporta árboles de trabajo recortados" +msgstr "reportar árboles de trabajo recortados" -#: builtin/worktree.c:149 +#: builtin/worktree.c:150 msgid "expire working trees older than <time>" msgstr "caducar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:219 +#: builtin/worktree.c:220 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:228 +#: builtin/worktree.c:229 #, c-format msgid "unusable worktree destination '%s'" msgstr "destino de worktree inutilizable '%s'" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23856,7 +24231,7 @@ msgstr "" "usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:235 +#: builtin/worktree.c:236 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23865,219 +24240,219 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:286 +#: builtin/worktree.c:287 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:308 +#: builtin/worktree.c:309 msgid "initializing" msgstr "inicializando" -#: builtin/worktree.c:420 builtin/worktree.c:426 +#: builtin/worktree.c:421 builtin/worktree.c:427 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:422 +#: builtin/worktree.c:423 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)" -#: builtin/worktree.c:431 +#: builtin/worktree.c:432 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:437 +#: builtin/worktree.c:438 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:482 +#: builtin/worktree.c:483 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya hay checkout de ella en otro árbol de " "trabajo" -#: builtin/worktree.c:485 +#: builtin/worktree.c:486 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:487 +#: builtin/worktree.c:488 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:489 +#: builtin/worktree.c:490 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:490 +#: builtin/worktree.c:491 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:492 builtin/worktree.c:729 +#: builtin/worktree.c:493 builtin/worktree.c:730 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:495 +#: builtin/worktree.c:496 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:498 +#: builtin/worktree.c:499 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#: builtin/worktree.c:506 +#: builtin/worktree.c:507 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:508 +#: builtin/worktree.c:509 msgid "--reason requires --lock" msgstr "--reason requiere --lock" -#: builtin/worktree.c:512 +#: builtin/worktree.c:513 msgid "added with --lock" msgstr "agregado con --lock" -#: builtin/worktree.c:574 +#: builtin/worktree.c:575 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" -#: builtin/worktree.c:691 +#: builtin/worktree.c:692 msgid "show extended annotations and reasons, if available" msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles" -#: builtin/worktree.c:693 +#: builtin/worktree.c:694 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" -"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>" +"agregar la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>" -#: builtin/worktree.c:702 +#: builtin/worktree.c:703 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose and --porcelain son mutuamente exclusivas" -#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 -#: builtin/worktree.c:972 +#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849 +#: builtin/worktree.c:973 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:743 builtin/worktree.c:776 +#: builtin/worktree.c:744 builtin/worktree.c:777 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:748 +#: builtin/worktree.c:749 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:750 +#: builtin/worktree.c:751 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:778 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:819 +#: builtin/worktree.c:820 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "árboles de trabajo conteniendo submódulos no pueden ser movidos o eliminados" -#: builtin/worktree.c:827 +#: builtin/worktree.c:828 msgid "force move even if worktree is dirty or locked" msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:850 builtin/worktree.c:974 +#: builtin/worktree.c:851 builtin/worktree.c:975 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:855 +#: builtin/worktree.c:856 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no se pudo descubrir el nombre de destino de '%s'" -#: builtin/worktree.c:868 +#: builtin/worktree.c:869 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n" -"use 'move -f -f' para forzar o desbloquear primero" +"usa 'move -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:870 +#: builtin/worktree.c:871 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" -"use 'move -f -f' para forzar o desbloquear primero" +"usa 'move -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:873 +#: builtin/worktree.c:874 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "falló validación, no se puede mover el árbol de trabajo: %s" -#: builtin/worktree.c:878 +#: builtin/worktree.c:879 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:924 +#: builtin/worktree.c:925 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:928 +#: builtin/worktree.c:929 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -"'%s' contiene archivos modificados o no rastreados, use --force para borrarlo" +"'%s' contiene archivos modificados o no rastreados, usa --force para borrarlo" -#: builtin/worktree.c:933 +#: builtin/worktree.c:934 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no se pudo ejecutar 'git status' en '%s', código %d" -#: builtin/worktree.c:956 +#: builtin/worktree.c:957 msgid "force removal even if worktree is dirty or locked" msgstr "" "forzar eliminación incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:979 +#: builtin/worktree.c:980 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" "no se puede eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" -"use 'remove -f -f' para forzar o desbloquear primero" +"usa 'remove -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:981 +#: builtin/worktree.c:982 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" -"use 'remove -f -f' para forzar o desbloquear primero" +"usa 'remove -f -f' para forzar o desbloquear primero" -#: builtin/worktree.c:984 +#: builtin/worktree.c:985 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" -#: builtin/worktree.c:1008 +#: builtin/worktree.c:1009 #, c-format msgid "repair: %s: %s" msgstr "reparar: %s: %s" -#: builtin/worktree.c:1011 +#: builtin/worktree.c:1012 #, c-format msgid "error: %s: %s" msgstr "error: %s: %s" @@ -24125,7 +24500,7 @@ msgid "" "See 'git help git' for an overview of the system." msgstr "" "'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n" -"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n" +"guías de concepto. Consulta 'git help <command>' o 'git help <concepto>'\n" "para leer sobre un subcomando o concepto específico.\n" "Mira 'git help git' para una vista general del sistema." @@ -24205,17 +24580,17 @@ msgstr "error desconocido de escritura en standard output" msgid "close failed on standard output" msgstr "cierre falló en standard output" -#: git.c:833 +#: git.c:832 #, 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:883 +#: git.c:882 #, c-format msgid "cannot handle %s as a builtin" msgstr "no se puede manejar %s como un builtin" -#: git.c:896 +#: git.c:895 #, c-format msgid "" "usage: %s\n" @@ -24226,12 +24601,12 @@ msgstr "" "\n" "\n" -#: git.c:916 +#: git.c:915 #, 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:928 +#: git.c:927 #, c-format msgid "failed to run command '%s': %s\n" msgstr "falló al ejecutar comando '%s': %s\n" @@ -24278,67 +24653,33 @@ msgstr "test-tool serve-v2 [<opciones>]" msgid "exit immediately after advertising capabilities" msgstr "salir inmediatamente tras anunciar capacidades" -#: t/helper/test-simple-ipc.c:262 -#, c-format -msgid "socket/pipe already in use: '%s'" -msgstr "socket/pipe ya está en uso: '%s'" - -#: t/helper/test-simple-ipc.c:264 -#, c-format -msgid "could not start server on: '%s'" -msgstr "no se pudo iniciar el servidor en: '%s'" - -#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 -msgid "could not spawn daemon in the background" -msgstr "no se puede generar demonio en el background" - -#: t/helper/test-simple-ipc.c:356 -msgid "waitpid failed" -msgstr "falló waitpid" - -#: t/helper/test-simple-ipc.c:376 -msgid "daemon not online yet" -msgstr "demonio no está en línea todavía" - -#: t/helper/test-simple-ipc.c:406 -msgid "daemon failed to start" -msgstr "falló al iniciar demonio" - -#: t/helper/test-simple-ipc.c:410 -msgid "waitpid is confused" -msgstr "waitpid está confundido" - -#: t/helper/test-simple-ipc.c:541 -msgid "daemon has not shutdown yet" -msgstr "demonio no se ha apagado todavía" - -#: t/helper/test-simple-ipc.c:682 +#: t/helper/test-simple-ipc.c:581 msgid "test-helper simple-ipc is-active [<name>] [<options>]" msgstr "test-helper simple-ipc is-active [<nombre>] [<opciones>]" -#: t/helper/test-simple-ipc.c:683 +#: t/helper/test-simple-ipc.c:582 msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" msgstr "test-helper simple-ipc run-daemon [<nombre>] [<hilos>]" -#: t/helper/test-simple-ipc.c:684 +#: t/helper/test-simple-ipc.c:583 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" msgstr "" "test-helper simple-ipc start-daemon [<nombre>] [<hilos>] [<espera-maxima>]" -#: t/helper/test-simple-ipc.c:685 +#: t/helper/test-simple-ipc.c:584 msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" msgstr "test-helper simple-ipc stop-daemon [<nombre>] [<espera-maxima>]" -#: t/helper/test-simple-ipc.c:686 +#: t/helper/test-simple-ipc.c:585 msgid "test-helper simple-ipc send [<name>] [<token>]" msgstr "test-helper simple-ipc send [<nombre>] [<token>]" -#: t/helper/test-simple-ipc.c:687 +#: t/helper/test-simple-ipc.c:586 msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" msgstr "" "test-helper simple-ipc sendbytes [<nombre>] [<cuenta de bytes>] [<byte>]" -#: t/helper/test-simple-ipc.c:688 +#: t/helper/test-simple-ipc.c:587 msgid "" "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " "[<batchsize>]" @@ -24346,85 +24687,81 @@ msgstr "" "test-helper simple-ipc multiple [<nombre>] [<hilos>] [<cuenta de bytes>] " "[<tamaño de batch>]" -#: t/helper/test-simple-ipc.c:696 +#: t/helper/test-simple-ipc.c:595 msgid "name or pathname of unix domain socket" msgstr "nombre o ruta de nombre de socket de dominio unix" -#: t/helper/test-simple-ipc.c:698 +#: t/helper/test-simple-ipc.c:597 msgid "named-pipe name" msgstr "nombre de named-pipe" -#: t/helper/test-simple-ipc.c:700 +#: t/helper/test-simple-ipc.c:599 msgid "number of threads in server thread pool" msgstr "número de hilos en el pool de hilos del servidor" -#: t/helper/test-simple-ipc.c:701 +#: t/helper/test-simple-ipc.c:600 msgid "seconds to wait for daemon to start or stop" msgstr "segundos a esperar para que el dominio empiece o se detenga" -#: t/helper/test-simple-ipc.c:703 +#: t/helper/test-simple-ipc.c:602 msgid "number of bytes" msgstr "número de bytes" -#: t/helper/test-simple-ipc.c:704 +#: t/helper/test-simple-ipc.c:603 msgid "number of requests per thread" -msgstr "númeor de peticiones por hilo" +msgstr "número de peticiones por hilo" -#: t/helper/test-simple-ipc.c:706 +#: t/helper/test-simple-ipc.c:605 msgid "byte" msgstr "byte" -#: t/helper/test-simple-ipc.c:706 +#: t/helper/test-simple-ipc.c:605 msgid "ballast character" -msgstr "caracter lastre" +msgstr "carácter lastre" -#: t/helper/test-simple-ipc.c:707 +#: t/helper/test-simple-ipc.c:606 msgid "token" msgstr "token" -#: t/helper/test-simple-ipc.c:707 +#: t/helper/test-simple-ipc.c:606 msgid "command token to send to the server" -msgstr "comando token para enviar al servidor" +msgstr "token de comando para enviar al servidor" -#: http.c:399 +#: http.c:350 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negativo para http.postbuffer; poniendo el default %d" -#: http.c:420 +#: http.c:371 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegación de control no es soportada con cURL < 7.22.0" -#: http.c:429 -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:380 +msgid "Public key pinning not supported with cURL < 7.39.0" +msgstr "Fijación de llave pública no es soportada con cURL < 7.39.0" -#: http.c:910 +#: http.c:812 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0" -#: http.c:989 -msgid "Protocol restrictions not supported with cURL < 7.19.4" -msgstr "Restricción de protocolo no soportada con cURL < 7.19.4" - -#: http.c:1132 +#: http.c:1016 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:" -#: http.c:1139 +#: http.c:1023 #, 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:1143 +#: http.c:1027 #, 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:2034 +#: http.c:1876 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -24440,47 +24777,53 @@ msgstr "" msgid "invalid quoting in push-option value: '%s'" msgstr "quoting inválido en valor de push-option: '%s'" -#: remote-curl.c:307 +#: remote-curl.c:304 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?" -#: remote-curl.c:408 +#: remote-curl.c:405 msgid "invalid server response; expected service, got flush packet" msgstr "" "respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush " "packet" -#: remote-curl.c:439 +#: remote-curl.c:436 #, c-format msgid "invalid server response; got '%s'" msgstr "respuesta de servidor inválida; se obtuvo '%s'" -#: remote-curl.c:499 +#: remote-curl.c:496 #, c-format msgid "repository '%s' not found" msgstr "repositorio '%s' no encontrado" -#: remote-curl.c:503 +#: remote-curl.c:500 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticación falló para '%s'" -#: remote-curl.c:507 +#: remote-curl.c:504 +#, c-format +msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" +msgstr "" +"no es posible acceder a '%s' con la configuración http.pinnedPubkey: %s" + +#: remote-curl.c:508 #, c-format msgid "unable to access '%s': %s" msgstr "no es posible acceder a '%s': %s" -#: remote-curl.c:513 +#: remote-curl.c:514 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: remote-curl.c:644 +#: remote-curl.c:645 msgid "shouldn't have EOF when not gentle on EOF" msgstr "no se debería tener EOF cuando no es laxo con EOF" -#: remote-curl.c:656 +#: remote-curl.c:657 msgid "remote server sent unexpected response end packet" msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada" @@ -24489,83 +24832,83 @@ msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "no es posible rebobinar rpc post data - intenta incrementar http.postBuffer" -#: remote-curl.c:756 +#: remote-curl.c:755 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: mal carácter de largo de línea: %.4s" -#: remote-curl.c:758 +#: remote-curl.c:757 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: packet de respuesta final inesperado" -#: remote-curl.c:834 +#: remote-curl.c:833 #, c-format msgid "RPC failed; %s" msgstr "RPC falló; %s" -#: remote-curl.c:874 +#: remote-curl.c:873 msgid "cannot handle pushes this big" msgstr "no se puede manejar pushes tan grandes" -#: remote-curl.c:989 +#: remote-curl.c:986 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "no se puede desinflar el request; zlib deflate error %d" -#: remote-curl.c:993 +#: remote-curl.c:990 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "no se puede desinflar el request; zlib end error %d" -#: remote-curl.c:1043 +#: remote-curl.c:1040 #, c-format msgid "%d bytes of length header were received" msgstr "%d bytes de header de longitud fueron recibidos" -#: remote-curl.c:1045 +#: remote-curl.c:1042 #, c-format msgid "%d bytes of body are still expected" msgstr "%d bytes de cuerpo se siguen esperando" -#: remote-curl.c:1134 +#: remote-curl.c:1131 msgid "dumb http transport does not support shallow capabilities" msgstr "dump http transport no soporta capacidades superficiales" -#: remote-curl.c:1149 +#: remote-curl.c:1146 msgid "fetch failed." msgstr "fetch falló." -#: remote-curl.c:1195 +#: remote-curl.c:1192 msgid "cannot fetch by sha1 over smart http" msgstr "no se puede hacer fetch por sha1 sobre smart http" -#: remote-curl.c:1239 remote-curl.c:1245 +#: remote-curl.c:1236 remote-curl.c:1242 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" -#: remote-curl.c:1257 remote-curl.c:1375 +#: remote-curl.c:1254 remote-curl.c:1372 #, c-format msgid "http transport does not support %s" msgstr "http transport no soporta %s" -#: remote-curl.c:1293 +#: remote-curl.c:1290 msgid "git-http-push failed" msgstr "git-http-push falló" -#: remote-curl.c:1481 +#: remote-curl.c:1478 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" -#: remote-curl.c:1513 +#: remote-curl.c:1510 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: error al leer command stream de git" -#: remote-curl.c:1520 +#: remote-curl.c:1517 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fetch intentado sin un repositorio local" -#: remote-curl.c:1561 +#: remote-curl.c:1558 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" @@ -24586,46 +24929,46 @@ msgstr "args" msgid "object filtering" msgstr "filtrado de objeto" -#: parse-options.h:184 +#: parse-options.h:183 msgid "expiry-date" msgstr "fecha de caducidad" -#: parse-options.h:198 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "no-op (compatibilidad con versiones anteriores)" -#: parse-options.h:310 +#: parse-options.h:309 msgid "be more verbose" msgstr "ser más verboso" -#: parse-options.h:312 +#: parse-options.h:311 msgid "be more quiet" msgstr "ser más callado" -#: parse-options.h:318 +#: parse-options.h:317 msgid "use <n> digits to display object names" -msgstr "use <n> cifras para mostrar los nombres de los objetos" +msgstr "usar <n> cifras para mostrar los nombres de los objetos" -#: parse-options.h:337 +#: 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:338 +#: parse-options.h:337 msgid "read pathspec from file" msgstr "leer pathspec de archivo" -#: parse-options.h:339 +#: 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 " +"con --pathspec-from-file, elementos de pathspec son separados con carácter " "NUL" -#: ref-filter.h:99 +#: ref-filter.h:101 msgid "key" msgstr "clave" -#: ref-filter.h:99 +#: ref-filter.h:101 msgid "field name to sort on" msgstr "nombre del campo por el cuál ordenar" @@ -24637,7 +24980,7 @@ msgstr "" #: command-list.h:50 msgid "Add file contents to the index" -msgstr "Agrega contenido de archivos al índice" +msgstr "Agregar contenido de archivos al índice" #: command-list.h:51 msgid "Apply a series of patches from a mailbox" @@ -24661,7 +25004,7 @@ msgstr "Crear una crónica de archivos de un árbol nombrado" #: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" -msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug" +msgstr "Usar la búsqueda binaria para encontrar el commit que introdujo el bug" #: command-list.h:57 msgid "Show what revision and author last modified each line of a file" @@ -24670,7 +25013,7 @@ msgstr "" #: command-list.h:58 msgid "List, create, or delete branches" -msgstr "Lista, crea, o borra ramas" +msgstr "Listar, crear, o borrar ramas" #: command-list.h:59 msgid "Collect information for user to file a bug report" @@ -24701,7 +25044,7 @@ msgstr "" #: command-list.h:65 msgid "Switch branches or restore working tree files" -msgstr "Cambia de rama o restaura archivos del árbol de trabajo" +msgstr "Cambiar de rama o restaura archivos del árbol de trabajo" #: command-list.h:66 msgid "Copy files from the index to the working tree" @@ -24709,15 +25052,15 @@ msgstr "Copiar archivos del índice al árbol de trabajo" #: command-list.h:67 msgid "Ensures that a reference name is well formed" -msgstr "Asegura que un nombre de referencia esté bien formado" +msgstr "Asegurar que un nombre de referencia esté bien formado" #: command-list.h:68 msgid "Find commits yet to be applied to upstream" -msgstr "Encuentra commits que falten aplicar en upstream" +msgstr "Encontrar commits que falten aplicar en upstream" #: command-list.h:69 msgid "Apply the changes introduced by some existing commits" -msgstr "Aplica los cambios introducidos por algunos commits existentes" +msgstr "Aplicar los cambios introducidos por algunos commits existentes" #: command-list.h:70 msgid "Graphical alternative to git-commit" @@ -24729,7 +25072,7 @@ msgstr "Quitar archivos no rastreados del árbol de trabajo" #: command-list.h:72 msgid "Clone a repository into a new directory" -msgstr "Clona un repositorio dentro de un nuevo directorio" +msgstr "Clonar un repositorio dentro de un nuevo directorio" #: command-list.h:73 msgid "Display data in columns" @@ -24737,15 +25080,15 @@ msgstr "Mostrar data en columnas" #: command-list.h:74 msgid "Record changes to the repository" -msgstr "Graba los cambios al repositorio" +msgstr "Grabar los cambios al repositorio" #: command-list.h:75 msgid "Write and verify Git commit-graph files" -msgstr "Escribe y verifica los archivos commit-graph de Git" +msgstr "Escribir y verificar los archivos commit-graph de Git" #: command-list.h:76 msgid "Create a new commit object" -msgstr "Crea un nuevo objeto commit" +msgstr "Crear un nuevo objeto commit" #: command-list.h:77 msgid "Get and set repository or global options" @@ -24769,11 +25112,11 @@ msgstr "Auxiliar para guardar credenciales en disco" #: command-list.h:82 msgid "Export a single commit to a CVS checkout" -msgstr "Exporta un commit único a CVS checkout" +msgstr "Exportar un commit único a CVS checkout" #: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" -msgstr "Salva tus datos de otro SCM que la gente adora odiar" +msgstr "Salvar tus datos de otro SCM que la gente adora odiar" #: command-list.h:84 msgid "A CVS server emulator for Git" @@ -24791,20 +25134,20 @@ msgstr "" #: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" -msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc" +msgstr "Mostrar los cambios entre commits, commit y árbol de trabajo, etc" #: command-list.h:88 msgid "Compares files in the working tree and the index" -msgstr "Compara archivos del árbol de trabajo y del índice" +msgstr "Comparar archivos del árbol de trabajo y del índice" #: command-list.h:89 msgid "Compare a tree to the working tree or index" -msgstr "Compara un árbol con el árbol de trabajo o índice" +msgstr "Comparar un árbol con el árbol de trabajo o índice" #: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" -"Compara el contenido y el modo de blobs encontrados a través de dos objetos " +"Comparar el contenido y el modo de blobs encontrados a través de dos objetos " "de árbol" #: command-list.h:91 @@ -24821,11 +25164,11 @@ msgstr "Backend para importadores de data de Git rápidos" #: command-list.h:94 msgid "Download objects and refs from another repository" -msgstr "Descarga objetos y referencias de otro repositorio" +msgstr "Descargar objetos y referencias de otro repositorio" #: command-list.h:95 msgid "Receive missing objects from another repository" -msgstr "Descarga objetos faltantes de otro repositorio" +msgstr "Descargar objetos faltantes de otro repositorio" #: command-list.h:96 msgid "Rewrite branches" @@ -24833,7 +25176,7 @@ msgstr "Reescribir ramas" #: command-list.h:97 msgid "Produce a merge commit message" -msgstr "Produce un mensaje de commit de fusión" +msgstr "Producir un mensaje de commit de fusión" #: command-list.h:98 msgid "Output information on each ref" @@ -24841,28 +25184,28 @@ msgstr "Información de output en cada ref" #: command-list.h:99 msgid "Run a Git command on a list of repositories" -msgstr "Ejecute un comando de Git en una lista de repositorios" +msgstr "Ejecutar un comando de Git en una lista de repositorios" #: command-list.h:100 msgid "Prepare patches for e-mail submission" -msgstr "Prepara parches para ser enviados por e-mail" +msgstr "Preparar parches para ser enviados por e-mail" #: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" -"Verifica la conectividad y disponibilidad de los objetos en la base de datos" +"Verificar la conectividad y disponibilidad de los objetos en la base de datos" #: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" -msgstr "Limpia archivos innecesarios y optimiza el repositorio local" +msgstr "Limpiar archivos innecesarios y optimiza el repositorio local" #: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" -msgstr "Extrae el ID de commit de una crónica creada usando git-archive" +msgstr "Extraer el ID de commit de una crónica creada usando git-archive" #: command-list.h:104 msgid "Print lines matching a pattern" -msgstr "Imprime las líneas que concuerden con el patrón" +msgstr "Imprimir las líneas que concuerden con el patrón" #: command-list.h:105 msgid "A portable graphical interface to Git" @@ -24870,7 +25213,7 @@ msgstr "Una interfaz gráfica portátil para Git" #: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" -msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo" +msgstr "Computar ID de objeto y, opcionalmente, crear un blob de un archivo" #: command-list.h:107 msgid "Display help information about Git" @@ -24882,11 +25225,11 @@ msgstr "Implementación de lado de servidor de Git por HTTP" #: command-list.h:109 msgid "Download from a remote Git repository via HTTP" -msgstr "Descarga de un repositorio Git remoto vía HTTP" +msgstr "Descargar de un repositorio Git remoto vía HTTP" #: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" -msgstr "Empuja objetos por HTTP/DAV a otro repositorio" +msgstr "Empujar objetos por HTTP/DAV a otro repositorio" #: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" @@ -24894,11 +25237,11 @@ msgstr "Enviar una colección de parches de stdin a una carpeta IMAP" #: command-list.h:112 msgid "Build pack index file for an existing packed archive" -msgstr "Construye un archivo de índice para una crónica empaquetada existente" +msgstr "Construir un archivo de índice para una crónica empaquetada existente" #: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe" +msgstr "Crear un repositorio de Git vacío o reinicia el que ya existe" #: command-list.h:114 msgid "Instantly browse your working repository in gitweb" @@ -24914,19 +25257,19 @@ msgstr "El navegador de repositorio Git" #: command-list.h:117 msgid "Show commit logs" -msgstr "Muestra los logs de los commits" +msgstr "Mostrar los logs de los commits" #: command-list.h:118 msgid "Show information about files in the index and the working tree" -msgstr "Muestra información sobre archivos en el índice y el árbol de trabajo" +msgstr "Mostrar información sobre archivos en el índice y el árbol de trabajo" #: command-list.h:119 msgid "List references in a remote repository" -msgstr "Lista referencias en un repositorio remoto" +msgstr "Listar referencias en un repositorio remoto" #: command-list.h:120 msgid "List the contents of a tree object" -msgstr "Lista los contenidos de un objeto árbol" +msgstr "Listar los contenidos de un objeto árbol" #: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" @@ -24938,23 +25281,23 @@ msgstr "Programa divisor de mbox simple de UNIX" #: command-list.h:123 msgid "Run tasks to optimize Git repository data" -msgstr "Ejecute tareas para optimizar los datos del repositorio de Git" +msgstr "Ejecutar tareas para optimizar los datos del repositorio de Git" #: command-list.h:124 msgid "Join two or more development histories together" -msgstr "Junta dos o más historiales de desarrollo juntos" +msgstr "Juntar dos o más historiales de desarrollo juntos" #: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" -msgstr "Encuentra ancestros tan buenos como posible para una fusión" +msgstr "Encontrar ancestros tan buenos como posible para una fusión" #: command-list.h:126 msgid "Run a three-way file merge" -msgstr "Ejecuta una fusión de tres vías en un archivo" +msgstr "Ejecutar una fusión de tres vías en un archivo" #: command-list.h:127 msgid "Run a merge for files needing merging" -msgstr "Ejecuta una fusión para archivos que la necesiten" +msgstr "Ejecutar una fusión para archivos que la necesiten" #: command-list.h:128 msgid "The standard helper program to use with git-merge-index" @@ -24963,8 +25306,8 @@ msgstr "El programa de ayuda estándar para usar con git-merge-index" #: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" -"Ejecuta las herramientas de fusión de resolución de conflictos para resolver " -"conflictos de fusión" +"Ejecutar las herramientas de fusión de resolución de conflictos para " +"resolver conflictos de fusión" #: command-list.h:130 msgid "Show three-way merge without touching index" @@ -24972,11 +25315,11 @@ msgstr "Mostrar fusión de tres vías sin tocar el índice" #: command-list.h:131 msgid "Write and verify multi-pack-indexes" -msgstr "Escribe y verifica archivos multi-pack-index" +msgstr "Escribir y verificar archivos multi-pack-index" #: command-list.h:132 msgid "Creates a tag object with extra validation" -msgstr "Crea un objeto de etiqueta con validación adicional" +msgstr "Crear un objeto de etiqueta con validación adicional" #: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" @@ -24984,7 +25327,7 @@ msgstr "Construir un objeto árbol de un texto en formato ls-tree" #: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" -msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos" +msgstr "Mover o cambiar el nombre a archivos, directorios o enlaces simbólicos" #: command-list.h:135 msgid "Find symbolic names for given revs" @@ -24992,7 +25335,7 @@ msgstr "Encontrar nombres simbólicos para revs dados" #: command-list.h:136 msgid "Add or inspect object notes" -msgstr "Agrega o inspecciona notas de objeto" +msgstr "Agregar o inspeccionar notas de objeto" #: command-list.h:137 msgid "Import from and submit to Perforce repositories" @@ -25000,15 +25343,15 @@ msgstr "Importar desde y enviar a repositorios Perforce" #: command-list.h:138 msgid "Create a packed archive of objects" -msgstr "Crea una crónica de objetos empaquetada" +msgstr "Crear una crónica de objetos empaquetada" #: command-list.h:139 msgid "Find redundant pack files" -msgstr "Encuentra archivos de paquete redundantes" +msgstr "Encontrar archivos de paquete redundantes" #: command-list.h:140 msgid "Pack heads and tags for efficient repository access" -msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio" +msgstr "Empaquetar heads y tags para un acceso eficiente al repositorio" #: command-list.h:141 msgid "Compute unique ID for a patch" @@ -25016,7 +25359,8 @@ msgstr "Calcular ID único para un parche" #: command-list.h:142 msgid "Prune all unreachable objects from the object database" -msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos" +msgstr "" +"Limpiar todos los objetos no alcanzables de la base de datos de objetos" #: command-list.h:143 msgid "Remove extra objects that are already in pack files" @@ -25024,27 +25368,27 @@ msgstr "Quitar objetos extras que ya estén en archivos empaquetados" #: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" -msgstr "Realiza un fetch e integra con otro repositorio o rama local" +msgstr "Realizar un fetch e integra con otro repositorio o rama local" #: command-list.h:145 msgid "Update remote refs along with associated objects" -msgstr "Actualiza referencias remotas junto con sus objetos asociados" +msgstr "Actualizar referencias remotas junto con sus objetos asociados" #: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" -msgstr "Aplica un parche quilt en la rama actual" +msgstr "Aplicar un parche quilt en la rama actual" #: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" -msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)" +msgstr "Comparar dos rangos de commits (por ejemplo dos versions de un branch)" #: command-list.h:148 msgid "Reads tree information into the index" -msgstr "Lee información del árbol al índice" +msgstr "Leer información del árbol al índice" #: command-list.h:149 msgid "Reapply commits on top of another base tip" -msgstr "Vuelve a aplicar commits en la punta de otra rama" +msgstr "Volver a aplicar commits en la punta de otra rama" #: command-list.h:150 msgid "Receive what is pushed into the repository" @@ -25056,7 +25400,7 @@ msgstr "Gestionar información de reflog" #: command-list.h:152 msgid "Manage set of tracked repositories" -msgstr "Gestiona un conjunto de repositorios rastreados" +msgstr "Gestionar un conjunto de repositorios rastreados" #: command-list.h:153 msgid "Pack unpacked objects in a repository" @@ -25064,11 +25408,11 @@ msgstr "Empaquetar objetos no empaquetados en un repositorio" #: command-list.h:154 msgid "Create, list, delete refs to replace objects" -msgstr "Crea, lista, borra referencias para reemplazar objetos" +msgstr "Crear, listar, borrar referencias para reemplazar objetos" #: command-list.h:155 msgid "Generates a summary of pending changes" -msgstr "Genera un resumen de cambios pendientes" +msgstr "Generar un resumen de cambios pendientes" #: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" @@ -25076,7 +25420,7 @@ msgstr "Reutilizar la resolución registrada de fusiones conflictivas" #: command-list.h:157 msgid "Reset current HEAD to the specified state" -msgstr "Reinicia el HEAD actual a un estado específico" +msgstr "Reiniciar el HEAD actual a un estado específico" #: command-list.h:158 msgid "Restore working tree files" @@ -25084,11 +25428,11 @@ msgstr "Restaurar archivos del árbol de trabajo" #: command-list.h:159 msgid "Revert some existing commits" -msgstr "Revierte algunos commits existentes" +msgstr "Reviertir algunos commits existentes" #: command-list.h:160 msgid "Lists commit objects in reverse chronological order" -msgstr "Lista objetos commit en orden cronológico inverso" +msgstr "Listar objetos commit en orden cronológico inverso" #: command-list.h:161 msgid "Pick out and massage parameters" @@ -25096,11 +25440,11 @@ msgstr "Seleccionar y masajear los parámetros" #: command-list.h:162 msgid "Remove files from the working tree and from the index" -msgstr "Borra archivos del árbol de trabajo y del índice" +msgstr "Borrar archivos del árbol de trabajo y del índice" #: command-list.h:163 msgid "Send a collection of patches as emails" -msgstr "Envía una colección de parches como e-mails" +msgstr "Enviar una colección de parches como e-mails" #: command-list.h:164 msgid "Push objects over Git protocol to another repository" @@ -25116,7 +25460,7 @@ msgstr "Resumir la salida de 'git log'" #: command-list.h:167 msgid "Show various types of objects" -msgstr "Muestra varios tipos de objetos" +msgstr "Mostrar varios tipos de objetos" #: command-list.h:168 msgid "Show branches and their commits" @@ -25140,7 +25484,7 @@ msgstr "Código común de configuración de script de shell de Git" #: command-list.h:173 msgid "Initialize and modify the sparse-checkout" -msgstr "Inicializa y modifica el sparse-checkout" +msgstr "Inicializar y modificar el sparse-checkout" #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" @@ -25148,11 +25492,11 @@ msgstr "Poner en un stash los cambios en un directorio de trabajo sucio" #: command-list.h:175 msgid "Add file contents to the staging area" -msgstr "Agrega contenidos de un archivo al área de staging" +msgstr "Agregar contenidos de un archivo al área de staging" #: command-list.h:176 msgid "Show the working tree status" -msgstr "Muestra el estado del árbol de trabajo" +msgstr "Mostrar el estado del árbol de trabajo" #: command-list.h:177 msgid "Remove unnecessary whitespace" @@ -25160,7 +25504,7 @@ msgstr "Eliminar el espacio en blanco innecesario" #: command-list.h:178 msgid "Initialize, update or inspect submodules" -msgstr "Inicializa, actualiza o inspecciona submódulos" +msgstr "Inicializar, actualizar o inspeccionar submódulos" #: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" @@ -25172,33 +25516,33 @@ msgstr "Cambiar de branch" #: command-list.h:181 msgid "Read, modify and delete symbolic refs" -msgstr "Lee, modifica y borra referencias simbólicas" +msgstr "Leer, modificar y borrar referencias simbólicas" #: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Crea, lista, borra o verifica un objeto de tag firmado con GPG" +msgstr "Crear, listar, borrar o verificar un objeto de tag firmado con GPG" #: command-list.h:183 msgid "Creates a temporary file with a blob's contents" -msgstr "Crea un archivo temporal con contenidos de un blob" +msgstr "Crear un archivo temporal con contenidos de un blob" #: command-list.h:184 msgid "Unpack objects from a packed archive" -msgstr "Desempaqueta objetos de una crónica empaquetada" +msgstr "Desempaquetar objetos de una crónica empaquetada" #: command-list.h:185 msgid "Register file contents in the working tree to the index" -msgstr "Registra contenidos de archivos en el árbol de trabajo al índice" +msgstr "Registrar contenidos de archivos en el árbol de trabajo al índice" #: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "" -"Actualiza el nombre del objeto almacenado en una referencia de forma segura" +"Actualizar el nombre del objeto almacenado en una referencia de forma segura" #: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "" -"Actualiza el archivo de información auxiliar para ayudar a los servidores " +"Actualizar el archivo de información auxiliar para ayudar a los servidores " "dumb" #: command-list.h:188 @@ -25219,11 +25563,11 @@ msgstr "Verificar firma GPG de commits" #: command-list.h:192 msgid "Validate packed Git archive files" -msgstr "Valida crónicas Git empaquetadas" +msgstr "Validar crónicas Git empaquetadas" #: command-list.h:193 msgid "Check the GPG signature of tags" -msgstr "Verifica la firma GPG de etiquetas" +msgstr "Verificar la firma GPG de etiquetas" #: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" @@ -25231,15 +25575,15 @@ msgstr "Interfaz web Git (interfaz web para repositorios Git)" #: command-list.h:195 msgid "Show logs with difference each commit introduces" -msgstr "Muestra logs con las diferencias que cada commit introduce" +msgstr "Mostrar logs con las diferencias que cada commit introduce" #: command-list.h:196 msgid "Manage multiple working trees" -msgstr "Gestiona múltiples árboles de trabajo" +msgstr "Gestionar múltiples árboles de trabajo" #: command-list.h:197 msgid "Create a tree object from the current index" -msgstr "Crea un objeto árbol del índice actual" +msgstr "Crear un objeto árbol del índice actual" #: command-list.h:198 msgid "Defining attributes per path" @@ -25283,7 +25627,7 @@ msgstr "Hooks utilizados por Git" #: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" -msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" +msgstr "Especificar de forma intencional archivos sin seguimiento a ignorar" #: command-list.h:209 msgid "Map author/committer names and/or E-Mail addresses" @@ -25327,41 +25671,6 @@ msgstr "Un tutorial de introducción a Git" msgid "An overview of recommended workflows with Git" msgstr "Una visión general de flujos de trabajo recomendados con Git" -#: git-bisect.sh:68 -msgid "bisect run failed: no command provided." -msgstr "bisect falló: no se proveyó comando." - -#: git-bisect.sh:73 -#, sh-format -msgid "running $command" -msgstr "ejecutando $command" - -#: git-bisect.sh:80 -#, sh-format -msgid "" -"bisect run failed:\n" -"exit code $res from '$command' is < 0 or >= 128" -msgstr "" -"bisect falló:\n" -"código de salida $res de '$command' es <0 o >=128" - -#: git-bisect.sh:105 -msgid "bisect run cannot continue any more" -msgstr "bisect no puede seguir continuando" - -#: git-bisect.sh:111 -#, sh-format -msgid "" -"bisect run failed:\n" -"'bisect-state $state' exited with error code $res" -msgstr "" -"bisect run falló:\n" -"'bisect-state $state' salió con el código de error $res" - -#: git-bisect.sh:118 -msgid "bisect run success" -msgstr "bisect exitoso" - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -25402,55 +25711,19 @@ msgstr "Intentando fusión simple con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Fusión simple no funcionó, intentando fusión automática." -#: git-submodule.sh:179 -msgid "Relative path can only be used from the toplevel of the working tree" -msgstr "" -"La ruta relativa solo se puede usar desde el nivel superior del árbol de " -"trabajo" - -#: git-submodule.sh:189 -#, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../" - -#: git-submodule.sh:208 -#, sh-format -msgid "'$sm_path' already exists in the index" -msgstr "'$sm_path' ya existe en el índice" - -#: git-submodule.sh:211 -#, sh-format -msgid "'$sm_path' already exists in the index and is not a submodule" -msgstr "'$sm_path' ya existe en el índice y no es un submódulo" - -#: git-submodule.sh:218 -#, sh-format -msgid "'$sm_path' does not have a commit checked out" -msgstr "'$sm_path' no tiene un commit checked out" - -#: git-submodule.sh:248 -#, sh-format -msgid "Failed to add submodule '$sm_path'" -msgstr "Falló al agregar el submódulo '$sm_path'" - -#: git-submodule.sh:257 -#, sh-format -msgid "Failed to register submodule '$sm_path'" -msgstr "Falló al registrar el submódulo '$sm_path'" - -#: git-submodule.sh:532 +#: git-submodule.sh:401 #, 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:542 +#: git-submodule.sh:411 #, 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:547 +#: git-submodule.sh:416 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -25459,402 +25732,11 @@ msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " "de submódulo '$sm_path'" -#: git-submodule.sh:565 -#, sh-format -msgid "" -"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " -"$sha1:" -msgstr "" -"No es posible realizar fetch en la ruta de submódulo '$displaypath'; " -"intentando hacer un fetch directo de $sha1:" - -#: git-submodule.sh:571 -#, sh-format -msgid "" -"Fetched in submodule path '$displaypath', but it did not contain $sha1. " -"Direct fetching of that commit failed." -msgstr "" -"Fetch realizado en la ruta de submódulo '$displaypath', pero no contenía " -"$sha1. Fetch directo del commit falló." - -#: git-submodule.sh:578 -#, 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:579 -#, sh-format -msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" - -#: git-submodule.sh:583 -#, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "" -"No es posible ejecutar rebase a '$sha1' en la ruta de submódulo " -"'$displaypath'" - -#: git-submodule.sh:584 -#, sh-format -msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Ruta de submódulo '$displaypath': rebasado a '$sha1'" - -#: git-submodule.sh:589 -#, 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:590 -#, sh-format -msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Ruta de submódulo '$displaypath': fusionado en '$sha1'" - -#: git-submodule.sh:595 -#, 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:596 -#, sh-format -msgid "Submodule path '$displaypath': '$command $sha1'" -msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" - -#: git-submodule.sh:627 +#: git-submodule.sh:464 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-rebase--preserve-merges.sh:109 -msgid "Applied autostash." -msgstr "Autostash aplicado." - -#: git-rebase--preserve-merges.sh:112 -#, sh-format -msgid "Cannot store $stash_sha1" -msgstr "No se puede almacenar $stash_sha1" - -#: git-rebase--preserve-merges.sh:113 -msgid "" -"Applying autostash resulted in conflicts.\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "" -"Aplicar autostash resultó en conflictos.\n" -"Tus cambios están seguros en el stash.\n" -"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " -"momento.\n" - -#: git-rebase--preserve-merges.sh:191 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "Rebasando ($new_count/$total)" - -#: git-rebase--preserve-merges.sh:197 -msgid "" -"\n" -"Commands:\n" -"p, pick <commit> = use commit\n" -"r, reword <commit> = use commit, but edit the commit message\n" -"e, edit <commit> = use commit, but stop for amending\n" -"s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <commit> = run command (the rest of the line) using shell\n" -"d, drop <commit> = remove commit\n" -"l, label <label> = label current HEAD with a name\n" -"t, reset <label> = reset HEAD to a label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" -"\n" -"These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "" -"\n" -"Comandos:\n" -"p, pick <commit> = usar commit\n" -"r, reword <commit> = usar commit, pero editar el mensaje de commit\n" -"e, edit <commit> = usar commit, pero parar para un amend\n" -"s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n" -"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de " -"este commit\n" -"x, exec <commit> = ejecuta comando (el resto de la línea) usando un shell\n" -"d, drop <commit> = eliminar commit\n" -"l, label <label> = poner label al HEAD actual con un nombre\n" -"t, reset <label> = reiniciar HEAD al label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". crea un commit de fusión usando el mensaje original de\n" -". fusión (o la línea de oneline, si no se especifica un mensaje\n" -". de commit). Use -c <commit> para reescribir el mensaje del commit.\n" -"\n" -"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " -"abajo.\n" - -#: git-rebase--preserve-merges.sh:260 -#, sh-format -msgid "" -"You can amend the commit now, with\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Once you are satisfied with your changes, run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Puedes enmendar el commit ahora, con\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Una vez que estés satisfecho con los cambios, ejecuta\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:285 -#, sh-format -msgid "$sha1: not a commit that can be picked" -msgstr "$sha1: no es un commit que pueda ser cogido" - -#: git-rebase--preserve-merges.sh:324 -#, sh-format -msgid "Invalid commit name: $sha1" -msgstr "Nombre de commit inválido: $sha1" - -#: git-rebase--preserve-merges.sh:354 -msgid "Cannot write current commit's replacement sha1" -msgstr "No se puede escribir el remplazo sha1 del commit actual" - -#: git-rebase--preserve-merges.sh:405 -#, sh-format -msgid "Fast-forward to $sha1" -msgstr "Avance rápido a $sha1" - -#: git-rebase--preserve-merges.sh:407 -#, sh-format -msgid "Cannot fast-forward to $sha1" -msgstr "No se puede realizar avance rápido a $sha1" - -#: git-rebase--preserve-merges.sh:416 -#, sh-format -msgid "Cannot move HEAD to $first_parent" -msgstr "No se puede mover HEAD a $first_parent" - -#: git-rebase--preserve-merges.sh:421 -#, sh-format -msgid "Refusing to squash a merge: $sha1" -msgstr "Rehusando ejecutar squash en fusión: $sha1" - -#: git-rebase--preserve-merges.sh:439 -#, sh-format -msgid "Error redoing merge $sha1" -msgstr "Error al rehacer fusión $sha1" - -#: git-rebase--preserve-merges.sh:448 -#, sh-format -msgid "Could not pick $sha1" -msgstr "No se pudo coger $sha1" - -#: git-rebase--preserve-merges.sh:457 -#, sh-format -msgid "This is the commit message #${n}:" -msgstr "Este es el mensaje del commit #${n}:" - -#: git-rebase--preserve-merges.sh:462 -#, sh-format -msgid "The commit message #${n} will be skipped:" -msgstr "El mensaje del commit #${n} será ignorado:" - -#: git-rebase--preserve-merges.sh:473 -#, sh-format -msgid "This is a combination of $count commit." -msgid_plural "This is a combination of $count commits." -msgstr[0] "Esta es una combinación de $count commit." -msgstr[1] "Esta es la combinación de $count commits." - -#: git-rebase--preserve-merges.sh:482 -#, sh-format -msgid "Cannot write $fixup_msg" -msgstr "No se puede escribir $fixup_msg" - -#: git-rebase--preserve-merges.sh:485 -msgid "This is a combination of 2 commits." -msgstr "Esto es una combinación de 2 commits." - -#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 -#: git-rebase--preserve-merges.sh:572 -#, sh-format -msgid "Could not apply $sha1... $rest" -msgstr "No se pudo aplicar $sha1... $rest" - -#: git-rebase--preserve-merges.sh:601 -#, sh-format -msgid "" -"Could not amend commit after successfully picking $sha1... $rest\n" -"This is most likely due to an empty commit message, or the pre-commit hook\n" -"failed. If the pre-commit hook failed, you may need to resolve the issue " -"before\n" -"you are able to reword the commit." -msgstr "" -"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... " -"$rest\n" -"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-" -"commit\n" -"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el " -"problema antes\n" -"de que sea capaz de reformular el commit." - -#: git-rebase--preserve-merges.sh:616 -#, sh-format -msgid "Stopped at $sha1_abbrev... $rest" -msgstr "Detenido en $sha1_abbrev... $rest" - -#: git-rebase--preserve-merges.sh:631 -#, sh-format -msgid "Cannot '$squash_style' without a previous commit" -msgstr "No se puede '$squash_style' sin un commit previo" - -#: git-rebase--preserve-merges.sh:673 -#, sh-format -msgid "Executing: $rest" -msgstr "Ejecutando: $rest" - -#: git-rebase--preserve-merges.sh:681 -#, sh-format -msgid "Execution failed: $rest" -msgstr "Ejecución fallida: $rest" - -#: git-rebase--preserve-merges.sh:683 -msgid "and made changes to the index and/or the working tree" -msgstr "y hizo cambios al índice y/o al árbol de trabajo" - -#: git-rebase--preserve-merges.sh:685 -msgid "" -"You can fix the problem, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Puedes corregir el problema y entonces ejecutar\n" -"\n" -"\tgit rebase --continue" - -#. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:698 -#, sh-format -msgid "" -"Execution succeeded: $rest\n" -"but left changes to the index and/or the working tree\n" -"Commit or stash your changes, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"La ejecución tuvo éxito: $rest\n" -"Pero dejó cambios en el índice y/o en el árbol de trabajo\n" -"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:709 -#, sh-format -msgid "Unknown command: $command $sha1 $rest" -msgstr "Comando desconocido: $command $sha1 $rest" - -#: git-rebase--preserve-merges.sh:710 -msgid "Please fix this using 'git rebase --edit-todo'." -msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." - -#: git-rebase--preserve-merges.sh:745 -#, sh-format -msgid "Successfully rebased and updated $head_name." -msgstr "$head_name rebasado y actualizado satisfactoriamente." - -#: git-rebase--preserve-merges.sh:802 -msgid "Could not remove CHERRY_PICK_HEAD" -msgstr "No se pudo eliminar CHERRY_PICK_HEAD" - -#: git-rebase--preserve-merges.sh:807 -#, sh-format -msgid "" -"You have staged changes in your working tree.\n" -"If these changes are meant to be\n" -"squashed into the previous commit, run:\n" -"\n" -" git commit --amend $gpg_sign_opt_quoted\n" -"\n" -"If they are meant to go into a new commit, run:\n" -"\n" -" git commit $gpg_sign_opt_quoted\n" -"\n" -"In both cases, once you're done, continue with:\n" -"\n" -" git rebase --continue\n" -msgstr "" -"Tienes cambios en el área de stage de tu árbol de trabajo.\n" -"Si estos cambios están destinados a\n" -"ser aplastados en el commit previo, ejecuta:\n" -"\n" -" git commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Si estos están destinados a ir en un nuevo commit, ejecuta:\n" -"\n" -" git commit $gpg_sign_opt_quoted\n" -"\n" -"En ambos casos, cuando termines, continue con:\n" -"\n" -" git rebase --continue\n" - -#: git-rebase--preserve-merges.sh:824 -msgid "Error trying to find the author identity to amend commit" -msgstr "" -"Error al tratar de encontrar la identidad del autor para remediar el commit" - -#: git-rebase--preserve-merges.sh:829 -msgid "" -"You have uncommitted changes in your working tree. Please commit them\n" -"first and then run 'git rebase --continue' again." -msgstr "" -"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n" -"primero y entonces ejecuta 'git rebase --continue' de nuevo." - -#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 -msgid "Could not commit staged changes." -msgstr "No se pudo realizar el commit con los cambios en el área de stage." - -#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 -msgid "Could not execute editor" -msgstr "No se pudo ejecutar el editor" - -#: git-rebase--preserve-merges.sh:890 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" - -#: git-rebase--preserve-merges.sh:897 -msgid "No HEAD?" -msgstr "¿Sin HEAD?" - -#: git-rebase--preserve-merges.sh:898 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "No se pudo crear $state_dir temporalmente" - -#: git-rebase--preserve-merges.sh:901 -msgid "Could not mark as interactive" -msgstr "No se pudo marcar como interactivo" - -#: git-rebase--preserve-merges.sh:933 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" -msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" - -#: git-rebase--preserve-merges.sh:945 -msgid "Note that empty commits are commented out" -msgstr "Tenga en cuenta que los commits vacíos están comentados" - -#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 -msgid "Could not init rewritten commits" -msgstr "No se pudo inicializar los commits reescritos" - #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format msgid "usage: $dashless $USAGE" @@ -25872,55 +25754,32 @@ msgid "fatal: $program_name cannot be used without a working tree." msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo." #: git-sh-setup.sh:221 -msgid "Cannot rebase: You have unstaged changes." -msgstr "" -"No se puede aplicar rebase: Tienes cambios que no están en el área de stage." - -#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" "No se puede reescribir las ramas: Tienes cambios que no están en el área de " "stage." -#: git-sh-setup.sh:227 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "" -"No se puede aplicar pull con rebase: Tienes cambios que no están en el área " -"de stage." - -#: git-sh-setup.sh:230 +#: git-sh-setup.sh:224 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "No se puede $action: Tienes cambios que no están en el área de stage." -#: git-sh-setup.sh:243 -msgid "Cannot rebase: Your index contains uncommitted changes." -msgstr "" -"No se puede hacer rebase: Tu índice contiene cambios que no están en un " -"commit." - -#: git-sh-setup.sh:246 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"No se puede hacer pull con rebase: Tu índice contiene cambios que no están " -"en un commit." - -#: git-sh-setup.sh:249 +#: git-sh-setup.sh:235 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "No se puede $action: El índice contiene cambios sin confirmar." -#: git-sh-setup.sh:253 +#: git-sh-setup.sh:237 msgid "Additionally, your index contains uncommitted changes." msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit." -#: git-sh-setup.sh:373 +#: git-sh-setup.sh:357 msgid "You need to run this command from the toplevel of the working tree." msgstr "" "Necesitas ejecutar este comando desde el nivel superior de tu árbol de " "trabajo." -#: git-sh-setup.sh:378 +#: git-sh-setup.sh:362 msgid "Unable to determine absolute path of git directory" msgstr "Incapaz de determinar la ruta absoluta del directorio git" @@ -25993,8 +25852,8 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" "---\n" -"Para eliminar '%s' líneas, haga de ellas líneas ' ' (contexto).\n" -"Para eliminar '%s' líneas, bórrelas.\n" +"Para eliminar '%s' líneas, haz de ellas líneas ' ' (contexto).\n" +"Para eliminar '%s' líneas, bórralas.\n" "Líneas comenzando con %s serán eliminadas.\n" #: git-add--interactive.perl:1143 @@ -26014,8 +25873,8 @@ msgstr "" "n - no aplicar stage a este fragmento\n" "q - quit; no aplicar stage a este fragmento ni ninguno de los restantes\n" "a - aplicar stage a este fragmento y a todos los posteriores en el archivo\n" -"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en este " -"archivo" +"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en " +"este archivo" #: git-add--interactive.perl:1257 msgid "" @@ -26029,7 +25888,8 @@ msgstr "" "n - no hacer stash a este fragmento\n" "q - quit; no hacer stash a este fragmento ni a ninguno de los restantes\n" "a - hacer stash a este fragmento y a todos los posteriores en el archivo\n" -"d - no hacer stash a este fragmento ni ninguno de los posteriores en el archivo" +"d - no hacer stash a este fragmento ni ninguno de los posteriores en el " +"archivo" #: git-add--interactive.perl:1263 msgid "" @@ -26041,10 +25901,12 @@ msgid "" msgstr "" "y - sacar este fragmento del área de stage\n" "n - no sacar este fragmento del area de stage\n" -"q - quit; no sacar del area de stage este fragmento ni ninguno de los restantes\n" -"a - sacar del area de stage este fragmento y todos los posteriores en el archivo\n" -"d - no sacar del area de stage este fragmento ni ninguno de los posteriores en el " -"archivo" +"q - quit; no sacar del area de stage este fragmento ni ninguno de los " +"restantes\n" +"a - sacar del area de stage este fragmento y todos los posteriores en el " +"archivo\n" +"d - no sacar del area de stage este fragmento ni ninguno de los posteriores " +"en el archivo" #: git-add--interactive.perl:1269 msgid "" @@ -26231,14 +26093,14 @@ msgid "" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" -"status - muestra las rutas con cambios\n" -"update - agrega el estado del árbol de trabajo al set de cambios en " +"status - mostrar las rutas con cambios\n" +"update - agregar el estado del árbol de trabajo al set de cambios en " "el área de stage\n" -"revert - revierte los cambios en el área de stage de regreso a la " +"revert - revertir los cambios en el área de stage de regreso a la " "versión HEAD\n" -"patch - selecciona los hunks y actualiza de forma selectiva\n" +"patch - seleccionar los hunks y actualiza de forma selectiva\n" "diff - mirar la diff entre HEAD y el índice\n" -"add untracked - agrega contenidos de archivos no rastreados al grupo de " +"add untracked - agregar contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" #: git-add--interactive.perl:1828 git-add--interactive.perl:1840 @@ -26298,9 +26160,9 @@ msgid "" "Set sendemail.forbidSendmailVariables to false to disable this check.\n" msgstr "" "fatal: opciones de configuración encontradas para 'sendmail'\n" -"git-send-email está configurado con las opciones sendemail.* - tenga en " -"cuenta la 'e'.\n" -"Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta " +"git-send-email está configurado con las opciones sendemail.* - ten en cuenta " +"la 'e'.\n" +"Establece sendemail.forbidSendmailVariables en false para deshabilitar esta " "verificación.\n" #: git-send-email.perl:530 git-send-email.perl:746 @@ -26394,10 +26256,10 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" "Líneas que comienzan en \"GIT:\" serán eliminadas.\n" -"Considere incluir un diffstat global o una tabla de contenidos\n" +"Considera incluir un diffstat global o una tabla de contenidos\n" "para el parche que estás escribiendo.\n" "\n" -"Limpiar el contenido de body si no deseas mandar un resumen.\n" +"Limpia el contenido de body si no deseas mandar un resumen.\n" #: git-send-email.perl:826 #, perl-format @@ -26562,7 +26424,7 @@ msgstr "Resultado: " msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1709 +#: git-send-email.perl:1708 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" @@ -26587,30 +26449,30 @@ msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1965 +#: git-send-email.perl:1973 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1972 +#: git-send-email.perl:1980 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1976 +#: git-send-email.perl:1984 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falló al cerrar el pipe a '%s'" -#: git-send-email.perl:2006 +#: git-send-email.perl:2014 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:2014 +#: git-send-email.perl:2022 msgid "invalid transfer encoding" msgstr "codificación de transferencia inválida" -#: git-send-email.perl:2051 +#: git-send-email.perl:2059 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26621,12 +26483,12 @@ msgstr "" "%s\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 +#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:2064 +#: git-send-email.perl:2072 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26635,17 +26497,580 @@ msgstr "" "fatal: %s: %d es más grande que 998 caracteres\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:2082 +#: git-send-email.perl:2090 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltando %s con el sufijo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2086 +#: git-send-email.perl:2094 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "¿Realmente deseas mandar %s? [y|N]: " +#, c-format +#~ msgid "" +#~ "The following pathspecs didn't match any eligible path, but they do match " +#~ "index\n" +#~ "entries outside the current sparse checkout:\n" +#~ msgstr "" +#~ "Los siguientes pathspecs no concuerdan con ninguna ruta elegible, pero " +#~ "concuerdan\n" +#~ "con entradas del índice fuera del checkout sparse actual:\n" + +#~ msgid "" +#~ "Disable or modify the sparsity rules if you intend to update such entries." +#~ msgstr "" +#~ "Deshabilitar o modificar las reglas de escasez si tienes intención de " +#~ "actualizar dichas entradas." + +#, c-format +#~ msgid "could not set GIT_DIR to '%s'" +#~ msgstr "no se pudo configurar GIT_DIR a '%s'" + +#, c-format +#~ msgid "unable to unpack %s header with --allow-unknown-type" +#~ msgstr "no es posible desempacar header %s con --allow-unknown-type" + +#, c-format +#~ msgid "unable to parse %s header with --allow-unknown-type" +#~ msgstr "no es posible analizar header %s con --allow-unknown-type" + +#~ msgid "open /dev/null failed" +#~ msgstr "falló al abrir /dev/null" + +#~ msgid "" +#~ "after resolving the conflicts, mark the corrected paths\n" +#~ "with 'git add <paths>' or 'git rm <paths>'\n" +#~ "and commit the result with 'git commit'" +#~ msgstr "" +#~ "tras resolver los conflictos, marca las rutas corregidas\n" +#~ "con 'git add <rutas>' o 'git rm <rutas>'\n" +#~ "y haz un commit del resultado con 'git commit'" + +#~ msgid "open /dev/null or dup failed" +#~ msgstr "falló al abrir /dev/null o hacer dup" + +#~ msgid "attempting to use sparse-index without cone mode" +#~ msgstr "intentando usar sparse-index sin modo cono" + +#~ msgid "unable to update cache-tree, staying full" +#~ msgstr "no es posible actualizar el cache del árbol, manteniendo full" + +#, c-format +#~ msgid "Could not open '%s' for writing." +#~ msgstr "No se pudo abrir '%s' para escritura." + +#, c-format +#~ msgid "could not create archive file '%s'" +#~ msgstr "no se pudo crear el archivo de crónica '%s'" + +#~ msgid "" +#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +#~ msgstr "" +#~ "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]" + +#~ msgid "--bisect-next-check requires 2 or 3 arguments" +#~ msgstr "--bisect-next-check requiere 2 o 3 argumentos" + +#, c-format +#~ msgid "couldn't create a new file at '%s'" +#~ msgstr "no se pudo crear un archivo nuevo en '%s'" + +#, c-format +#~ msgid "git commit-tree: failed to open '%s'" +#~ msgstr "git commit-tree: falló al abrir '%s'" + +#, c-format +#~ msgid "cannot open packfile '%s'" +#~ msgstr "no se puede abrir el archivo de paquete '%s'" + +#~ msgid "cannot store pack file" +#~ msgstr "no se puede guardar el archivo paquete" + +#~ msgid "cannot store index file" +#~ msgstr "no se puede guardar el archivo índice" + +#~ msgid "exclude patterns are read from <file>" +#~ msgstr "excluir patrones leídos de <archivo>" + +#, c-format +#~ msgid "Unknown option for merge-recursive: -X%s" +#~ msgstr "Opción desconocida para merge-recursive: -X%s" + +#, c-format +#~ msgid "unusable todo list: '%s'" +#~ msgstr "lista de pendientes inutilizable: '%s'" + +#~ msgid "git rebase--interactive [<options>]" +#~ msgstr "git rebase--interactive [<opciones>]" + +#~ msgid "rebase merge commits" +#~ msgstr "rebasar commits de fusión" + +#~ msgid "keep original branch points of cousins" +#~ msgstr "mantener puntas de bifurcación originales de los primos" + +#~ msgid "move commits that begin with squash!/fixup!" +#~ msgstr "mover commits que comiencen con squash!/fixup!" + +#~ msgid "sign commits" +#~ msgstr "firmar commits" + +#~ msgid "continue rebase" +#~ msgstr "continuar rebase" + +#~ msgid "skip commit" +#~ msgstr "saltar commit" + +#~ msgid "edit the todo list" +#~ msgstr "editar la lista de pendientes" + +#~ msgid "show the current patch" +#~ msgstr "mostrar el parche actual" + +#~ msgid "shorten commit ids in the todo list" +#~ msgstr "ids de commits cortos en la lista de pendientes" + +#~ msgid "expand commit ids in the todo list" +#~ msgstr "expandir ids de commits en la lista de pendientes" + +#~ msgid "check the todo list" +#~ msgstr "revisar la lista de pendientes" + +#~ msgid "rearrange fixup/squash lines" +#~ msgstr "reordenar líneas fixup/squash" + +#~ msgid "insert exec commands in todo list" +#~ msgstr "insertar comando exec en la lista de pendientes" + +#~ msgid "onto" +#~ msgstr "sobre" + +#~ msgid "restrict-revision" +#~ msgstr "restrict-revision" + +#~ msgid "restrict revision" +#~ msgstr "restringir revisión" + +#~ msgid "squash-onto" +#~ msgstr "squash-onto" + +#~ msgid "squash onto" +#~ msgstr "squash a" + +#~ msgid "the upstream commit" +#~ msgstr "el commit de upstream" + +#~ msgid "head-name" +#~ msgstr "head-name" + +#~ msgid "head name" +#~ msgstr "nombre de head" + +#~ msgid "rebase strategy" +#~ msgstr "estrategia de rebase" + +#~ msgid "strategy-opts" +#~ msgstr "strategy-opts" + +#~ msgid "strategy options" +#~ msgstr "opciones de estrategia" + +#~ msgid "switch-to" +#~ msgstr "cambiar a" + +#~ msgid "the branch or commit to checkout" +#~ msgstr "la rama o commit para hacer checkout" + +#~ msgid "onto-name" +#~ msgstr "sobre-nombre" + +#~ msgid "onto name" +#~ msgstr "sobre nombre" + +#~ msgid "cmd" +#~ msgstr "cmd" + +#~ msgid "the command to run" +#~ msgstr "el comando para ejecutar" + +#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +#~ msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" + +#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +#~ msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" + +#~ msgid "" +#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +#~ msgstr "" +#~ "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-" +#~ "exec'" + +#~ msgid "" +#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> " +#~ "--name <name>" +#~ msgstr "" +#~ "git submodule--helper add-clone [<options>...] --url <url> --path <ruta> " +#~ "--name <nombre>" + +#, c-format +#~ msgid "failed to create file %s" +#~ msgstr "falló al crear el archivo %s" + +#~ msgid "exit immediately after initial ref advertisement" +#~ msgstr "salir inmediatamente tras el anuncio inicial de ref" + +#, c-format +#~ msgid "socket/pipe already in use: '%s'" +#~ msgstr "socket/pipe ya está en uso: '%s'" + +#, c-format +#~ msgid "could not start server on: '%s'" +#~ msgstr "no se pudo iniciar el servidor en: '%s'" + +#~ msgid "could not spawn daemon in the background" +#~ msgstr "no se puede generar demonio en el background" + +#~ msgid "waitpid failed" +#~ msgstr "falló waitpid" + +#~ msgid "daemon not online yet" +#~ msgstr "demonio no está en línea todavía" + +#~ msgid "daemon failed to start" +#~ msgstr "falló al iniciar demonio" + +#~ msgid "waitpid is confused" +#~ msgstr "waitpid está confundido" + +#~ msgid "daemon has not shutdown yet" +#~ msgstr "demonio no se ha apagado todavía" + +#~ msgid "Protocol restrictions not supported with cURL < 7.19.4" +#~ msgstr "Restricción de protocolo no soportada con cURL < 7.19.4" + +#, sh-format +#~ msgid "running $command" +#~ msgstr "ejecutando $command" + +#, sh-format +#~ msgid "'$sm_path' does not have a commit checked out" +#~ msgstr "'$sm_path' no tiene un commit checked out" + +#, sh-format +#~ msgid "Submodule path '$displaypath': '$command $sha1'" +#~ msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" + +#~ msgid "Applied autostash." +#~ msgstr "Autostash aplicado." + +#, sh-format +#~ msgid "Cannot store $stash_sha1" +#~ msgstr "No se puede almacenar $stash_sha1" + +#~ msgid "" +#~ "Applying autostash resulted in conflicts.\n" +#~ "Your changes are safe in the stash.\n" +#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +#~ msgstr "" +#~ "Aplicar autostash resultó en conflictos.\n" +#~ "Tus cambios están seguros en el stash.\n" +#~ "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " +#~ "momento.\n" + +#, sh-format +#~ msgid "Rebasing ($new_count/$total)" +#~ msgstr "Rebasando ($new_count/$total)" + +#~ msgid "" +#~ "\n" +#~ "Commands:\n" +#~ "p, pick <commit> = use commit\n" +#~ "r, reword <commit> = use commit, but edit the commit message\n" +#~ "e, edit <commit> = use commit, but stop for amending\n" +#~ "s, squash <commit> = use commit, but meld into previous commit\n" +#~ "f, fixup <commit> = like \"squash\", but discard this commit's log " +#~ "message\n" +#~ "x, exec <commit> = run command (the rest of the line) using shell\n" +#~ "d, drop <commit> = remove commit\n" +#~ "l, label <label> = label current HEAD with a name\n" +#~ "t, reset <label> = reset HEAD to a label\n" +#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +#~ ". create a merge commit using the original merge commit's\n" +#~ ". message (or the oneline, if no original merge commit was\n" +#~ ". specified). Use -c <commit> to reword the commit message.\n" +#~ "\n" +#~ "These lines can be re-ordered; they are executed from top to bottom.\n" +#~ msgstr "" +#~ "\n" +#~ "Comandos:\n" +#~ "p, pick <commit> = usar commit\n" +#~ "r, reword <commit> = usar commit, pero editar el mensaje de commit\n" +#~ "e, edit <commit> = usar commit, pero parar para un amend\n" +#~ "s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n" +#~ "f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de " +#~ "este commit\n" +#~ "x, exec <commit> = ejecutar comando (el resto de la línea) usando un " +#~ "shell\n" +#~ "d, drop <commit> = eliminar commit\n" +#~ "l, label <label> = poner label al HEAD actual con un nombre\n" +#~ "t, reset <label> = reiniciar HEAD al label\n" +#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +#~ ". crear un commit de fusión usando el mensaje original de\n" +#~ ". fusión (o la línea de oneline, si no se especifica un mensaje\n" +#~ ". de commit). Usa -c <commit> para reescribir el mensaje del " +#~ "commit.\n" +#~ "\n" +#~ "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " +#~ "abajo.\n" + +#, sh-format +#~ msgid "" +#~ "You can amend the commit now, with\n" +#~ "\n" +#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "Once you are satisfied with your changes, run\n" +#~ "\n" +#~ "\tgit rebase --continue" +#~ msgstr "" +#~ "Puedes enmendar el commit ahora, con\n" +#~ "\n" +#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "Una vez que estés satisfecho con los cambios, ejecuta\n" +#~ "\n" +#~ "\tgit rebase --continue" + +#, sh-format +#~ msgid "$sha1: not a commit that can be picked" +#~ msgstr "$sha1: no es un commit que pueda ser cogido" + +#, sh-format +#~ msgid "Invalid commit name: $sha1" +#~ msgstr "Nombre de commit inválido: $sha1" + +#~ msgid "Cannot write current commit's replacement sha1" +#~ msgstr "No se puede escribir el remplazo sha1 del commit actual" + +#, sh-format +#~ msgid "Fast-forward to $sha1" +#~ msgstr "Avance rápido a $sha1" + +#, sh-format +#~ msgid "Cannot fast-forward to $sha1" +#~ msgstr "No se puede realizar avance rápido a $sha1" + +#, sh-format +#~ msgid "Cannot move HEAD to $first_parent" +#~ msgstr "No se puede mover HEAD a $first_parent" + +#, sh-format +#~ msgid "Refusing to squash a merge: $sha1" +#~ msgstr "Rehusando ejecutar squash en fusión: $sha1" + +#, sh-format +#~ msgid "Error redoing merge $sha1" +#~ msgstr "Error al rehacer fusión $sha1" + +#, sh-format +#~ msgid "Could not pick $sha1" +#~ msgstr "No se pudo coger $sha1" + +#, sh-format +#~ msgid "This is the commit message #${n}:" +#~ msgstr "Este es el mensaje del commit #${n}:" + +#, sh-format +#~ msgid "The commit message #${n} will be skipped:" +#~ msgstr "El mensaje del commit #${n} será ignorado:" + +#, sh-format +#~ msgid "This is a combination of $count commit." +#~ msgid_plural "This is a combination of $count commits." +#~ msgstr[0] "Esta es una combinación de $count commit." +#~ msgstr[1] "Esta es la combinación de $count commits." + +#, sh-format +#~ msgid "Cannot write $fixup_msg" +#~ msgstr "No se puede escribir $fixup_msg" + +#~ msgid "This is a combination of 2 commits." +#~ msgstr "Esto es una combinación de 2 commits." + +#, sh-format +#~ msgid "Could not apply $sha1... $rest" +#~ msgstr "No se pudo aplicar $sha1... $rest" + +#, sh-format +#~ msgid "" +#~ "Could not amend commit after successfully picking $sha1... $rest\n" +#~ "This is most likely due to an empty commit message, or the pre-commit " +#~ "hook\n" +#~ "failed. If the pre-commit hook failed, you may need to resolve the issue " +#~ "before\n" +#~ "you are able to reword the commit." +#~ msgstr "" +#~ "No se pudo corregir commit después de seleccionar exitosamente $sha1 ... " +#~ "$rest\n" +#~ "Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-" +#~ "commit\n" +#~ "ha fallado. Si el hook pre-commit falló, es posible que debas resolver el " +#~ "problema antes\n" +#~ "de que seas capaz de reformular el commit." + +#, sh-format +#~ msgid "Stopped at $sha1_abbrev... $rest" +#~ msgstr "Detenido en $sha1_abbrev... $rest" + +#, sh-format +#~ msgid "Cannot '$squash_style' without a previous commit" +#~ msgstr "No se puede '$squash_style' sin un commit previo" + +#, sh-format +#~ msgid "Executing: $rest" +#~ msgstr "Ejecutando: $rest" + +#, sh-format +#~ msgid "Execution failed: $rest" +#~ msgstr "Ejecución fallida: $rest" + +#~ msgid "and made changes to the index and/or the working tree" +#~ msgstr "y hizo cambios al índice y/o al árbol de trabajo" + +#~ msgid "" +#~ "You can fix the problem, and then run\n" +#~ "\n" +#~ "\tgit rebase --continue" +#~ msgstr "" +#~ "Puedes corregir el problema y entonces ejecutar\n" +#~ "\n" +#~ "\tgit rebase --continue" + +#, sh-format +#~ msgid "" +#~ "Execution succeeded: $rest\n" +#~ "but left changes to the index and/or the working tree\n" +#~ "Commit or stash your changes, and then run\n" +#~ "\n" +#~ "\tgit rebase --continue" +#~ msgstr "" +#~ "La ejecución tuvo éxito: $rest\n" +#~ "Pero dejó cambios en el índice y/o en el árbol de trabajo\n" +#~ "Realiza un commit o stash con los cambios y, a continuación, ejecuta\n" +#~ "\n" +#~ "\tgit rebase --continue" + +#, sh-format +#~ msgid "Unknown command: $command $sha1 $rest" +#~ msgstr "Comando desconocido: $command $sha1 $rest" + +#~ msgid "Please fix this using 'git rebase --edit-todo'." +#~ msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." + +#, sh-format +#~ msgid "Successfully rebased and updated $head_name." +#~ msgstr "$head_name rebasado y actualizado satisfactoriamente." + +#~ msgid "Could not remove CHERRY_PICK_HEAD" +#~ msgstr "No se pudo eliminar CHERRY_PICK_HEAD" + +#, sh-format +#~ msgid "" +#~ "You have staged changes in your working tree.\n" +#~ "If these changes are meant to be\n" +#~ "squashed into the previous commit, run:\n" +#~ "\n" +#~ " git commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "If they are meant to go into a new commit, run:\n" +#~ "\n" +#~ " git commit $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "In both cases, once you're done, continue with:\n" +#~ "\n" +#~ " git rebase --continue\n" +#~ msgstr "" +#~ "Tienes cambios en el área de stage de tu árbol de trabajo.\n" +#~ "Si estos cambios están destinados a\n" +#~ "ser aplastados en el commit previo, ejecuta:\n" +#~ "\n" +#~ " git commit --amend $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "Si estos están destinados a ir en un nuevo commit, ejecuta:\n" +#~ "\n" +#~ " git commit $gpg_sign_opt_quoted\n" +#~ "\n" +#~ "En ambos casos, cuando termines, continúa con:\n" +#~ "\n" +#~ " git rebase --continue\n" + +#~ msgid "Error trying to find the author identity to amend commit" +#~ msgstr "" +#~ "Error al tratar de encontrar la identidad del autor para remediar el " +#~ "commit" + +#~ msgid "" +#~ "You have uncommitted changes in your working tree. Please commit them\n" +#~ "first and then run 'git rebase --continue' again." +#~ msgstr "" +#~ "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, " +#~ "confírmalos\n" +#~ "primero y entonces ejecuta 'git rebase --continue' de nuevo." + +#~ msgid "Could not commit staged changes." +#~ msgstr "No se pudo realizar el commit con los cambios en el área de stage." + +#~ msgid "Could not execute editor" +#~ msgstr "No se pudo ejecutar el editor" + +#, sh-format +#~ msgid "Could not checkout $switch_to" +#~ msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" + +#~ msgid "No HEAD?" +#~ msgstr "¿Sin HEAD?" + +#, sh-format +#~ msgid "Could not create temporary $state_dir" +#~ msgstr "No se pudo crear $state_dir temporalmente" + +#~ msgid "Could not mark as interactive" +#~ msgstr "No se pudo marcar como interactivo" + +#, sh-format +#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +#~ msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" +#~ msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" + +#~ msgid "Note that empty commits are commented out" +#~ msgstr "Ten en cuenta que los commits vacíos están comentados" + +#~ msgid "Could not init rewritten commits" +#~ msgstr "No se pudo inicializar los commits reescritos" + +#~ msgid "Cannot rebase: You have unstaged changes." +#~ msgstr "" +#~ "No se puede aplicar rebase: Tienes cambios que no están en el área de " +#~ "stage." + +#~ msgid "Cannot pull with rebase: You have unstaged changes." +#~ msgstr "" +#~ "No se puede aplicar pull con rebase: Tienes cambios que no están en el " +#~ "área de stage." + +#~ msgid "Cannot rebase: Your index contains uncommitted changes." +#~ msgstr "" +#~ "No se puede hacer rebase: Tu índice contiene cambios que no están en un " +#~ "commit." + +#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes." +#~ msgstr "" +#~ "No se puede hacer pull con rebase: Tu índice contiene cambios que no " +#~ "están en un commit." + #~ msgid "unable to write stateless separator packet" #~ msgstr "no es posible escribir un paquete separador sin estado (stateless)" |