diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2018-01-06 02:26:30 (GMT) |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2018-01-06 02:26:30 (GMT) |
| commit | 48f2a745898963733b04075d4cd5d6069225e64e (patch) | |
| tree | 425369745d31d727abfcfa63f9f6ea1924542e49 /po | |
| parent | 4a6b2cb58889ebd7ec9782c70cbf1a82ca2498f9 (diff) | |
| parent | f8038f5b2a20f4527b840623bff691096fbb1ec6 (diff) | |
| download | git-48f2a745898963733b04075d4cd5d6069225e64e.zip git-48f2a745898963733b04075d4cd5d6069225e64e.tar.gz git-48f2a745898963733b04075d4cd5d6069225e64e.tar.bz2 | |
Merge branch '2.16' of https://github.com/ChrisADR/git-po
* '2.16' of https://github.com/ChrisADR/git-po:
l10n: es.po: Update Spanish Translation v2.16.0
Diffstat (limited to 'po')
| -rw-r--r-- | po/es.po | 4049 |
1 files changed, 2129 insertions, 1920 deletions
@@ -1,5 +1,5 @@ # Spanish translations for Git. -# Copyright (C) 2017 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> +# Copyright (C) 2018 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com> # This file is distributed under the same license as the Git package. # Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>, 2017. # @@ -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: 2017-10-17 09:44+0800\n" -"PO-Revision-Date: 2017-11-06 14:10-0500\n" +"POT-Creation-Date: 2017-12-31 10:45+0800\n" +"PO-Revision-Date: 2018-01-04 15:57-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,40 +16,40 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 1.8.7\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "ayuda: %.*s\n" -#: advice.c:86 +#: advice.c:90 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:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:96 +#: advice.c:100 #, 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:104 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -57,23 +57,23 @@ msgstr "" "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" "como sea apropiado, para marcar la resolución y realizar un commit." -#: advice.c:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -112,89 +112,89 @@ msgstr "opción de espacios en blanco no reconocida '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "opción de ignorar espacios en blanco no reconocida '%s'" -#: apply.c:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "--reject y --3way no se pueden utilizar juntas." -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "--cached y --3way no se pueden utilizar juntas." -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "--3way esta fuera de un repositorio" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "--index esta fuera de un repositorio" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "--cached esta fuera de un repositorio" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No se puede preparar una marca de tiempo para la expresión regular %s" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec retorno %d para la entrada: %s" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" "no se puede encontrar el nombre del archivo en el parche en la línea %d" -#: apply.c:966 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: mal git-diff - se esperaba /dev/null, se encontró %s en la línea " "%d" -#: apply.c:972 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: mal git-diff - nuevo nombre de archivo inconsistente en la línea " "%d" -#: apply.c:973 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: mal git-diff - viejo nombre de archivo inconsistente en la línea " "%d" -#: apply.c:978 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: mal git-diff - se esperaba /dev/null en la línea %d" -#: apply.c:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "modo inválido en la línea %d: %s" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "header inconsistente en las líneas %d y %d" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: línea inesperada: %.*s" -#: apply.c:1566 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragmento de parche sin header en la línea %d: %.*s" -#: apply.c:1586 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -209,83 +209,83 @@ msgstr[1] "" "los headers de git diff carecen de información de los nombres de los " "archivos %d cuando los remueven de la ruta principalcomponentes (línea %d)" -#: apply.c:1599 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "el header de git diff carece de información del nombre del archivo (línea %d)" -#: apply.c:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "el nuevo archivo depende de contenidos viejos" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "el archivo eliminado todavía tiene contenido" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "parche corrupto en la línea %d" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "nuevo archivo %s depende en contenidos viejos" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "el archivo borrado %s todavía tiene contenido" -#: apply.c:1865 +#: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** peligro: el archivo %s esta vacío pero no es borrado" -#: apply.c:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "parche binario corrupto en la línea %d: %.*s" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "parche binario no reconocido en la línea %d" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "parche que solo contiene basura en la línea %d" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "no es posible leer el enlace simbólico %s" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "comienzo invalido de línea: '%c'" -#: apply.c:3077 +#: apply.c:3055 #, 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 exito en %d (%d líneas compensadas)." -#: apply.c:3089 +#: apply.c:3067 #, 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:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" @@ -294,23 +294,23 @@ msgstr "" "Mientras se busca:\n" "%.*s" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3125 +#: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" -#: apply.c:3171 +#: apply.c:3149 #, 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:3181 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -318,288 +318,288 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3189 +#: apply.c:3167 #, 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:3207 +#: apply.c:3185 #, 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:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3226 +#: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " "obtuvo %s)" -#: apply.c:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche fallo: %s:%ld" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3426 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simbólico" -#: apply.c:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el indice" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el indice" -#: apply.c:3582 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "el repositorio carece del blob necesario para regresar en un merge de tres-" "vias" -#: apply.c:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-vias...\n" -#: apply.c:3601 apply.c:3605 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Fallo el merge en retroceso de tres-vias...\n" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "parche de remoción deja contenidos en el archivo" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "ruta invalida '%s'" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el indice" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3967 +#: apply.c:3945 #, 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:3972 +#: apply.c:3950 #, 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:3992 +#: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' esta tras un enlace simbólico" -#: apply.c:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4102 +#: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta información del sha1 o es inútil para el submodulo %s" -#: apply.c:4109 +#: apply.c:4087 #, 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:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry fallo para la ruta '%s'" -#: apply.c:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo anadir %s al índice temporal" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "no se puede remover %s del indice" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submodulo %s" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4318 +#: apply.c:4296 #, 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:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "fallo escribir para '%s'" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente" -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "Error interno" -#: apply.c:4548 +#: apply.c:4526 #, 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:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej " -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente" -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "hunk #%d rechazado" -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "no es posible leer el archivo indice" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4886 +#: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco aplastado" msgstr[1] "%d errores de espacios en blanco aplastados" -#: apply.c:4892 apply.c:4907 +#: apply.c:4870 apply.c:4885 #, 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 erroes de espacios en blanco." -#: apply.c:4900 +#: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -608,141 +608,142 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas despues de arreglar los errores de espacios en blanco." -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo indice" -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "ruta" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "remover <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4959 +#: apply.c:4933 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:4963 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" -#: apply.c:4965 +#: apply.c:4939 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:4967 +#: apply.c:4941 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:4969 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:4977 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vias si el parche no aplica" -#: apply.c:4979 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información del índice incrustado" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL " -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "asegure que por lo menos <n> líneas del contexto concuerden" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" msgstr "acción" -#: apply.c:4986 +#: apply.c:4960 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:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5004 +#: apply.c:4978 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:5007 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2254 msgid "root" msgstr "raiz" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -765,7 +766,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concordó con ninguna carpeta" @@ -778,7 +779,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato del archivo" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "prefijo" @@ -786,9 +787,9 @@ msgstr "prefijo" msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -823,7 +824,7 @@ msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "repo" @@ -874,22 +875,22 @@ msgstr "" "Los patrones negativos son ignorados en los atributos de git\n" "Usa '\\!' para comenzar literalmente con exclamación." -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Revisa las comillas en el archivo '%s': %s" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "No podemos bisecar mas!\n" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit valido %s" -#: bisect.c:732 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is bad.\n" @@ -898,7 +899,7 @@ msgstr "" "La base de fisión %s esta mal.\n" "Esto quiere decir que el bug ha sido arreglado enter %s y [%s].\n" -#: bisect.c:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" @@ -907,7 +908,7 @@ msgstr "" "La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:742 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is %s.\n" @@ -916,7 +917,7 @@ msgstr "" "La base de fisión %s es %s.\n" "Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n" -#: bisect.c:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -927,7 +928,7 @@ msgstr "" "git bisect no puede trabajar bien en este caso.\n" "Tal vez confundió la revisión %s y %s?\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -938,36 +939,36 @@ msgstr "" "Asi que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n" "Vamos a continuar de todas maneras." -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisectando: una base de fisión debe ser probada\n" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "fallo leer las refs de bisect" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" @@ -976,7 +977,7 @@ msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -986,7 +987,7 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, 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" @@ -1006,9 +1007,9 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el ultimo commit" -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179 +#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "fallo la configuración del camino de revisión" @@ -1107,33 +1108,33 @@ msgstr "No es posible escribir la configuración de la rama upstream" msgid "Not tracking: ambiguous information for ref %s" msgstr "No rastreando: información ambigua para la referencia %s" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' no es un nombre valido de rama." -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Una rama llamada '%s' ya existe." -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "No se puede forzar la actualización de la rama actual." -#: branch.c:217 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "No se puede configurar el rastreo de información; el punto de partida '%s' " "no es una rama" -#: branch.c:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la rama de upstream solicitada '%s' no existe" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1154,27 +1155,27 @@ msgstr "" "\"git push -u\" para configurar tu upstream predeterminado cuando realizas " "el push." -#: branch.c:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nombre de objeto no valido: '%s'." -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nombre de objeto ambiguo: '%s'." -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Punto de rama no valido: '%s'." -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ya ha sido marcado en '%s'" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD del árbol de trabajo %s no esta actualizada" @@ -1189,9 +1190,8 @@ msgstr "'%s' no se ve como un archivo bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 -#: sequencer.c:2949 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631 +#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" @@ -1235,7 +1235,7 @@ msgstr "rev-list muerio" msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" @@ -1258,8 +1258,8 @@ msgstr "index-pack murio" msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1471 builtin/am.c:2106 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" @@ -1269,7 +1269,7 @@ msgstr "no se puede analizar %s" msgid "%s %s is not a commit!" msgstr "%s %s no es un commit!" -#: commit.c:1517 +#: commit.c:1524 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" @@ -1280,170 +1280,175 @@ msgstr "" "variable de configuración i18n.commitencoding para la codificación que usa " "su proyecto.\n" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" "la configuración relativa incluye condicionales que deben venir de archivos" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "mala línea de config %d en el blob %s" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "mala línea de config %d en el archivo %s" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "mala línea de config %d en la entrada standard" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "mala línea de config %d en el submodulo-blob %s" -#: config.c:737 +#: config.c:736 #, 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:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "mala línea de config %d en %s" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "fuera de rango" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "unidad invalida" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "mal valor de config numérica '%s' para '%s': %s" -#: config.c:880 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s" -#: config.c:883 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s" -#: config.c:886 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s" -#: config.c:889 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en el submodulo-blob %s: %s" -#: config.c:892 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s" -#: config.c:895 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en %s: %s" -#: config.c:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "fallo al expandir el directorio de usuario en: '%s'" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, 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:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "mala compresión zlib en nivel %d" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo invalido de creación de objetos: %s" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" msgstr "mala compresión pack en el nivel %d" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "Invalido %s: '%s'" -#: config.c:2130 +#: config.c:2136 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'" -#: config.c:2156 +#: config.c:2162 #, 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:2167 +#: config.c:2187 #, 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:2169 +#: config.c:2189 #, 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:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s fallo" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "El remoto se colgó en el contacto inicial" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1574,7 +1579,7 @@ msgstr[1] "hace %<PRIuMAX> años" msgid "failed to read orderfile '%s'" msgstr "fallo al leer orden de archivos '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "Realizando una detección de cambios de nombre inexacta" @@ -1606,7 +1611,7 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1615,20 +1620,20 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" msgstr "digg externo murió, deteniendo en %s" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1637,22 +1642,22 @@ msgstr "" "Fallo al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fallo al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5505 +#: diff.c:5446 msgid "inexact rename detection was skipped due to too many files." msgstr "" "detección de cambio de nombre inexacta fue saltada por haber muchos archivos" -#: diff.c:5508 +#: diff.c:5449 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber muchos archivos" -#: diff.c:5511 +#: diff.c:5452 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1660,29 +1665,34 @@ msgstr "" "tal vez quiera configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" msgstr "fallo al conseguir la información y nombre del kernel" -#: dir.c:2102 +#: dir.c:2219 msgid "Untracked cache is disabled on this system or location." msgstr "Untracked cache esta desactivado en este sistema o ubicación" -#: dir.c:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:2915 +#: dir.c:3032 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" -#: entry.c:176 +#: editor.c:61 +#, 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:177 msgid "Filtering content" msgstr "Filtrando contenido" -#: entry.c:433 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" @@ -1753,7 +1763,7 @@ msgstr "commit inválido %s" msgid "giving up" msgstr "rindiendose" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "listo" @@ -1767,104 +1777,104 @@ msgstr "se obtuvo %s (%d) %s" msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "error de protocolo: mal paquete de header" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "%s fallo" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "Servidor no soporta clientes superficiales" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "Servidor soporta ulti_ack_detailed" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "Servidor soporta no-done" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "Servidor soporta multi_ack" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "Servidor soporta side-band-64k" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "Servidor soporta side-band" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servidor soporta allow-tip-sha1-in-want" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servidor soporta allow-reachable-sha1-in-want" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "Servidor soporta ofs-delta" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "Servidor no soporta --shalow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Servidor no soporta --shalow-exclude" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "Servidor no soporta --deepen" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch fallo" -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servidor no permite solicitudes de objetos inadvertidos %s" @@ -1887,17 +1897,17 @@ msgstr "fallo al escribir la firma separada para '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color invalido '%.*s' en log.graphColors" -#: grep.c:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "fallo al marcar '%s'" -#: grep.c:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -1966,12 +1976,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git versión [<opciones>]" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -2044,6 +2054,15 @@ msgstr "el nombre consiste solo de caracteres no permitidos: %s" msgid "invalid date format: %s" msgstr "formato de fecha invalido: %s" +#: list-objects-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "no se pueden combinar múltiples tipos de objeto filtro" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "expresión filter-spec inválida '%s'" + #: lockfile.c:151 #, c-format msgid "" @@ -2073,8 +2092,8 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "failed to read the cache" msgstr "fallo al leer la cache" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "no es posible escribir el archivo indice" @@ -2270,7 +2289,7 @@ msgstr "Saltado %s (fusionado como existente)" msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "submódulo" @@ -2292,48 +2311,48 @@ msgstr "archivo/directorio" msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, 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:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:1954 +#: merge-recursive.c:1955 msgid "Already up to date!" msgstr "¡Ya está actualizado!" -#: merge-recursive.c:1963 +#: merge-recursive.c:1964 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:2060 +#: merge-recursive.c:2061 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:2073 +#: merge-recursive.c:2074 #, 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:2112 +#: merge-recursive.c:2113 msgid "merge returned no commit" msgstr "la fusión no devolvió ningun commit" -#: merge-recursive.c:2175 +#: merge-recursive.c:2176 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -2506,15 +2525,7 @@ msgstr "'%s' (nemotecnico: '%c')" msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec no soportado por este comando: %s" -#: pathspec.c:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" -"los strings vacíos como pathspecs serán inválidas en las próximas versiones. " -"por favor use . si quería hacer coincidir todas las rutas" - -#: pathspec.c:595 +#: pathspec.c:592 #, 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" @@ -2523,7 +2534,7 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2532,7 +2543,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2541,52 +2552,52 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "no es posible remover el vinculo: %s" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "No sepudo abrir '%s' para escritura" -#: refs.c:1792 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "no se pudo remover la referencia %s" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "desaparecido" @@ -2605,157 +2616,157 @@ msgstr "detrás %d" msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:105 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:107 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:127 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "valor entero esperado refname:lstrip=%s" -#: ref-filter.c:131 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "valor entero esperado refname:rstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:173 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:180 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no toma ningún argumento" -#: ref-filter.c:198 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:221 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:223 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:236 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positivo esperado objectname:short=%s" -#: ref-filter.c:240 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argumento: %s no reconocido %%(objectname)" -#: ref-filter.c:267 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:279 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:283 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:289 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:293 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:308 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:398 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "nombre malformado de campo: %.*s" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:536 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:596 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:598 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: átomo %%(then) usado mas de una vez" -#: ref-filter.c:600 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:626 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:628 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then) " -#: ref-filter.c:630 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: átomo %%(else) usado mas de una vez" -#: ref-filter.c:643 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:698 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "formato de cadena malformado %s" -#: ref-filter.c:1283 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "(no hay rama, rebasando %s)" -#: ref-filter.c:1286 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(no hay rama, comenzando bisectado en %s)" @@ -2763,7 +2774,7 @@ msgstr "(no hay rama, comenzando bisectado en %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD desacoplado en %s)" @@ -2771,154 +2782,152 @@ msgstr "(HEAD desacoplado en %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD desacoplado de %s)" -#: ref-filter.c:1305 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "(sin rama)" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "objeto %s faltante para %s" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:1788 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "objeto malformado en '%s'" -#: ref-filter.c:1855 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:1860 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: ref-filter.c:2122 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2216 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto malformado %s" -#: remote.c:750 +#: remote.c:780 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "Error interno" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1699 +#: remote.c:1729 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" -#: remote.c:1714 +#: remote.c:1744 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" -#: remote.c:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1737 +#: remote.c:1767 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino unico" -#: remote.c:2076 +#: remote.c:2106 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "tu rama esta basada en '%s', pero upstream ha desaparecido.\n" -#: remote.c:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:2087 +#: remote.c:2117 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n" msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" -#: remote.c:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" -"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada " -"rápido.\n" +"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada rápido.\n" msgstr[1] "" -"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada " -"rápido.\n" +"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2933,27 +2942,37 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2117 +#: remote.c:2147 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" -#: revision.c:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2259 +#: revision.c:2271 #, 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:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" +#: run-command.c:1188 +#, 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 ifnorado porque no ha sido configurado como ejecutable.\n" +"Puedes desactivar esta advertencias con `git config advice.ignoredHook " +"false`." + #: send-pack.c:151 #, c-format msgid "unable to parse remote unpack status: %s" @@ -3023,13 +3042,13 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1715 #, c-format msgid "could not lock '%s'" msgstr "No se pudo bloquear '%s'" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734 +#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "No se pudo escribir en '%s'" @@ -3039,13 +3058,13 @@ msgstr "No se pudo escribir en '%s'" msgid "could not write eol to '%s'" msgstr "No se pudo escribir EOL en '%s'" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722 #, c-format msgid "failed to finalize '%s'." msgstr "Fallo al finalizar '%s'." -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "No se pudo leer '%s'" @@ -3067,20 +3086,20 @@ msgstr "%s: avance rápido" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:493 +#: sequencer.c:496 msgid "could not resolve HEAD commit\n" msgstr "No se pudo resolver el commit de HEAD\n" -#: sequencer.c:513 +#: sequencer.c:516 msgid "unable to update cache tree\n" msgstr "no es posible actualizar el árbol de la caché\n" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3110,17 +3129,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format msgid "could not parse commit %s\n" msgstr "No se pudo analizar commit %s.\n" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format msgid "could not parse parent commit %s\n" msgstr "No se pudo analizar el commit padre %s\n" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -3131,7 +3150,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -3142,230 +3161,230 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2742 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "este es el mensaje del commit #%d:" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d sera saltado: " -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." msgstr "tu archivo índice no esta fusionado." -#: sequencer.c:975 +#: sequencer.c:986 #, 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 entrego la opción -m." -#: sequencer.c:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:987 +#: sequencer.c:998 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "línea principal especificada pero el commit %s no es una fusión." -#: sequencer.c:993 +#: sequencer.c:1004 #, 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:1014 +#: sequencer.c:1025 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1088 sequencer.c:1864 #, c-format msgid "could not rename '%s' to '%s'" msgstr "No se puede renombrar '%s' a '%s'" -#: sequencer.c:1128 +#: sequencer.c:1139 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1129 +#: sequencer.c:1140 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1171 +#: sequencer.c:1182 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:1181 +#: sequencer.c:1192 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: fallo al leer el índice" -#: sequencer.c:1188 +#: sequencer.c:1198 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: fallo al refrescar el índice" -#: sequencer.c:1308 +#: sequencer.c:1319 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:1316 +#: sequencer.c:1327 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636 +#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853 #, c-format msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: sequencer.c:1361 +#: sequencer.c:1372 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:1363 +#: sequencer.c:1374 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilízale: '%s'" -#: sequencer.c:1368 +#: sequencer.c:1379 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:1379 +#: sequencer.c:1390 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:1381 +#: sequencer.c:1392 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick" -#: sequencer.c:1448 +#: sequencer.c:1459 #, c-format msgid "invalid key: %s" msgstr "llave invalida: %s" -#: sequencer.c:1451 +#: sequencer.c:1462 #, c-format msgid "invalid value for %s: %s" msgstr "valor invalido para %s: %s" -#: sequencer.c:1517 +#: sequencer.c:1528 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:1555 +#: sequencer.c:1566 msgid "a cherry-pick or revert is already in progress" msgstr "un cherry-pick o rever ya esta en progreso" -#: sequencer.c:1556 +#: sequencer.c:1567 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1559 +#: sequencer.c:1570 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s' " -#: sequencer.c:1574 +#: sequencer.c:1585 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1643 sequencer.c:2227 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:1634 +#: sequencer.c:1645 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1647 sequencer.c:1682 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:1668 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:1659 +#: sequencer.c:1670 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:1660 +#: sequencer.c:1671 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:1666 +#: sequencer.c:1677 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto" -#: sequencer.c:1677 +#: sequencer.c:1688 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!" -#: sequencer.c:1818 sequencer.c:2109 +#: sequencer.c:1829 sequencer.c:2125 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1869 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:1874 +#: sequencer.c:1888 msgid "could not read index" msgstr "no se pudo leer indice" -#: sequencer.c:1879 +#: sequencer.c:1893 #, c-format msgid "" "execution failed: %s\n" @@ -3380,11 +3399,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1885 +#: sequencer.c:1899 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:1891 +#: sequencer.c:1905 #, c-format msgid "" "execution succeeded: %s\n" @@ -3401,17 +3420,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1948 +#: sequencer.c:1964 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:1960 +#: sequencer.c:1976 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1979 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3423,57 +3442,57 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:2045 +#: sequencer.c:2061 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:2087 +#: sequencer.c:2103 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:2117 +#: sequencer.c:2133 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2138 sequencer.c:2739 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:2129 +#: sequencer.c:2145 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:2136 +#: sequencer.c:2152 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:2220 +#: sequencer.c:2236 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:2225 +#: sequencer.c:2241 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede remover CHERRY_PICK_HEAD" -#: sequencer.c:2234 +#: sequencer.c:2250 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:2236 +#: sequencer.c:2252 #, c-format msgid "invalid file: '%s'" msgstr "archivo invalido: '%s'" -#: sequencer.c:2238 +#: sequencer.c:2254 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:2241 +#: sequencer.c:2257 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3484,50 +3503,45 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:2251 +#: sequencer.c:2267 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:2331 +#: sequencer.c:2347 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:2335 +#: sequencer.c:2351 #, c-format msgid "%s: bad revision" msgstr "%s: mala revision" -#: sequencer.c:2368 +#: sequencer.c:2384 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:2471 +#: sequencer.c:2489 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:2474 +#: sequencer.c:2492 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:2510 +#: sequencer.c:2526 sequencer.c:2561 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilízale: '%s'" -#: sequencer.c:2516 -#, c-format -msgid "unable to open '%s' for writing" -msgstr "No se pudo abrir '%s' para escritura" - -#: sequencer.c:2561 +#: sequencer.c:2609 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." -#: sequencer.c:2641 +#: sequencer.c:2689 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3536,7 +3550,7 @@ msgstr "" "Peligro: algunos commits pueden haber sido botados de forma accidental.\n" "Commits botados (empezando con el mas nuevo):\n" -#: sequencer.c:2648 +#: sequencer.c:2696 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3554,7 +3568,7 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: sequencer.c:2660 +#: sequencer.c:2708 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3565,31 +3579,21 @@ msgstr "" "rebase --continue'.\n" "O se puede abortar el rebase con 'git rebase --abort'.\n" -#: sequencer.c:2708 -#, c-format -msgid "could not parse commit '%s'" -msgstr "No se pudo analizar commit '%s'" - -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:775 +#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" -#: sequencer.c:2756 +#: sequencer.c:2769 #, c-format -msgid "could not truncate '%s'" -msgstr "no se pudo truncar '%s'" +msgid "could not parse commit '%s'" +msgstr "No se pudo analizar commit '%s'" -#: sequencer.c:2848 +#: sequencer.c:2891 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." -#: sequencer.c:2953 -#, c-format -msgid "could not finish '%s'" -msgstr "no se pudo finalizar '%s'" - #: setup.c:171 #, c-format msgid "" @@ -3623,35 +3627,35 @@ msgstr "" "Use '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:806 +#: setup.c:811 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" "No es un repositorio git (ni ninguno de los directorios superiores): %s" -#: setup.c:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "No se puede cambiar a '%s'" -#: setup.c:1077 +#: setup.c:1083 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3661,7 +3665,7 @@ msgstr "" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3670,43 +3674,43 @@ 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." -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: sha1_file.c:554 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "repositorio de referencia '%s' como un checkout vinculado no es soportado " "todavía." -#: sha1_file.c:560 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: sha1_file.c:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "SHA1 %s corta es ambigua" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "Los candidatos son:" -#: sha1_name.c:590 +#: sha1_name.c:693 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3729,70 +3733,70 @@ msgstr "" "examine estas refs y tal vez bórrelas. Silencie este mensaje \n" "ejecutando \"git config advice.objectNameWarning false\"" -#: submodule.c:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero" -#: submodule.c:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s" -#: submodule.c:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No se pudo actualizar la entrada %s de .gitmodules" -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "No se pudo remover la entrada %s de .gitmodules" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "falló realizar stage a los .gitmodules actualizados" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "en el submódulo no poblado '%s'" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" -#: submodule.c:799 +#: submodule.c:833 #, 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:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "Fallo al resolver HEAD como un ref valido." -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1442 +#: submodule.c:1508 #, 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:1455 +#: submodule.c:1521 #, 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:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3800,18 +3804,18 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3822,20 +3826,20 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "No pudo recursar en el submódulo '%s'" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: string de ruta recibido no concuerda con cwd?" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree retornó un código %d inesperado" @@ -3903,17 +3907,17 @@ msgstr "no se pudo abrir el archivo temporal" msgid "could not rename temporary file to %s" msgstr "no se pudo renombrar el archivo temporal a %s" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opción inválida '%s'" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3922,7 +3926,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -3949,11 +3953,11 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "Abortando." -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "No se pudo leer la referencia %s" @@ -3974,7 +3978,7 @@ msgstr "nombre de archivo vacío en la entrada de árbol" msgid "too-short tree file" msgstr "archivo de árbol muy corto" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3985,7 +3989,7 @@ msgstr "" "%%sPor favor, confirma tus cambios o salvaguárdalos antes de intercambiar " "ramas." -#: unpack-trees.c:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3995,7 +3999,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4005,7 +4009,7 @@ msgstr "" "fusionar:\n" "%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar." -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4015,7 +4019,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4024,7 +4028,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n" "%%sPor favor, confirma tus cambios o salvaguárdalos antes de %s." -#: unpack-trees.c:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4033,7 +4037,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4043,7 +4047,7 @@ msgstr "" "seguimiento en ellos:\n" "%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4053,7 +4057,7 @@ msgstr "" "removidos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4063,7 +4067,7 @@ msgstr "" "al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4073,7 +4077,7 @@ msgstr "" "removidos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4083,7 +4087,7 @@ msgstr "" "al fusionar:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4093,7 +4097,7 @@ msgstr "" "removidos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4103,7 +4107,7 @@ msgstr "" "removidos al ejecutar %s:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4114,7 +4118,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4125,7 +4129,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4135,7 +4139,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4145,7 +4149,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4155,7 +4159,7 @@ msgstr "" "sobrescritos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4165,12 +4169,12 @@ msgstr "" "por %s:\n" "%%s" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4180,7 +4184,7 @@ msgstr "" "actualizadas:\n" "%s" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4191,7 +4195,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4202,7 +4206,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" @@ -4211,12 +4215,12 @@ msgstr "" "No se puede actualizar le submodulo:\n" "%s" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "Abortando\n" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "Revisando archivos" @@ -4259,8 +4263,8 @@ msgstr "fallo al leer '%s'" msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" @@ -4274,16 +4278,6 @@ msgstr "no es posible acceder '%s'" msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "no se pudo escribir en %s" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "no se pudo cerrar %s" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "rutas no fusionadas:" @@ -4311,11 +4305,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (usa \"git rm <file>...\" para marcar la resolución)" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "Cambios a ser confirmados:" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "Cambios no rastreados para el commit:" @@ -4421,22 +4415,22 @@ msgstr "contenido modificado, " msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:819 +#: wt-status.c:824 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Tu stash actualmente tine %d entrada" msgstr[1] "Tu stash actualmente tiene %d entradas" -#: wt-status.c:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "Submodulos cambiados pero no actualizados:" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "Submodulos cambiados listos para realizar commit:" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4444,107 +4438,107 @@ msgstr "" "No modifique o borre la línea de encima.\n" "Todo lo que este por abajo será removido." -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "tienes rutas no fusionadas" -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregla los conflictos y corre \"git commit\"" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" para abortar la fusion)" -#: wt-status.c:1058 +#: wt-status.c:1063 msgid "All conflicts fixed but you are still merging." msgstr "Todos los conflictos resueltos pero sigues fusionando." -#: wt-status.c:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" para concluir la fusión)" -#: wt-status.c:1071 +#: wt-status.c:1076 msgid "You are in the middle of an am session." msgstr "Estas en medio de una sesión am." -#: wt-status.c:1074 +#: wt-status.c:1079 msgid "The current patch is empty." msgstr "El parche actual esta vacío." -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregla los conflictos y luego corre \"git am --continue\"" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" para saltar este parche)" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" para restaurar la rama original)" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo no esta presente." -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "No se realizaron los comandos." -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "El ultimo comando realizado (%d comando realizado):" msgstr[1] "Los ultimos comandos realizados (%d comandos realizados):" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr " (ver mas en el archivo %s)" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "No quedan mas comandos." -#: wt-status.c:1238 +#: wt-status.c:1243 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Siguiente comando a realizar (%d comando restante)" msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes=" -#: wt-status.c:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (usa \"git rebase --edit-todo\" para ver y editar)" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Estas aplicando un rebase de la rama '%s' en '%s." -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "Estas aplicando un rebase." -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" para omitir este parche)" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (usa \"git rebase --abort\" para volver a tu rama original)" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4552,128 +4546,128 @@ msgstr "" "Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "Estas dividiendo un commit durante un rebase." -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --" "continue\")" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Estas editando un commit mientras se aplica un rebase de la rama '%s' en " "'%s'." -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "Estas editando un commit durante un rebase." -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" para enmendar el commit actual)" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una vez que estés satisfecho con tus " "cambios)" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Estas realizando un cherry-picking en el commit %s." -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" -#: wt-status.c:1334 +#: wt-status.c:1339 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" -#: wt-status.c:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "Estas revirtiendo el commit %s." -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" -#: wt-status.c:1364 +#: wt-status.c:1369 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estas aplicando un bisect, comenzando en la rama '%s'." -#: wt-status.c:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "Estas aplicando un bisect." -#: wt-status.c:1371 +#: wt-status.c:1376 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" para volver a la rama original)" -#: wt-status.c:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "rebase interactivo en progreso; en" -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "rebase en progreso; en" -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "HEAD desacoplada en" -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "HEAD desacoplada de" -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "Confirmación inicial" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "No hay commits todavia" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4684,97 +4678,96 @@ msgstr "" "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n" "nuevos archivos usted mismo (vea 'git help status')." -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "Archivos no rastreados no son mostrados %s" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1646 +#: wt-status.c:1651 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a" -"\")\n" +"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"no hay nada agregado al commit pero hay archivos sin seguimiento " -"presentes (usa \"git add\" para hacerles seguimiento)\n" +"no hay nada agregado al commit pero hay archivos sin seguimiento presentes " +"(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1655 +#: wt-status.c:1660 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " "presentes\n" -#: wt-status.c:1658 +#: wt-status.c:1663 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " "hacerles seguimiento)\n" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1664 +#: wt-status.c:1669 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" -#: wt-status.c:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "detras" -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "adelante" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." @@ -4788,123 +4781,127 @@ msgstr "fallo al desvincular '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opción>] [--] <especificación-de-ruta>..." -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" msgstr "fallo la actualización de carpetas" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "remover '%s'\n" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "No se pudo leer el indice" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "fallo la edición del parche" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "Parche vacío. Abortado." -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:251 +#: builtin/add.c:271 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:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "dry run ( ejecución en seco)" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "renormalizar EOL de los archivos rastreados (implica -u)" + +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "grabar solo el hecho de que la ruta será agregada después" -#: builtin/add.c:280 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:283 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)" -#: builtin/add.c:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el indice" -#: builtin/add.c:286 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" -#: builtin/add.c:287 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" -#: builtin/add.c:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "sobrescribir el bit ejecutable de los archivos listados" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4935,47 +4932,47 @@ msgstr "" "\n" "Vea \"git help submodule\" para mas información." -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:351 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Use -f si realmente quiere agregarlos.\n" -#: builtin/add.c:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "fallo al agregar archivos" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:403 +#: builtin/add.c:424 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:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Tal vez quiso decir 'git add .'?\n" -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 -#: builtin/submodule--helper.c:243 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" msgstr "archivo índice corrompido" @@ -5002,86 +4999,86 @@ msgstr "Fallo al copiar notas de '%s' a '%s'" msgid "fseek failed" msgstr "fall de fseek" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "Solo un parche StGIT puede ser aplicado de una vez " -#: builtin/am.c:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "timestamp invalido" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "línea Date invalida" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "offset de zona horaria inválido" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "fallo al crear el directorio '%s'" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "Fallo al dividir parches" -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "no es posible escribir en el archivo indice" -#: builtin/am.c:1193 +#: builtin/am.c:1197 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"." -#: builtin/am.c:1194 +#: builtin/am.c:1198 #, 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:1195 +#: builtin/am.c:1199 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" "\"." -#: builtin/am.c:1302 +#: builtin/am.c:1306 msgid "Patch is empty." msgstr "El parche esta vacío." -#: builtin/am.c:1368 +#: builtin/am.c:1372 #, c-format msgid "invalid ident line: %.*s" msgstr "sangría no válida: %.*s" -#: builtin/am.c:1390 +#: builtin/am.c:1394 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: builtin/am.c:1584 +#: builtin/am.c:1587 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:1586 +#: builtin/am.c:1589 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1605 +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5089,37 +5086,37 @@ msgstr "" "Editaste el parche a mano?\n" "No aplica a blobs guardados en su índice." -#: builtin/am.c:1611 +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediento para parchar base y fusión de 3-vías..." -#: builtin/am.c:1636 +#: builtin/am.c:1639 msgid "Failed to merge in the changes." msgstr "Falló al fusionar en los cambios." -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1663 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: builtin/am.c:1667 +#: builtin/am.c:1670 msgid "applying to an empty history" msgstr "aplicando a un historial vacio" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "fallo al escribir el objeto commit" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1716 builtin/am.c:1720 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe" -#: builtin/am.c:1733 +#: builtin/am.c:1736 msgid "cannot be interactive without stdin connected to a terminal." msgstr "no se puede ser interactivo sin stdin conectado a un terminal" -#: builtin/am.c:1738 +#: builtin/am.c:1741 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -5127,35 +5124,35 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1751 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:1798 +#: builtin/am.c:1801 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1841 builtin/am.c:1913 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1854 +#: builtin/am.c:1857 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1862 +#: builtin/am.c:1865 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche fallo en %s %.*s" -#: builtin/am.c:1868 +#: builtin/am.c:1871 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "La copia del parche que fallido se encuentra en: %s" -#: builtin/am.c:1913 +#: builtin/am.c:1916 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5165,7 +5162,7 @@ msgstr "" "Si no hay nada en el área de stage, las posibilidad es que algo mas\n" "ya haya introducido el mismo cambio; tal vez quieras omitir este parche." -#: builtin/am.c:1920 +#: builtin/am.c:1923 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5178,17 +5175,17 @@ msgstr "" "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en " "él." -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332 #: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:2081 +#: builtin/am.c:2082 msgid "failed to clean index" msgstr "fallo al limpiar el indice" -#: builtin/am.c:2116 +#: builtin/am.c:2117 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5196,134 +5193,134 @@ msgstr "" "Parece haber movido HEAD desde el último fallo 'am'.\n" "No rebobinando a ORIG_HEAD " -#: builtin/am.c:2179 +#: builtin/am.c:2180 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "valor invalido para --patch-format: %s" -#: builtin/am.c:2212 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2213 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2219 +#: builtin/am.c:2220 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2221 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2223 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permitir retroceso en fusión de 3-vías si es necesario" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2226 +#: builtin/am.c:2227 msgid "add a Signed-off-by line to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2229 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2231 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2233 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2235 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2237 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2240 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2243 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254 -#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266 -#: builtin/am.c:2272 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "formato" -#: builtin/am.c:2269 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2277 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2283 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "restaurar la rama original y abortar la operación de parchado." -#: builtin/am.c:2290 +#: builtin/am.c:2291 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2295 +#: builtin/am.c:2296 msgid "GPG-sign commits" msgstr "commits con firma GPG" -#: builtin/am.c:2298 +#: builtin/am.c:2299 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2316 +#: builtin/am.c:2317 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." @@ -5331,16 +5328,16 @@ msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" "será removida. Por favor no la use más." -#: builtin/am.c:2323 +#: builtin/am.c:2324 msgid "failed to read the index" msgstr "fallo al leer el indice" -#: builtin/am.c:2338 +#: builtin/am.c:2339 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe en el mbox dado." -#: builtin/am.c:2362 +#: builtin/am.c:2363 #, c-format msgid "" "Stray %s directory found.\n" @@ -5349,7 +5346,7 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2368 +#: builtin/am.c:2369 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." @@ -5387,18 +5384,69 @@ msgstr "git archive: error de protocolo" msgid "git archive: expected a flush" msgstr "git archive: se esperaba un flush" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "'%s' no es un término válido." + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "no se puede usar el comando nativo '%s' como un término" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "no se puede cambiar el significado del término '%s'" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "por favor use dos términos diferentes" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "no se pudo abrir el archivo BISECT_TERMS" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "escribe los términos a .git/BISECT_TERMS" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "limpiar el estado de bisección" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "revisar por revs esperados" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "--write-terms requiere dos argumentos" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state no requiere argumentos" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" @@ -5655,55 +5703,55 @@ msgstr "Rama %s está siendo rebasada en %s" msgid "Branch %s is being bisected at %s" msgstr "Rama %s está siendo bisecada en %s" -#: builtin/branch.c:470 +#: builtin/branch.c:471 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:472 +#: builtin/branch.c:473 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:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nombre de rama invalido: '%s'" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "Cambio de nombre de rama fallido" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "Copiado de rama fallido" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" -msgstr "Copiada una rama mal llamada '%s' afuera" +msgid "Created a copy of a misnamed branch '%s'" +msgstr "Copia creada de la rama malnombrada '%s' " -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Rama mal llamada '%s' renombrada" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, 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:528 +#: builtin/branch.c:535 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:530 +#: builtin/branch.c:537 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:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5714,184 +5762,184 @@ msgstr "" "%s\n" "Las líneas que comiencen con '%c' serán removidas.\n" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "Opciones genericas" -#: builtin/branch.c:581 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "mostrar hash y tema, dar dos veces para rama upstream" -#: builtin/branch.c:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "Suprimir mensajes informativos" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "configurando modo tracking (mirar git-pull(1))" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "cambiar info de upstream" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "Desconfigurando la info de upstream" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "usar salida con colores" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "actuar en ramas de traqueo remoto" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "mostrar solo ramas que contienen el commit" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "mostrar solo ramas que no contienen el commit" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "Acciones específicas de git-branch:" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "listar ramas de remote-tracking y locales" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "borrar ramas totalmente fusionadas" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "borar rama (incluso si no esta fusionada)" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "mover/renombrar una rama y su reflog" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "mover/renombrar una rama, incluso si el destino existe" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "copiar una rama y su reflog" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "copiar una rama, incluso si el objetivo existe" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "listar nombres de ramas" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "crea el reflog de la rama" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "edita la descripción de la rama" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "fuerza la creación,movimiento/renombrado,borrado" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "muestra solo ramas que han sido fusionadas" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "muestra solo ramas que no han sido fusionadas" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "clave" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "nombre del campo por el cuál ordenar" -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:408 msgid "object" msgstr "objeto" -#: builtin/branch.c:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "imprimir sólo las ramas del objeto" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "HEAD no encontrado abajo de refs/heads!" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripción al HEAD desacoplado" -#: builtin/branch.c:713 +#: builtin/branch.c:723 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:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aún no hay commits en la rama '%s'." -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operación de copiado" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operación de renombrado" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -5899,41 +5947,37 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:779 +#: builtin/branch.c:789 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:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Rama '%s' no tiene información de upstream" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "No tiene sentido crear 'HEAD' manualmente" - -#: builtin/branch.c:803 +#: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama" -#: builtin/branch.c:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5998,7 +6042,7 @@ msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, ejecuta filters en el contenido del objeto" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "blob" @@ -6055,7 +6099,7 @@ msgstr "leer nombres de archivos de stdin" msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -6112,162 +6156,162 @@ msgstr "contactos no especificados" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opciones>] [--] [<archivo>...]" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "stage tiene que estar entre 1 y 3 o all" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "revisar todos los archivos en el indice" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "forzar sobreescritura de los archivos existentes" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "" "no hay advertencias para los archivos existentes y los archivos no están en " "el índice" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "no revisar archivos nuevos" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "actualizar información de estado en el archivo índice" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "leer lista de rutas desde standard input" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "string" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "cuando cree archivos, anteponer <string>" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "copiar los archivos del stage nombrado" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opciones>] <rama>" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..." -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "ruta '%s' no tiene nuestra versión" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "ruta '%s' no tiene su versión" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "no se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "necesita resolver su índice actual primero" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6290,7 +6334,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6317,160 +6361,160 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "error interno en camino de reivison" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 msgid "You are on a branch yet to be born" msgstr "Estas en una rama por nacer" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "referencia invalida: %s" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, 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:1154 builtin/checkout.c:1156 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 -#: builtin/worktree.c:348 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 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:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 msgid "do not check if another worktree is holding the given ref" msgstr "no revise si otro árbol de trabajo contiene la ref entregada" -#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "Falta nombre de rama; prueba -b" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" msgstr "Especificación de ruta invalida" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, 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:1281 +#: builtin/checkout.c:1246 #, 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:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6509,7 +6553,7 @@ msgstr "Se saltara repositorio %s\n" msgid "failed to remove %s" msgstr "fallo al borrar %s" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6522,7 +6566,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6543,38 +6587,38 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Ahh (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "Input ignora los patrones >> " -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "Borrar %s [y/N]? " -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6592,63 +6636,64 @@ msgstr "" "help - esta ventana\n" "? - ayuda para selección de opciones" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "Ahora que" -#: builtin/clean.c:831 +#: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Se removerá el siguiente objeto" msgstr[1] "Se removerán los siguientes objetos:" -#: builtin/clean.c:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "No hay mas archivos para limpiar, saliendo." -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "no imprimir nombres de archivos borrados" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "forzar" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "limpieza interactiva" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "borrar directorios completos" -#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 -#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "patron" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "agregar <patrón> para ignorar reglas" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "borrar archivos ignorados, tambien" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "borrar solo archivos ignorados" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "-x y -X no pueden ser usadas juntas" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6656,7 +6701,7 @@ msgstr "" "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6712,8 +6757,8 @@ msgstr "directorio-template" msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "repositorio de referencia" @@ -6737,8 +6782,8 @@ msgstr "checkout <rama> en lugar de HEAD remota" msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "profundidad" @@ -6746,7 +6791,7 @@ msgstr "profundidad" msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "tiempo" @@ -6755,11 +6800,11 @@ msgstr "tiempo" msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "revision" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" @@ -6791,11 +6836,13 @@ msgstr "llave=valor" msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" @@ -6837,12 +6884,12 @@ msgstr "fallo al crear link '%s'" msgid "failed to copy file to '%s'" msgstr "fallo al copiar archivo a '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6852,21 +6899,21 @@ msgstr "" "Puede inspeccionar a qué se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git checkout -f HEAD'\n" -#: builtin/clone.c:560 +#: builtin/clone.c:561 #, 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:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necsarios" -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:720 +#: builtin/clone.c:721 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD remoto refiere a un ref inexistente, no se puede hacer checkout.\n" @@ -6887,7 +6934,7 @@ msgstr "no se puede reempaquetar para limpiar" msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "Muchos argumentos." @@ -6909,7 +6956,7 @@ msgstr "--bare y --separate-git-dir son incompatibles." msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" @@ -6925,7 +6972,7 @@ msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" @@ -6973,17 +7020,12 @@ msgstr "repositorio fuente es superficial, ignorando --local" msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "No se sabe como clonar %s" - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -7185,7 +7227,7 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" @@ -7287,130 +7329,139 @@ msgstr "%sCommitter: %.*s <%.*s>" msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 builtin/tag.c:252 #, 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:1075 +#: builtin/commit.c:1076 #, 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:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Modo ignorado inválido '%s'" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 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:1172 +#: builtin/commit.c:1186 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Está en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usardo." -#: builtin/commit.c:1187 +#: builtin/commit.c:1201 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "La opción -m no puede ser combinada con -c/-C/-F/--fixup." -#: builtin/commit.c:1195 +#: builtin/commit.c:1209 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1212 +#: builtin/commit.c:1226 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:1214 +#: builtin/commit.c:1228 msgid "No paths with --include/--only does not make sense." msgstr "No hay rutas con --include/--only no tiene sentido." -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup invalido %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "Rutas con -a no tiene sentido." -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "version" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "modo" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 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:1367 -msgid "show ignored files" -msgstr "mostrar archivos ignorados" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"mostrar archivos ignorados, modos opcionales: traditional, matching, no. " +"(Predeterminado: traditional)" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "cuando" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7418,203 +7469,211 @@ msgstr "" "ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "" +"Combinación de argumentos de archivos ignorados y no rastreados no soportada" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "No se pudo resolver HEAD tras crear el commit" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr "(commit-raiz)" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "autor" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "fecha" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "mensaje" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" msgstr "mensaje del commit" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 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:1608 +#: builtin/commit.c:1630 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:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "default" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "cómo quitar espacios y #comentarios de mensajes" -#: builtin/commit.c:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "firmar commit con GPG" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" -msgstr "" -"evitar los capturadores (hooks) de pre-commit y commit-msg" +msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" msgstr "mostrar lo que sería incluído en el commit" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacio" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacio" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, 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:1761 +#: builtin/commit.c:1783 #, 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:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7628,140 +7687,144 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" msgstr "ubicación del archivo config" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" msgstr "Acción" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "obtener valor: nombre [valor-regex]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "obtener todos los valores: llave [valores-regex]" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "obtener valor especifico para el URL: sección[.var] URL" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplazar todas las variables que concuerden: nombre valor [valor_regex]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor " -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "borrar una variable. nombre [valor-regex]" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "borrar todas las concurrencias: nombre [valor-regex]" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "renombrar sección: nombre-viejo nombre-nuevo" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "borrar una sección: nombre" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "listar todo" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "Tipo" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "valor es una fecha de expiración" + +#: builtin/config.c:85 msgid "Other" msgstr "Otro" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "Terminar valores con un byte NUL" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "respetar directivas include en la busqueda" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "no es posible analizar el valor default de color " -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7776,16 +7839,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuración %s" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7802,67 +7865,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "mostrar tamaños en formato legible para humano" -#: builtin/describe.c:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opciones>] [<commit-ish>...]" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "git describe [<opciones>] --dirty" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "head" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "ligero" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "anotado" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "tag anotado %s no disponible" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "tag anotado %s no tiene nombre embebido " -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' es realmente '%s' aquí" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "Nombre de objeto %s no válido" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s no es un objeto '%s' válido" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "no hay tag que concuerde exactamente con '%s'" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" -msgstr "buscando para describir %s\n" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n" -#: builtin/describe.c:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" msgstr "búsqueda finalizada a las %s\n" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7871,7 +7924,7 @@ msgstr "" "No hay tags anotados que puedan describir '%s'.\n" "Sin embargo, hubieron tags no anotados: intente --tags." -#: builtin/describe.c:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7880,12 +7933,12 @@ msgstr "" "Ningún tag puede describit '%s'.\n" "Intente --always, o cree algunos tags." -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits cruzados\n" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7894,75 +7947,90 @@ msgstr "" "se encontró más de %i tags; se mostró %i más reciente\n" "fin de la búsqueda en %s\n" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "describe %s\n" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "Nombre de objeto %s no válido" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s no es un commit ni un blob" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "encontrar el tag que viene después del commit" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "hacer debug a la estrategia de búsqueda en stderr" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "use cualquier ref" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "use cualquier tag, incluso los no anotados" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "siempre usar formato largo" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "solo seguir el primer patrón" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "solo mostrar concordancias exactas" -#: builtin/describe.c:462 +#: builtin/describe.c:529 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar <n> tags más recientes (default:10)" -#: builtin/describe.c:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "solo considerar tags que concuerden con <patrón>" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrón>" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "marca" -#: builtin/describe.c:470 +#: builtin/describe.c:537 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" -#: builtin/describe.c:473 +#: builtin/describe.c:540 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "adjuntar <marca> en un árbol de trbajo roto (default: \"-broken\")" -#: builtin/describe.c:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "--long es incompatible con --abbrev=0" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty es incompatible con commit-ismos" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" @@ -7971,26 +8039,26 @@ msgstr "--broken es incompatible con commit-ismos" msgid "'%s': not a regular file or symlink" msgstr "'%s': no es un archivo regular o un enlace simbólico" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "opción inválida: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "No es un repositorio git" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "objeto '%s' entregado no es válido" -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "más de dos blobs entregados: '%s'" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "objeto no manejado '%s' entregado." @@ -8027,54 +8095,54 @@ msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "archivo del árbol de trabajo ha sido dejado." -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "tal vez desee limpiar o recuperar estos." -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "<tool>" msgstr "<herramienta>" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -8082,19 +8150,19 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "<comando>" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -8150,95 +8218,95 @@ msgstr "Aplicar refspec para los refs exportados" msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opciones>] <grupo>" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "Limpiar ramas remotas rastreadas que ya no están en el remoto" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "dir" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submódulo " -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8246,89 +8314,89 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, 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:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:789 +#: builtin/fetch.c:790 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8337,55 +8405,50 @@ msgstr "" "algunos refs locales no pudieron ser actualizados; intente ejecutar\n" " 'git remote prune %s' para remover cualquier rama vieja o conflictiva" -#: builtin/fetch.c:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, 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:1019 +#: builtin/fetch.c:1020 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" -#: builtin/fetch.c:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "No se sabe como extraer de %s" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8393,40 +8456,40 @@ msgstr "" "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" "nombre remoto del cual las nuevas revisiones deben ser extraídas." -#: builtin/fetch.c:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "Tiene que especificar un nombre de tag." -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "--depen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" @@ -8436,23 +8499,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "poblar el log con máximo <n> entradas del shorlog" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "alias para --log (deprecado)" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "use <text> como comienzo de mensaje" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "archivo del cual leer" @@ -8676,245 +8739,245 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, 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:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:781 +#: builtin/grep.c:783 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv " -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:836 +#: builtin/grep.c:838 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:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:841 +#: builtin/grep.c:843 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:844 +#: builtin/grep.c:846 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:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:855 +#: builtin/grep.c:857 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:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "mostrar árbol analizado para la expresión grep" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "paginador" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "no se ha entregado patrón" -#: builtin/grep.c:982 +#: builtin/grep.c:984 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 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:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "opción no soportada con --recurse-submodules." -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached o --untracked no pueden ser usadas con --no-index." -#: builtin/grep.c:1087 +#: builtin/grep.c:1090 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado." -#: builtin/grep.c:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "--cached y árboles han sido entregados." @@ -9199,8 +9262,8 @@ msgstr "inconsistencia seria en inflate" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" @@ -9360,21 +9423,21 @@ msgstr[1] "largo de cadena = %d: %lu objetos" msgid "packfile name '%s' does not end with '.pack'" msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" @@ -9572,99 +9635,107 @@ msgstr "git show [<opciones>] <objeto>..." msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "usar archivo de mapa de mail" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "solo decorar refs que concuerden con <patrón>" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "no decorar refs que concuerden con <patrón>" + +#: builtin/log.c:158 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:154 +#: builtin/log.c:161 msgid "Process line range n,m in file, counting from 1" msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" -#: builtin/log.c:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "No se pudo leer objeto %s" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "Tipo desconocido: %d" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "No se puede abrir archivo patch %s" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "Exactamente un rango necesario." -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "No es un rango." -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "Letras de portada necesita formato email" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "dos directorios de salida?" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "Commit desconocido %s" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falló al resolver '%s' como una ref válida." -#: builtin/log.c:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "No se pudo encontrar una base de fusión." -#: builtin/log.c:1288 +#: builtin/log.c:1295 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -9676,230 +9747,230 @@ msgstr "" "O puede especificar un commit base mediante --base=<id-commit-base> " "manualmente." -#: builtin/log.c:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "Fallo al encontrar una base de fusión exacta" -#: builtin/log.c:1319 +#: builtin/log.c:1326 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisión" -#: builtin/log.c:1323 +#: builtin/log.c:1330 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisión" -#: builtin/log.c:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1431 +#: builtin/log.c:1438 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "use simple number sequence for output file names" msgstr "" "usar una secuencia simple de números para salida de nombres de archivos" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1446 +#: builtin/log.c:1453 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From " -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "cabezal" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "email" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "ident" -#: builtin/log.c:1478 +#: builtin/log.c:1485 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "configurar dirección From a <ident> ( o identidad de committer si está " "ausente)" -#: builtin/log.c:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "límite" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "firma" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "-n y -k son mutuamente exclusivas." -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos." -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "salida standard, o directorio, cual? " -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "No se pudo crear el directorio '%s'" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "Falló al crear los archivos de salida" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -9907,107 +9978,111 @@ msgstr "" "No se pudo encontrar una rama remota rastreada, por favor especifique " "<upstream> manualmente.\n" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifique el estado del archivo con tags" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "mostrar archivos en caché en la salida (default)" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "mostrar archivos borrados en la salida" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "mostrar archivos modificados en la salida" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "mostrar otros archivos en la salida" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "mostrar archivos ignorados en la salida" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "" "mostrar contenido de nombres de objetos en el área de stage en la salida" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "mostrar archivos en el filesystem que necesitan ser borrados" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "mostrar solo nombres de 'directorios otros'" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "mostrar finales de línea de archivos" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "no mostrar directorios vacíos" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "mostrar archivos no fusionados en la salida" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "mostrar información resolver-deshacer" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "saltar archivos que concuerden con el patrón" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "excluir patrones leídos de <archivo>" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "leer patrones de exclusión de manera adicional por directorio en <archivo>" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "agregar las exclusiones standard de git" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "hacer la salidad relativa al directorio principal del proyecto" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "recurrir a través de submódulos" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 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:562 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "árbol-ismo" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> " "presentes" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "mostrar data de debug" @@ -10130,33 +10205,33 @@ msgstr "Estrategias disponibles son:" msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 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:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 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:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 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:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" @@ -10164,28 +10239,28 @@ msgstr "editar mensaje antes de realizar commit" msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tiene una firma GPG válida" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" @@ -10201,7 +10276,7 @@ msgstr "abortar la fusión en progreso actual" msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" @@ -10240,43 +10315,43 @@ msgstr "Commit de squash -- no actualizando HEAD\n" msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningun commit" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:666 +#: builtin/merge.c:667 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No se realiza commit de la fusión; use 'git commit' para completar la " "fusión.\n" -#: builtin/merge.c:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10293,70 +10368,70 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" "el commit.\n" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, 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:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:914 +#: builtin/merge.c:915 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:919 +#: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remoto para %s de %s" -#: builtin/merge.c:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mal valor '%s' en el entorno '%s'" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10364,7 +10439,7 @@ msgstr "" "No ha concluido la fusión (existe MERGE_HEAD).\n" "Por favor, realice un commit con los cambios antes de fusionar." -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10372,113 +10447,113 @@ msgstr "" "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" "Por favor, realice un commit con los cambios antes de fusionar." -#: builtin/merge.c:1218 +#: builtin/merge.c:1220 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1252 +#: builtin/merge.c:1254 msgid "Squash commit into empty head not supported yet" msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" -#: builtin/merge.c:1254 +#: builtin/merge.c:1256 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:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 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:1295 +#: builtin/merge.c:1297 #, 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." -#: builtin/merge.c:1298 +#: builtin/merge.c:1300 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." -#: builtin/merge.c:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, 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" -#: builtin/merge.c:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usando el %s para preparar resolución a mano.\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10504,23 +10579,23 @@ msgstr "git merge-base --is-ancestor <commit> <commit>" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<commit>]" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "mostrar todos los ancestros comunes" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "encontrar ancestros para una única fusión de n-vías " -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "listar revs no alcanzables desde otros" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "es el primer ancestro del otro?" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "encontrar donde <commit> forjó del reflog de <ref>" @@ -10735,8 +10810,7 @@ msgstr "ignorar refs que concuerden con <patrón>" #: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" -msgstr "" -"listar todos los commits alcanzables desde todas las referencias" +msgstr "listar todos los commits alcanzables desde todas las referencias" #: builtin/name-rev.c:403 msgid "read from stdin" @@ -10805,8 +10879,8 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" -msgstr "git notes [--ref <referencia-de-notas>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "git notes [--ref <referencia-de-notas>] prune [-n] [-v]" #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] get-ref" @@ -11146,7 +11220,7 @@ msgstr "intentar remover una nota no existente no es un error" msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "no remover, solo mostrar" @@ -11167,194 +11241,202 @@ msgstr "usar notas desde <referencia-de-notas>" msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" "objetos>]" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 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:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 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:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "valor inválido para --missing" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:2943 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress cuando medidor de progreso es mostrado" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "versión[,offset]" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 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:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 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:2905 +#: builtin/pack-objects.c:2958 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:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 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:2954 +#: builtin/pack-objects.c:3007 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:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "manejo de objetos perdidos" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "Contando objetos" @@ -11379,8 +11461,8 @@ msgid "Removing duplicate objects" msgstr "Removiendo objetos duplicados" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--expire <tiempo>] [--] [<head>...]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]" #: builtin/prune.c:106 msgid "report pruned objects" @@ -11404,52 +11486,52 @@ msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" -#: builtin/pull.c:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "control de fetch recursivo en submódulos" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "Opciones relacionadas a fusión" -#: builtin/pull.c:131 +#: builtin/pull.c:134 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "Opciones relacionadas a fetch" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" msgstr "número de submódulos que realizan pull en paralelo" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "valor inválido para pull.ff: %s" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." -#: builtin/pull.c:405 +#: builtin/pull.c:417 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hay candidatos para fusionar entre las refs que has bajado con fetch." -#: builtin/pull.c:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11458,7 +11540,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11469,44 +11551,44 @@ msgstr "" "una rama. Porque este no es el remoto configurado por default\n" "para tu rama actual, tienes que especificar una rama en la línea de comando." -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si deseas configurar el rastreo de información para esta rama, puedes " "hacerlo con:" -#: builtin/pull.c:443 +#: builtin/pull.c:455 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11515,27 +11597,27 @@ msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" "de tu remoto, pero no se pudo hacer fetch a esa ref." -#: builtin/pull.c:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "La opción --[no-]autostash sólo es válida con --rebase." -#: builtin/pull.c:852 +#: builtin/pull.c:873 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nata con cambios agregados al índice." -#: builtin/pull.c:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11546,7 +11628,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11563,15 +11645,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -11581,15 +11663,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "taquigrafía de tag sin <tag>" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11598,7 +11680,7 @@ msgstr "" "Para elegir si la opción es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11623,7 +11705,7 @@ msgstr "" "\tgit push %s %s\n" "%s" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11638,7 +11720,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11652,12 +11734,12 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11668,13 +11750,13 @@ msgstr "" "su rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11686,7 +11768,7 @@ msgstr "" "'git pull ...') antes de hacer push de nuevo.\n" "Mira 'Note about fast-forwards' en 'git push --help' para mas detalles." -#: builtin/push.c:259 +#: builtin/push.c:261 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11699,7 +11781,7 @@ msgstr "" "(ejem. 'git pull ...') antes de volver a hacer push.\n" "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:265 +#: builtin/push.c:267 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11713,12 +11795,12 @@ msgstr "" "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." -#: builtin/push.c:275 +#: builtin/push.c:277 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -11728,22 +11810,22 @@ msgstr "" "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" "sin usar la opción '--force'.\n" -#: builtin/push.c:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "fallo el push de algunas referencias a '%s'" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "mal repositorio '%s'" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -11765,112 +11847,112 @@ msgstr "" "\n" " git push <nombre>\n" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:390 +#: builtin/push.c:392 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "repositorio" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:528 +#: builtin/push.c:540 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:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "refname>:<expect" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "recortando refs removidas localmente" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "firmar con GPG el push" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "opción para trasmitir" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de línea nueva" @@ -11953,47 +12035,51 @@ msgstr "debug de árboles-desempacados" msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<opciones>]" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "mantener commits vacíos" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "abortar rebase" -#: builtin/rebase--helper.c:28 +#: builtin/rebase--helper.c:30 msgid "make rebase script" msgstr "generar script de rebase" -#: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" -msgstr "SHA-1s cortos en la lista de pendientes" - #: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" -msgstr "SHA-1s expandidos en la lista de pendientes" +msgid "shorten commit ids in the todo list" +msgstr "ids de commits cortos en la lista de pendientes" #: builtin/rebase--helper.c:34 +msgid "expand commit ids in the todo list" +msgstr "expandir ids de commits en la lista de pendientes" + +#: builtin/rebase--helper.c:36 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:38 msgid "skip unnecessary picks" msgstr "saltar los picks innecesarios" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "reorganizar líneas fixup/squash" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "insertar comando exec en la lista de pendientes" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -12026,7 +12112,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configure 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:860 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" @@ -12047,20 +12133,15 @@ msgstr "" "\n" "Para suprimir este mensaje, puede configurarlo en 'refuse'." -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%s' para '%s' no es una marca de tiempo válida" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" @@ -12668,7 +12749,7 @@ msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "falló al remover '%s'" @@ -12895,10 +12976,23 @@ msgstr "No se puede reiniciar el índice a la revisión '%s'." msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "filtrado de objetos requiere --objects" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valor disperso inválido: '%s'" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]" @@ -13348,35 +13442,35 @@ 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:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, 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:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13385,82 +13479,112 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, 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:404 +#: builtin/submodule--helper.c:479 #, 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:414 +#: builtin/submodule--helper.c:489 #, 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:421 +#: builtin/submodule--helper.c:496 #, 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:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<ruta>]" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <ruta>" - -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 #, 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:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:626 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "No pudo resolver ref de HEAD dentro del submódulo '%s'" + +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "falló al recursar en el submódulo '%s'" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "Suprimir output del estado del submódulo " + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" +"Usar el commit guardado en el índice en lugar del guardado en el submódulo " +"HEAD" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "recursar en submódulos anidados" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <ruta>" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:842 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -13469,83 +13593,83 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " "<ruta>" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clon de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, 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:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "Tal vez quiere usar 'update --init'?" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncado al número especificado de revisión" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación superficial" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -13554,20 +13678,20 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, " "pero el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<ruta>...]" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper valido" @@ -13808,192 +13932,208 @@ msgstr "Etiqueta '%s' actualizada (era %s)\n" msgid "Unpacking objects" msgstr "Desempaquetando objetos" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "fallo al crear directorio %s" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "fallo al iniciar %s" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "fallo al crear el archivo %s" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "fallo al eliminar el archivo %s" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "fallo al eliminar directorio %s" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Probando mtime en '%s' " -#: builtin/update-index.c:150 +#: 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:163 +#: 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:176 +#: 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:187 +#: 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:198 +#: 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:211 +#: 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:218 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opciones>] [--] [<archivo>...]" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 msgid "continue refresh even when index needs update" msgstr "" "continuar refresh (Actualización) incluso cuando el índice necesita " "actualización" -#: builtin/update-index.c:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "refresh: ignora submódulos" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "no ignorar archivos nuevos" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "permitir que archivos remplacen directorios y vice-versa" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "avisar de archivos faltando en el árbol de trabajo" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 msgid "refresh even if index contains unmerged entries" msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios" -#: builtin/update-index.c:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "refresh información de estado" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, pero ignora configuración assume-unchanged" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<ruta>" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "agregar la entrada especificada al índice" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "marcar archivos como \"not changing\"" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "limpiar bit assumed-unchanged" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "marcar archivos como \"index-only\"" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "limpiar bit skip-worktree" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 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:973 +#: builtin/update-index.c:983 msgid "remove named paths even if present in worktree" msgstr "" "remover rutas nombradas incluso si están presentes en el árbol de trabajo" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos" -#: builtin/update-index.c:977 +#: builtin/update-index.c:987 msgid "read list of paths to be updated from standard input" msgstr "leer la lista de rutas para ser actualizada desde standard input" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 msgid "add entries from standard input to the index" msgstr "agregar entradas de standard input al índice" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repoblar stages #2 y #3 para las rutas listadas" -#: builtin/update-index.c:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "solo actualizar entradas que difieren de HEAD" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "ignorar archivos faltantes en el árbol de trabajo" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "reportar acciones por standard output" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "escribir índice en este formato" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "activar o desactivar índice dividido" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "habilitar o deshabilitar caché no rastreado" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "test if the filesystem supports untracked cache" msgstr "probar si el filesystem soporta caché no rastreado" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1020 msgid "enable untracked cache without testing the filesystem" msgstr "habilitar caché no rastreado sin probar el filesystem" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1022 +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:1024 +msgid "enable or disable file system monitor" +msgstr "activar o desactivar monitor de sistema de archivos" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "marcar archivos como válidos para fsmonitor" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "limpia el bit de validación fsmonitor" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14001,7 +14141,7 @@ msgstr "" "core.splitIndex está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el índice partido" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14009,7 +14149,7 @@ msgstr "" "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente " "quieres deshabilitar el índice partido" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1147 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14017,11 +14157,11 @@ msgstr "" "core.untrackedCache está configurado en true; remuévelo o cámbialo, si " "realmente quieres deshabilitar el chaché no rastreado" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "Caché no rastreado deshabilitado" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14029,11 +14169,32 @@ msgstr "" "core.untrackedCache está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el caché no rastreado" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Caché no rastreado habilitado para '%s'" +#: builtin/update-index.c:1171 +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:1175 +msgid "fsmonitor enabled" +msgstr "fsmonitor activado" + +#: builtin/update-index.c:1178 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar " +"el fsmonitor" + +#: builtin/update-index.c:1182 +msgid "fsmonitor disabled" +msgstr "fsmonitor desactivado" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<opciones>] -d <nombre-referencia> [<valor-anterior>]" @@ -14104,42 +14265,42 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir contenido del tag" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<opciones>] <ruta> [<rama>]" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opciones>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Removiendo el worktrees/%s: no es un directorio válido" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Removiendo worktrees/%s: archivo gitdir no existe" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" -#: builtin/worktree.c:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14148,90 +14309,103 @@ msgstr "" "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> " "bytes, %<PRIuMAX> leídos)" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Removiendo worktrees/%s: archivo gitdir inválido" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente" -#: builtin/worktree.c:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "reporta árboles de trabajo recortados" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "expirar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Preparando %s (identificador %s)" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " "trabajo" -#: builtin/worktree.c:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "configurando modo tracking (mirar git-branch(1))" + +#: builtin/worktree.c:380 +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:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +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:553 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 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:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" @@ -14252,23 +14426,23 @@ msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "sólo útil para depurar" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<opciones>] <directorio>" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "sale después de un intercambio petición/respuesta único" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "salir inmediatamente tras el anuncio inicial de ref" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interrumpir transferencia tras <n> segundos de inactividad" @@ -14300,20 +14474,20 @@ msgstr "" "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n" "para leer sobre un subcomando o concepto específico." -#: http.c:338 +#: http.c:339 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negativo para http.postbuffer; poniendo el default a %d" -#: http.c:359 +#: http.c:360 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:368 +#: http.c:369 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:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14329,6 +14503,14 @@ msgstr "" msgid "redirecting to %s" msgstr "redirigiendo a %s" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "args" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "filtrado de objeto" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "comienza un área de trabajo (ver también: git help tutorial)" @@ -14504,27 +14686,27 @@ msgstr "Mal HEAD - ref simbólico extraño" msgid "Bad bisect_write argument: $state" msgstr "Mal argumento bisect_write: $state" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "Mala entrada rev: $arg" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "Mala entrada rev: $bisected_head" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "Mala entrada rev: $rev" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento." -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "Peligro: bisectando solo con un $TERM_BAD commit." @@ -14532,11 +14714,11 @@ msgstr "Peligro: bisectando solo con un $TERM_BAD commit." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]?" -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -14545,7 +14727,7 @@ msgstr "" "Tiene que dar al menos un $bad_syn y un $good_syn revision.\n" "(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -14556,16 +14738,16 @@ msgstr "" "Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n" "(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "No estamos bisectando." -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' no es un commit válido" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -14574,25 +14756,29 @@ msgstr "" "No se pudo revisar el HEAD original '$branch'.\n" "Intente 'git bisect reset <commit>'." -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "Ningún logfile proporcionado" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "no se puede leer $file para reproducir" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "?? ¿De qué estás hablando?" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "bisect falló: no se proveyó comando" + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "ejecutando $command" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" @@ -14601,11 +14787,11 @@ msgstr "" "bisect falló:\n" "código de salida $res de '$command' es <0 o >=128" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "bisect no puede seguir continuando" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" @@ -14614,40 +14800,21 @@ msgstr "" "bisect falló:\n" "'bisect_state $state' salió con código de error $res" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "bisect exitoso" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "por favor use dos términos diferentes" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "'$term' no es un término válido" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "no se puede usar el comando builtin '$term' como un término" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "no se puede cambiar el significado del término '$term'" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD" -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "no hay términos definidos" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -14731,8 +14898,8 @@ msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." #: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Parece que git-am está en progreso. No se puede hacer rebase." +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "Parece que 'git am' está en progreso. No se puede rebasar." #: git-rebase.sh:363 msgid "No rebase in progress?" @@ -14778,8 +14945,8 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" -msgstr "upstream inválido $upstream_name" +msgid "invalid upstream '$upstream_name'" +msgstr "upstream inválido '$upstream_name'" #: git-rebase.sh:504 #, sh-format @@ -14796,45 +14963,55 @@ msgstr "$onto_name: no hay base de fusión" msgid "Does not point to a valid commit: $onto_name" msgstr "No apunta a un commit válido: $onto_name" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" -msgstr "fatal: no existe la rama: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" +msgstr "fatal: no existe la rama/commit: '$branch_name'" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autostash creado: $stash_abbrev" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o salvaguárdalos." -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "HEAD está actualizado" + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La rama actual $branch_name está actualizada." -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD está actualizado, rebase forzado." + +#: git-rebase.sh:619 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Rama actual $branch_name está actualizada, rebase forzado." -#: git-rebase.sh:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Cambios desde $mb a $onto:" -#: git-rebase.sh:625 +#: git-rebase.sh:640 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Primero, rebobinando head para reproducir tu trabajo en la cima de él..." -#: git-rebase.sh:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Avance rápido de $branch_name a $onto_name." @@ -14843,159 +15020,145 @@ msgstr "Avance rápido de $branch_name a $onto_name." msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parámetros no está implementado" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial." -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "No se puede remover el índice temporal (no puede suceder)" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No se puede actualizar $ref_stash con $w_commit" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" -msgstr "" -"error: opción desconocida para 'stash save': $option\n" -" Esto provee un mensaje , use git stash save -- '$option'" +msgid "error: unknown option for 'stash push': $option" +msgstr "error: opción desconocida para 'stash pus': $option" -#: git-stash.sh:288 +#: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "No se pueden remover cambios del árbol de trabajo" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "opción desconocida: $opt" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "No se encontraron entradas de stash." -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Se especificaron demasiadas revisiones: $REV" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no es una referencia válida" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no es un commit estilo stash" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no es una referencia stash" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "incapaz de refrescar el índice" -#: git-stash.sh:568 +#: git-stash.sh:575 msgid "Cannot apply a stash in the middle of a merge" msgstr "No se puede aplicar un stash en medio de una fusión" -#: git-stash.sh:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "Conflictos en índice. Intente sin --index." -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "No se puede guardar el índice del árbol" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "No se puede sacar de stage archivos modificados" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: git-stash.sh:641 +#: git-stash.sh:648 msgid "The stash entry is kept in case you need it again." msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." -#: git-stash.sh:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Botado ${REV} ($s)" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No se pudo borrar entrada stash" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "No se especificó el nombre de la rama." -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "(Para restaurarlos, escribe \"git stash apply\")" @@ -15230,38 +15393,32 @@ msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "La opción --cached no puede ser usada con la opción --files" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Advertencia: $display_name no contiene el commit $sha1_src" -#: git-submodule.sh:915 +#: git-submodule.sh:903 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" -#: git-submodule.sh:918 +#: git-submodule.sh:906 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -"Advertencia: $display_name no contiene los commits $sha1_src y " -"$sha1_dst" +"Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'" - -#: git-submodule.sh:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Sincronizando url de submódulo para '$displaypath'" @@ -15309,8 +15466,7 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit " -"\n" +"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" #: git-rebase--interactive.sh:175 msgid "" @@ -15496,15 +15652,15 @@ msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebasado y actualizado satisfactoriamente." -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No se pudo remover CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -15535,12 +15691,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 msgid "Error trying to find the author identity to amend commit" msgstr "" "Error tratando de encontrar la identidad del autor para remediar el commit " -#: git-rebase--interactive.sh:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -15548,11 +15704,11 @@ 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--interactive.sh:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." msgstr "No se pudo realizar el commit con los cambios en el área de stage" -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -15566,40 +15722,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994 msgid "Could not execute editor" msgstr "No se pudo ejecutar el editor" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "¿Sin HEAD?" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No se pudo crear $state_dir temporalmente" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "No se pudo marcar como interactivo" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:972 #, 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--interactive.sh:998 +#: git-rebase--interactive.sh:977 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -15609,7 +15765,7 @@ msgstr "" "Como sea, si se remueve todo, el rebase sera abortado.\n" "\n" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:984 msgid "Note that empty commits are commented out" msgstr "Tenga en cuenta que los commits vacíos están comentados" @@ -16387,7 +16543,7 @@ msgstr "" "que id de mensaje sera usado como En-Respuesta-Para en el primer email (si " "existe alguno)?" -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "error: no es posible extraer una dirección valida de %s\n" @@ -16395,16 +16551,16 @@ msgstr "error: no es posible extraer una dirección valida de %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:939 +#: git-send-email.perl:941 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar):" -#: git-send-email.perl:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "ruta CA \"%s\" no existe" -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -16431,134 +16587,187 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 +#: git-send-email.perl:1352 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):" -#: git-send-email.perl:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "Necesitas mandar esta respuesta de email" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP no esta definido adecuadamente." -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "fallo de STARTTLS! %s" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---" "smtp-debug." -#: git-send-email.perl:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "Fallo al enviar %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "Resultado:" -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Agregando cc: %s de línea '%s'\n" -#: git-send-email.perl:1549 +#: git-send-email.perl:1551 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Agregando para: %s de la línea '%s'\n" -#: git-send-email.perl:1597 +#: git-send-email.perl:1599 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1622 +#: git-send-email.perl:1624 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) fallo al cerrar el pipe para '%s'" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" msgstr "codificación de transferencia invalida" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el parche contiene una línea con mas de 998 caracteres" -#: git-send-email.perl:1831 +#: git-send-email.perl:1833 #, 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:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Realmente deseas mandar %s?[y|N]" +#~ msgid "" +#~ "empty strings as pathspecs will be made invalid in upcoming releases. " +#~ "please use . instead if you meant to match all paths" +#~ msgstr "" +#~ "los strings vacíos como pathspecs serán inválidas en las próximas " +#~ "versiones. por favor use . si quería hacer coincidir todas las rutas" + +#~ msgid "unable to open '%s' for writing" +#~ msgstr "No se pudo abrir '%s' para escritura" + +#~ msgid "could not truncate '%s'" +#~ msgstr "no se pudo truncar '%s'" + +#~ msgid "could not finish '%s'" +#~ msgstr "no se pudo finalizar '%s'" + +#~ msgid "could not write to %s" +#~ msgstr "no se pudo escribir en %s" + +#~ msgid "could not close %s" +#~ msgstr "no se pudo cerrar %s" + +#~ msgid "Copied a misnamed branch '%s' away" +#~ msgstr "Copiada una rama mal llamada '%s' afuera" + +#~ msgid "it does not make sense to create 'HEAD' manually" +#~ msgstr "No tiene sentido crear 'HEAD' manualmente" + +#~ msgid "Don't know how to clone %s" +#~ msgstr "No se sabe como clonar %s" + +#~ msgid "show ignored files" +#~ msgstr "mostrar archivos ignorados" + +#~ msgid "%s is not a valid '%s' object" +#~ msgstr "%s no es un objeto '%s' válido" + +#~ msgid "Don't know how to fetch from %s" +#~ msgstr "No se sabe como extraer de %s" + +#~ msgid "'$term' is not a valid term" +#~ msgstr "'$term' no es un término válido" + +#~ msgid "" +#~ "error: unknown option for 'stash save': $option\n" +#~ " To provide a message, use git stash save -- '$option'" +#~ msgstr "" +#~ "error: opción desconocida para 'stash save': $option\n" +#~ " Esto provee un mensaje , use git stash save -- '$option'" + +#~ msgid "Failed to recurse into submodule path '$sm_path'" +#~ msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'" + #~ msgid "%%(trailers) does not take arguments" #~ msgstr "%%(trailers) no toma argumentos" |