l10n: es: 2.21.0 round 2

Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>

diff --git a/po/es.po b/po/es.po
index 204bf9e143e4fe0b70e8e5ad45a569974d621416..d74941299c7f63a0242e735ad11b685b564e8a18 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

-"POT-Creation-Date: 2018-12-02 10:55+0800\n"
-"PO-Revision-Date: 2018-12-01 23:16-0500\n"
+"POT-Creation-Date: 2019-02-15 10:09+0800\n"
+"PO-Revision-Date: 2019-02-16 15:19-0500\n"

 "Last-Translator: christopher.diaz.riv@gmail.com\n"
 "Language-Team: CodeLabora <codelabora@gmail.com>\n"
 "Language: es\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2\n"

 
 

-#: advice.c:99
+#: advice.c:101

 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sayuda: %.*s%s\n"
 
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sayuda: %.*s%s\n"
 

-#: advice.c:152
+#: advice.c:154

 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
 
 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:154
+#: advice.c:156

 msgid "Committing is not possible because you have unmerged files."
 msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
 
 msgid "Committing is not possible because you have unmerged files."
 msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
 

-#: advice.c:156
+#: advice.c:158

 msgid "Merging is not possible because you have unmerged files."
 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
 
 msgid "Merging is not possible because you have unmerged files."
 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
 

-#: advice.c:158
+#: advice.c:160

 msgid "Pulling is not possible because you have unmerged files."
 msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
 
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
 

-#: advice.c:160
+#: advice.c:162

 msgid "Reverting is not possible because you have unmerged files."
 msgstr "No es posible revertir porque tienes archivos sin fusionar."
 
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "No es posible revertir porque tienes archivos sin fusionar."
 

-#: advice.c:162
+#: advice.c:164

 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "No es posible %s porque tienes archivos sin fusionar."
 
 #, 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:170
+#: advice.c:172

 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."
 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."
 
 "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:178
+#: advice.c:180

 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 

-#: advice.c:183 builtin/merge.c:1289
+#: advice.c:185 builtin/merge.c:1290

 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
 
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
 

-#: advice.c:185
+#: advice.c:187

 msgid "Please, commit your changes before merging."
 msgstr "Por favor, realiza un commit antes de fusionar."
 
 msgid "Please, commit your changes before merging."
 msgstr "Por favor, realiza un commit antes de fusionar."
 

-#: advice.c:186
+#: advice.c:188

 msgid "Exiting because of unfinished merge."
 msgstr "Saliendo por una fusión inconclusa."
 
 msgid "Exiting because of unfinished merge."
 msgstr "Saliendo por una fusión inconclusa."
 

-#: advice.c:192
+#: advice.c:194

 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"


@@ -102,6 +102,14 @@ msgstr ""
 "  git checkout -b <nombre-de-nueva-rama>\n"
 "\n"
 
 "  git checkout -b <nombre-de-nueva-rama>\n"
 "\n"
 

+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "cmdline termina en \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "comillas incompletas"
+

 #: apply.c:59
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 #: apply.c:59
 #, c-format
 msgid "unrecognized whitespace option '%s'"


@@ -132,69 +140,69 @@ msgstr "--index está fuera de un repositorio"
 msgid "--cached outside a repository"
 msgstr "--cached está fuera de un repositorio"
 
 msgid "--cached outside a repository"
 msgstr "--cached está fuera de un repositorio"
 

-#: apply.c:826
+#: apply.c:825

 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"
 
 #, 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:835
+#: apply.c:834

 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec devolvió %d para la entrada: %s"
 
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec devolvió %d para la entrada: %s"
 

-#: apply.c:909
+#: apply.c:908

 #, 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"
 
 #, 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:947
+#: apply.c:946

 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en "
 "lalínea %d"
 
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en "
 "lalínea %d"
 

-#: apply.c:953
+#: apply.c:952

 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en "
 "lalínea %d"
 
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en "
 "lalínea %d"
 

-#: apply.c:954
+#: apply.c:953

 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: git-diff erróneo - viejo nombre de archivo inconsistente en "
 "lalínea %d"
 
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: git-diff erróneo - viejo nombre de archivo inconsistente en "
 "lalínea %d"
 

-#: apply.c:959
+#: apply.c:958

 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d"
 
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff erróneo - se esperaba /dev/null en la línea %d"
 

-#: apply.c:988
+#: apply.c:987

 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "modo inválido en la línea %d: %s"
 
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "modo inválido en la línea %d: %s"
 

-#: apply.c:1307
+#: apply.c:1306

 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "header inconsistente en las líneas %d y %d"
 
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "header inconsistente en las líneas %d y %d"
 

-#: apply.c:1479
+#: apply.c:1478

 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: línea inesperada: %.*s"
 
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: línea inesperada: %.*s"
 

-#: apply.c:1548
+#: apply.c:1547

 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragmento de parche sin header en la línea %d: %.*s"
 
 #, 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:1568
+#: apply.c:1567

 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "


@@ -209,83 +217,83 @@ msgstr[1] ""
 "los headers de git diff carecen de información de los nombres de los "
 "archivos %d cuando los eliminan de la ruta principal componentes (línea %d)"
 
 "los headers de git diff carecen de información de los nombres de los "
 "archivos %d cuando los eliminan de la ruta principal componentes (línea %d)"
 

-#: apply.c:1581
+#: apply.c:1580

 #, 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)"
 
 #, 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:1769
+#: apply.c:1768

 msgid "new file depends on old contents"
 msgstr "el nuevo archivo depende de contenidos viejos"
 
 msgid "new file depends on old contents"
 msgstr "el nuevo archivo depende de contenidos viejos"
 

-#: apply.c:1771
+#: apply.c:1770

 msgid "deleted file still has contents"
 msgstr "el archivo eliminado todavía tiene contenido"
 
 msgid "deleted file still has contents"
 msgstr "el archivo eliminado todavía tiene contenido"
 

-#: apply.c:1805
+#: apply.c:1804

 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "parche corrupto en la línea %d"
 
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "parche corrupto en la línea %d"
 

-#: apply.c:1842
+#: apply.c:1841

 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nuevo archivo %s depende en contenidos viejos"
 
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nuevo archivo %s depende en contenidos viejos"
 

-#: apply.c:1844
+#: apply.c:1843

 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el archivo borrado %s todavía tiene contenido"
 
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el archivo borrado %s todavía tiene contenido"
 

-#: apply.c:1847
+#: apply.c:1846

 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** peligro: el archivo %s está vacío pero no es borrado"
 
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** peligro: el archivo %s está vacío pero no es borrado"
 

-#: apply.c:1994
+#: apply.c:1993

 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "parche binario corrupto en la línea %d: %.*s"
 
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "parche binario corrupto en la línea %d: %.*s"
 

-#: apply.c:2031
+#: apply.c:2030

 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "parche binario no reconocido en la línea %d"
 
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "parche binario no reconocido en la línea %d"
 

-#: apply.c:2193
+#: apply.c:2192

 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "parche que solo contiene basura en la línea %d"
 
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "parche que solo contiene basura en la línea %d"
 

-#: apply.c:2279
+#: apply.c:2278

 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no es posible leer el enlace simbólico %s"
 
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no es posible leer el enlace simbólico %s"
 

-#: apply.c:2283
+#: apply.c:2282

 #, c-format
 msgid "unable to open or read %s"
 msgstr "no es posible abrir o leer %s"
 
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no es posible abrir o leer %s"
 

-#: apply.c:2942
+#: apply.c:2941

 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "comienzo inválido de línea: '%c'"
 
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "comienzo inválido de línea: '%c'"
 

-#: apply.c:3063
+#: apply.c:3062

 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
 msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
 
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
 msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
 

-#: apply.c:3075
+#: apply.c:3074

 #, 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"
 
 #, 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:3081
+#: apply.c:3080

 #, c-format
 msgid ""
 "while searching for:\n"
 #, c-format
 msgid ""
 "while searching for:\n"


@@ -294,23 +302,23 @@ msgstr ""
 "mientras se busca:\n"
 "%.*s"
 
 "mientras se busca:\n"
 "%.*s"
 

-#: apply.c:3103
+#: apply.c:3102

 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "data perdida en parche binario para '%s'"
 
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "data perdida en parche binario para '%s'"
 

-#: apply.c:3111
+#: apply.c:3110

 #, 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'"
 
 #, 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:3158
+#: apply.c:3157

 #, 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"
 
 #, 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:3168
+#: apply.c:3167

 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."


@@ -318,29 +326,29 @@ msgstr ""
 "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
 "actuales."
 
 "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
 "actuales."
 

-#: apply.c:3176
+#: apply.c:3175

 #, 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"
 
 #, 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:3194
+#: apply.c:3193

 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "la postimagen necesaria %s para '%s' no se puede leer"
 
 #, 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:3207
+#: apply.c:3206

 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el parche binario no aplica para '%s'"
 
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el parche binario no aplica para '%s'"
 

-#: apply.c:3213
+#: apply.c:3212

 #, 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)"
 
 #, 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:3234
+#: apply.c:3233

 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el parche falló: %s:%ld"
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el parche falló: %s:%ld"


@@ -420,7 +428,8 @@ msgstr "%s: tipo incorrecto"
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 

-#: apply.c:3881 apply.c:3883
+#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846
+#: read-cache.c:1299

 #, c-format
 msgid "invalid path '%s'"
 msgstr "ruta inválida '%s'"
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ruta inválida '%s'"


@@ -475,7 +484,7 @@ msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 

-#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142
+#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry falló para la ruta '%s'"
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry falló para la ruta '%s'"


@@ -552,7 +561,7 @@ msgstr[1] "Aplicando parche %%s con %d rechazos..."
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 

-#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122
+#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"


@@ -576,30 +585,30 @@ msgstr "Parche '%s' saltado."
 msgid "unrecognized input"
 msgstr "input no reconocido"
 
 msgid "unrecognized input"
 msgstr "input no reconocido"
 

-#: apply.c:4719
+#: apply.c:4720

 msgid "unable to read index file"
 msgstr "no es posible leer el archivo índice"
 
 msgid "unable to read index file"
 msgstr "no es posible leer el archivo índice"
 

-#: apply.c:4874
+#: apply.c:4875

 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no se puede abrir el parche '%s': %s"
 
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no se puede abrir el parche '%s': %s"
 

-#: apply.c:4901
+#: apply.c:4902

 #, 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"
 
 #, 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:4907 apply.c:4922
+#: apply.c:4908 apply.c:4923

 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d línea agrega errores de espacios en blanco."
 msgstr[1] "%d líneas agregan errores de espacios en blanco."
 
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d línea agrega errores de espacios en blanco."
 msgstr[1] "%d líneas agregan errores de espacios en blanco."
 

-#: apply.c:4915
+#: apply.c:4916

 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."


@@ -608,147 +617,147 @@ msgstr[0] ""
 msgstr[1] ""
 "%d líneas aplicadas después de arreglar los errores de espacios en blanco."
 
 msgstr[1] ""
 "%d líneas aplicadas después de arreglar los errores de espacios en blanco."
 

-#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
+#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

 msgid "Unable to write new index file"
 msgstr "No es posible escribir el archivo índice"
 
 msgid "Unable to write new index file"
 msgstr "No es posible escribir el archivo índice"
 

-#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212
-#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262
-#: builtin/pull.c:199 builtin/submodule--helper.c:406
-#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365
-#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849
-#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197
+#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206
+#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263
+#: builtin/pull.c:200 builtin/submodule--helper.c:407
+#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197

 msgid "path"
 msgstr "ruta"
 
 msgid "path"
 msgstr "ruta"
 

-#: apply.c:4959
+#: apply.c:4960

 msgid "don't apply changes matching the given path"
 msgstr "no aplicar cambios que concuerden con la ruta suministrada"
 
 msgid "don't apply changes matching the given path"
 msgstr "no aplicar cambios que concuerden con la ruta suministrada"
 

-#: apply.c:4962
+#: apply.c:4963

 msgid "apply changes matching the given path"
 msgstr "aplicar cambios que concuerden con la ruta suministrada"
 
 msgid "apply changes matching the given path"
 msgstr "aplicar cambios que concuerden con la ruta suministrada"
 

-#: apply.c:4964 builtin/am.c:2218
+#: apply.c:4965 builtin/am.c:2212

 msgid "num"
 msgstr "num"
 
 msgid "num"
 msgstr "num"
 

-#: apply.c:4965
+#: apply.c:4966

 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
 
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
 

-#: apply.c:4968
+#: apply.c:4969

 msgid "ignore additions made by the patch"
 msgstr "ignorar adiciones hechas por el parche"
 
 msgid "ignore additions made by the patch"
 msgstr "ignorar adiciones hechas por el parche"
 

-#: apply.c:4970
+#: apply.c:4971

 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
 
 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:4974
+#: apply.c:4975

 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"
 
 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:4976
+#: apply.c:4977

 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"
 
 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:4978
+#: apply.c:4979

 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"
 
 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:4980
+#: apply.c:4981

 msgid "make sure the patch is applicable to the current index"
 msgstr "asegurar que el parche es aplicable al índice actual"
 
 msgid "make sure the patch is applicable to the current index"
 msgstr "asegurar que el parche es aplicable al índice actual"
 

-#: apply.c:4982
+#: apply.c:4983

 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marca los nuevos archivos con `git add --intent-to-add`"
 
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marca los nuevos archivos con `git add --intent-to-add`"
 

-#: apply.c:4984
+#: apply.c:4985

 msgid "apply a patch without touching the working tree"
 msgstr "aplicar un parche sin tocar el árbol de trabajo"
 
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar un parche sin tocar el árbol de trabajo"
 

-#: apply.c:4986
+#: apply.c:4987

 msgid "accept a patch that touches outside the working area"
 msgstr "aceptar un parche que toca fuera del área de trabajo"
 
 msgid "accept a patch that touches outside the working area"
 msgstr "aceptar un parche que toca fuera del área de trabajo"
 

-#: apply.c:4989
+#: apply.c:4990

 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
 
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
 

-#: apply.c:4991
+#: apply.c:4992

 msgid "attempt three-way merge if a patch does not apply"
 msgstr "intentar merge de tres-vías si el parche no aplica"
 
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "intentar merge de tres-vías si el parche no aplica"
 

-#: apply.c:4993
+#: apply.c:4994

 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construir un índice temporal basado en la información del índice incrustado"
 
 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:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523
+#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524

 msgid "paths are separated with NUL character"
 msgstr "rutas están separadas con un carácter NULL"
 
 msgid "paths are separated with NUL character"
 msgstr "rutas están separadas con un carácter NULL"
 

-#: apply.c:4998
+#: apply.c:4999

 msgid "ensure at least <n> lines of context match"
 msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
 
 msgid "ensure at least <n> lines of context match"
 msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
 

-#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
+#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

-#: builtin/pack-objects.c:3312 builtin/rebase.c:857
+#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

 msgid "action"
 msgstr "acción"
 
 msgid "action"
 msgstr "acción"
 

-#: apply.c:5000
+#: apply.c:5001

 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "detectar líneas nuevas o modificadas que contienen errores de espacios en "
 "blanco"
 
 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:5003 apply.c:5006
+#: apply.c:5004 apply.c:5007

 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
 
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
 

-#: apply.c:5009
+#: apply.c:5010

 msgid "apply the patch in reverse"
 msgstr "aplicar el parche en reversa"
 
 msgid "apply the patch in reverse"
 msgstr "aplicar el parche en reversa"
 

-#: apply.c:5011
+#: apply.c:5012

 msgid "don't expect at least one line of context"
 msgstr "no espera al menos una línea del contexto"
 
 msgid "don't expect at least one line of context"
 msgstr "no espera al menos una línea del contexto"
 

-#: apply.c:5013
+#: apply.c:5014

 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 

-#: apply.c:5015
+#: apply.c:5016

 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 

-#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21
-#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698
-#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127
-#: builtin/rebase--interactive.c:157
+#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22
+#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724
+#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/rebase--interactive.c:159

 msgid "be verbose"
 msgstr "ser verboso"
 
 msgid "be verbose"
 msgstr "ser verboso"
 

-#: apply.c:5018
+#: apply.c:5019

 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
 "archivo"
 
 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:5021
+#: apply.c:5022

 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"
 
 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:5023 builtin/am.c:2206
+#: apply.c:5024 builtin/am.c:2200

 msgid "root"
 msgstr "raíz"
 
 msgid "root"
 msgstr "raíz"
 

-#: apply.c:5024
+#: apply.c:5025

 msgid "prepend <root> to all filenames"
 msgstr "anteponer <root> a todos los nombres de archivos"
 
 msgid "prepend <root> to all filenames"
 msgstr "anteponer <root> a todos los nombres de archivos"
 


@@ -771,99 +780,118 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <comando>] --list"
 
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <comando>] --list"
 

-#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
+#: archive.c:372 builtin/add.c:177 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"
 
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
 

-#: archive.c:453
+#: archive.c:396
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "no existe el ref: %.*s"
+
+#: archive.c:401
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "nombre de objeto no válido: %s"
+
+#: archive.c:414
+#, c-format
+msgid "not a tree object: %s"
+msgstr "no es un objeto tree: %s"
+
+#: archive.c:424
+msgid "current working directory is untracked"
+msgstr "directorio de trabajo actual no rastreado"
+
+#: archive.c:455

 msgid "fmt"
 msgstr "fmt"
 
 msgid "fmt"
 msgstr "fmt"
 

-#: archive.c:453
+#: archive.c:455

 msgid "archive format"
 msgstr "formato del archivo"
 
 msgid "archive format"
 msgstr "formato del archivo"
 

-#: archive.c:454 builtin/log.c:1536
+#: archive.c:456 builtin/log.c:1549

 msgid "prefix"
 msgstr "prefijo"
 
 msgid "prefix"
 msgstr "prefijo"
 

-#: archive.c:455
+#: archive.c:457

 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteponer prefijo a cada ruta en el archivo"
 
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteponer prefijo a cada ruta en el archivo"
 

-#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
-#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884
-#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562
-#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122
+#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
+#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895
+#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

 #: parse-options.h:162
 msgid "file"
 msgstr "carpeta"
 
 #: parse-options.h:162
 msgid "file"
 msgstr "carpeta"
 

-#: archive.c:457 builtin/archive.c:89
+#: archive.c:459 builtin/archive.c:90

 msgid "write the archive to this file"
 msgstr "escribe el archivo en esta carpeta"
 
 msgid "write the archive to this file"
 msgstr "escribe el archivo en esta carpeta"
 

-#: archive.c:459
+#: archive.c:461

 msgid "read .gitattributes in working directory"
 msgstr "leer .gitattributes en el directorio de trabajo"
 
 msgid "read .gitattributes in working directory"
 msgstr "leer .gitattributes en el directorio de trabajo"
 

-#: archive.c:460
+#: archive.c:462

 msgid "report archived files on stderr"
 msgstr "reportar archivos archivados por stderr"
 
 msgid "report archived files on stderr"
 msgstr "reportar archivos archivados por stderr"
 

-#: archive.c:461
+#: archive.c:463

 msgid "store only"
 msgstr "solo guardar"
 
 msgid "store only"
 msgstr "solo guardar"
 

-#: archive.c:462
+#: archive.c:464

 msgid "compress faster"
 msgstr "comprimir mas rápido"
 
 msgid "compress faster"
 msgstr "comprimir mas rápido"
 

-#: archive.c:470
+#: archive.c:472

 msgid "compress better"
 msgstr "comprimir mejor"
 
 msgid "compress better"
 msgstr "comprimir mejor"
 

-#: archive.c:473
+#: archive.c:475

 msgid "list supported archive formats"
 msgstr "listar los formatos de carpeta soportados"
 
 msgid "list supported archive formats"
 msgstr "listar los formatos de carpeta soportados"
 

-#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114
-#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855
+#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
+#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

 msgid "repo"
 msgstr "repo"
 
 msgid "repo"
 msgstr "repo"
 

-#: archive.c:476 builtin/archive.c:91
+#: archive.c:478 builtin/archive.c:92

 msgid "retrieve the archive from remote repository <repo>"
 msgstr "obtener la carpeta del repositorio remoto <repo>"
 
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "obtener la carpeta del repositorio remoto <repo>"
 

-#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714
-#: builtin/notes.c:496
+#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498

 msgid "command"
 msgstr "comando"
 
 msgid "command"
 msgstr "comando"
 

-#: archive.c:478 builtin/archive.c:93
+#: archive.c:480 builtin/archive.c:94

 msgid "path to the remote git-upload-archive command"
 msgstr "ruta para el comando git-upload-archivo remoto"
 
 msgid "path to the remote git-upload-archive command"
 msgstr "ruta para el comando git-upload-archivo remoto"
 

-#: archive.c:485
+#: archive.c:487

 msgid "Unexpected option --remote"
 msgstr "Opción inesperada --remote"
 
 msgid "Unexpected option --remote"
 msgstr "Opción inesperada --remote"
 

-#: archive.c:487
+#: archive.c:489

 msgid "Option --exec can only be used together with --remote"
 msgstr "Opción --exec solo puede ser utilizada con --remote"
 
 msgid "Option --exec can only be used together with --remote"
 msgstr "Opción --exec solo puede ser utilizada con --remote"
 

-#: archive.c:489
+#: archive.c:491

 msgid "Unexpected option --output"
 msgstr "Opción inesperada --output"
 
 msgid "Unexpected option --output"
 msgstr "Opción inesperada --output"
 

-#: archive.c:511
+#: archive.c:513

 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Formato de carpeta desconocido '%s'"
 
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Formato de carpeta desconocido '%s'"
 

-#: archive.c:518
+#: archive.c:520

 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumento no soportado para formato '%s': -%d"
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumento no soportado para formato '%s': -%d"


@@ -907,7 +935,7 @@ msgstr "ruta no válida UTF-8: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
 
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
 

-#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227
+#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

 #, c-format
 msgid "deflate error (%d)"
 msgstr "error al desinflar (%d)"
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error al desinflar (%d)"


@@ -917,12 +945,17 @@ msgstr "error al desinflar (%d)"
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
 
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
 

-#: attr.c:212
+#: attr.c:211

 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no es un nombre de atributo valido"
 
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no es un nombre de atributo valido"
 

-#: attr.c:409
+#: attr.c:368
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s no permitido: %s:%d"
+
+#: attr.c:408

 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."


@@ -935,17 +968,17 @@ msgstr ""
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 

-#: bisect.c:676
+#: bisect.c:678

 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "¡No podemos biseccionar más!\n"
 
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "¡No podemos biseccionar más!\n"
 

-#: bisect.c:730
+#: bisect.c:733

 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No es un nombre de commit valido %s"
 
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No es un nombre de commit valido %s"
 

-#: bisect.c:754
+#: bisect.c:758

 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"


@@ -954,7 +987,7 @@ msgstr ""
 "La base de fisión %s está mal.\n"
 "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
 
 "La base de fisión %s está mal.\n"
 "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
 

-#: bisect.c:759
+#: bisect.c:763

 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 #, c-format
 msgid ""
 "The merge base %s is new.\n"


@@ -963,7 +996,7 @@ msgstr ""
 "La base de fisión %s es nueva.\n"
 "Esta propiedad ha cambiado entre %s y [%s].\n"
 
 "La base de fisión %s es nueva.\n"
 "Esta propiedad ha cambiado entre %s y [%s].\n"
 

-#: bisect.c:764
+#: bisect.c:768

 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"


@@ -972,7 +1005,7 @@ msgstr ""
 "La base de fisión %s es %s.\n"
 "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
 
 "La base de fisión %s es %s.\n"
 "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
 

-#: bisect.c:772
+#: bisect.c:776

 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"


@@ -983,7 +1016,7 @@ msgstr ""
 "git bisect no puede trabajar bien en este caso.\n"
 "Tal vez confundió la revisión %s y %s?\n"
 
 "git bisect no puede trabajar bien en este caso.\n"
 "Tal vez confundió la revisión %s y %s?\n"
 

-#: bisect.c:785
+#: bisect.c:789

 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"


@@ -994,36 +1027,36 @@ msgstr ""
 "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"
 "Vamos a continuar de todas maneras."
 
 "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"
 "Vamos a continuar de todas maneras."
 

-#: bisect.c:818
+#: bisect.c:822

 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Biseccionando: una base de fisión debe ser probada\n"
 
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Biseccionando: una base de fisión debe ser probada\n"
 

-#: bisect.c:858
+#: bisect.c:865

 #, c-format
 msgid "a %s revision is needed"
 msgstr "una %s revisión es necesaria"
 
 #, c-format
 msgid "a %s revision is needed"
 msgstr "una %s revisión es necesaria"
 

-#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237
+#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

 #, c-format
 msgid "could not create file '%s'"
 msgstr "no se pudo crear el archivo '%s'"
 
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no se pudo crear el archivo '%s'"
 

-#: bisect.c:928 builtin/merge.c:138
+#: bisect.c:937 builtin/merge.c:139

 #, c-format
 msgid "could not read file '%s'"
 msgstr "no se pudo leer el archivo '%s'"
 
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no se pudo leer el archivo '%s'"
 

-#: bisect.c:958
+#: bisect.c:967

 msgid "reading bisect refs failed"
 msgstr "falló leer las refs de bisect"
 
 msgid "reading bisect refs failed"
 msgstr "falló leer las refs de bisect"
 

-#: bisect.c:977
+#: bisect.c:986

 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s fue tanto %s como %s\n"
 
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s fue tanto %s como %s\n"
 

-#: bisect.c:985
+#: bisect.c:994

 #, c-format
 msgid ""
 "No testable commit found.\n"
 #, c-format
 msgid ""
 "No testable commit found.\n"


@@ -1032,7 +1065,7 @@ msgstr ""
 "No se encontró commit que se pueda probar.\n"
 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
 
 "No se encontró commit que se pueda probar.\n"
 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
 

-#: bisect.c:1004
+#: bisect.c:1013

 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"


@@ -1042,47 +1075,47 @@ msgstr[1] "(aproximadamente %d pasos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.

-#: bisect.c:1010
+#: bisect.c:1019

 #, 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"
 msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n"
 msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n"
 
 #, 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"
 msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n"
 msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n"
 

-#: blame.c:1787
+#: blame.c:1792

 msgid "--contents and --reverse do not blend well."
 msgstr "--contents y --reverse no se mezclan bien."
 
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents y --reverse no se mezclan bien."
 

-#: blame.c:1801
+#: blame.c:1806

 msgid "cannot use --contents with final commit object name"
 msgstr "no se puede usar --contents con el nombre de objeto commit final"
 
 msgid "cannot use --contents with final commit object name"
 msgstr "no se puede usar --contents con el nombre de objeto commit final"
 

-#: blame.c:1822
+#: blame.c:1827

 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse y --first-parent juntos requieren especificar el último commit"
 
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse y --first-parent juntos requieren especificar el último commit"
 

-#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
-#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
-#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
+#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993
+#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936
+#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "falló la configuración del camino de revisión"
 
 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "falló la configuración del camino de revisión"
 

-#: blame.c:1849
+#: blame.c:1854

 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
 "del primer padre"
 
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
 "del primer padre"
 

-#: blame.c:1860
+#: blame.c:1865

 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hay una ruta %s en %s"
 
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hay una ruta %s en %s"
 

-#: blame.c:1871
+#: blame.c:1876

 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no se puede leer el blob %s para la ruta %s"
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no se puede leer el blob %s para la ruta %s"


@@ -1211,27 +1244,27 @@ msgstr ""
 "\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
 "el push."
 
 "\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
 "el push."
 

-#: branch.c:279
+#: branch.c:280

 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "Nombre de objeto no valido: '%s'."
 
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "Nombre de objeto no valido: '%s'."
 

-#: branch.c:299
+#: branch.c:300

 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Nombre de objeto ambiguo: '%s'."
 
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Nombre de objeto ambiguo: '%s'."
 

-#: branch.c:304
+#: branch.c:305

 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "Punto de rama no valido: '%s'."
 
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "Punto de rama no valido: '%s'."
 

-#: branch.c:358
+#: branch.c:359

 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ya ha sido marcado en '%s'"
 
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ya ha sido marcado en '%s'"
 

-#: branch.c:381
+#: branch.c:382

 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD del árbol de trabajo %s no está actualizada"
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD del árbol de trabajo %s no está actualizada"


@@ -1246,70 +1279,70 @@ msgstr "'%s' no se ve como un archivo bundle v2"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 

-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722
-#: builtin/commit.c:774
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763
+#: builtin/commit.c:776

 #, c-format
 msgid "could not open '%s'"
 msgstr "no se pudo abrir '%s'"
 
 #, c-format
 msgid "could not open '%s'"
 msgstr "no se pudo abrir '%s'"
 

-#: bundle.c:141
+#: bundle.c:143

 msgid "Repository lacks these prerequisite commits:"
 msgstr "Al repositorio le falta estos commits prerrequisito:"
 
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Al repositorio le falta estos commits prerrequisito:"
 

-#: bundle.c:192
+#: bundle.c:194

 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "El bundle contiene esta referencia:"
 msgstr[1] "El bundle contiene estas %d referencias:"
 
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "El bundle contiene esta referencia:"
 msgstr[1] "El bundle contiene estas %d referencias:"
 

-#: bundle.c:199
+#: bundle.c:201

 msgid "The bundle records a complete history."
 msgstr "El bundle registra una historia completa."
 
 msgid "The bundle records a complete history."
 msgstr "El bundle registra una historia completa."
 

-#: bundle.c:201
+#: bundle.c:203

 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El bundle requiere esta referencia:"
 msgstr[1] "El bundle requiere estas %d referencias:"
 
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El bundle requiere esta referencia:"
 msgstr[1] "El bundle requiere estas %d referencias:"
 

-#: bundle.c:267
+#: bundle.c:269

 msgid "unable to dup bundle descriptor"
 msgstr "incapaz de duplicar bundle descriptor"
 
 msgid "unable to dup bundle descriptor"
 msgstr "incapaz de duplicar bundle descriptor"
 

-#: bundle.c:274
+#: bundle.c:276

 msgid "Could not spawn pack-objects"
 msgstr "No se pudo crear los pack-objetcts"
 
 msgid "Could not spawn pack-objects"
 msgstr "No se pudo crear los pack-objetcts"
 

-#: bundle.c:285
+#: bundle.c:287

 msgid "pack-objects died"
 msgstr "pack-objects murió"
 
 msgid "pack-objects died"
 msgstr "pack-objects murió"
 

-#: bundle.c:327
+#: bundle.c:329

 msgid "rev-list died"
 msgstr "rev-list murió"
 
 msgid "rev-list died"
 msgstr "rev-list murió"
 

-#: bundle.c:376
+#: bundle.c:378

 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referencia '%s' es excluida por las opciones de rev-list"
 
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referencia '%s' es excluida por las opciones de rev-list"
 

-#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304
+#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento no reconocido: %s"
 
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento no reconocido: %s"
 

-#: bundle.c:464
+#: bundle.c:465

 msgid "Refusing to create empty bundle."
 msgstr "Rechazando crear un bundle vacío."
 
 msgid "Refusing to create empty bundle."
 msgstr "Rechazando crear un bundle vacío."
 

-#: bundle.c:474
+#: bundle.c:475

 #, c-format
 msgid "cannot create '%s'"
 msgstr "no se puede crear '%s'"
 
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no se puede crear '%s'"
 

-#: bundle.c:498
+#: bundle.c:500

 msgid "index-pack died"
 msgstr "index-pack murió"
 
 msgid "index-pack died"
 msgstr "index-pack murió"
 


@@ -1318,8 +1351,8 @@ msgstr "index-pack murió"
 msgid "invalid color value: %.*s"
 msgstr "color inválido: %.*s"
 
 msgid "invalid color value: %.*s"
 msgstr "color inválido: %.*s"
 

-#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414
-#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376
+#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399
+#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

 #: builtin/replace.c:448
 #, c-format
 msgid "could not parse %s"
 #: builtin/replace.c:448
 #, c-format
 msgid "could not parse %s"


@@ -1350,27 +1383,27 @@ msgstr ""
 "Apapa este mensaje ejecutando\n"
 "\"git config advice.graftFileDeprecated false\""
 
 "Apapa este mensaje ejecutando\n"
 "\"git config advice.graftFileDeprecated false\""
 

-#: commit.c:1115
+#: commit.c:1122

 #, 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."
 
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
 

-#: commit.c:1118
+#: commit.c:1125

 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
 
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
 

-#: commit.c:1121
+#: commit.c:1128

 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s no tiene una firma GPG."
 
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s no tiene una firma GPG."
 

-#: commit.c:1124
+#: commit.c:1131

 #, 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"
 
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "El Commit %s tiene una buena firma GPG por %s\n"
 

-#: commit.c:1378
+#: commit.c:1385

 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"
 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"


@@ -1381,93 +1414,134 @@ msgstr ""
 "variable de configuración i18n.commitencoding para la codificación que usa "
 "su proyecto.\n"
 
 "variable de configuración i18n.commitencoding para la codificación que usa "
 "su proyecto.\n"
 

-#: commit-graph.c:108
+#: commit-graph.c:101

 #, c-format
 msgid "graph file %s is too small"
 msgstr "archivo graph %s es muy pequeño"
 
 #, c-format
 msgid "graph file %s is too small"
 msgstr "archivo graph %s es muy pequeño"
 

-#: commit-graph.c:115
+#: commit-graph.c:136

 #, c-format
 msgid "graph signature %X does not match signature %X"
 msgstr "firma de graph %X no concuerda con firma %X"
 
 #, c-format
 msgid "graph signature %X does not match signature %X"
 msgstr "firma de graph %X no concuerda con firma %X"
 

-#: commit-graph.c:122
+#: commit-graph.c:143

 #, c-format
 msgid "graph version %X does not match version %X"
 msgstr "versión de graph %X no concuerda con versión %X"
 
 #, c-format
 msgid "graph version %X does not match version %X"
 msgstr "versión de graph %X no concuerda con versión %X"
 

-#: commit-graph.c:129
+#: commit-graph.c:150

 #, c-format
 msgid "hash version %X does not match version %X"
 msgstr "versión de hash %X no concuerda con versión %X"
 
 #, c-format
 msgid "hash version %X does not match version %X"
 msgstr "versión de hash %X no concuerda con versión %X"
 

-#: commit-graph.c:153
+#: commit-graph.c:173
+msgid "chunk lookup table entry missing; graph file may be incomplete"
+msgstr "falta tabla de lookup del chunk; graph puede estar incompleto"
+
+#: commit-graph.c:184

 #, c-format
 msgid "improper chunk offset %08x%08x"
 msgstr "offset del chunk impropio %08x%08x"
 
 #, c-format
 msgid "improper chunk offset %08x%08x"
 msgstr "offset del chunk impropio %08x%08x"
 

-#: commit-graph.c:189
+#: commit-graph.c:221

 #, c-format
 msgid "chunk id %08x appears multiple times"
 msgstr "id de chunk %08x parece tener múltiples tiempos"
 
 #, c-format
 msgid "chunk id %08x appears multiple times"
 msgstr "id de chunk %08x parece tener múltiples tiempos"
 

-#: commit-graph.c:308
+#: commit-graph.c:334

 #, c-format
 msgid "could not find commit %s"
 msgstr "no se pudo encontrar commit %s"
 
 #, c-format
 msgid "could not find commit %s"
 msgstr "no se pudo encontrar commit %s"
 

-#: commit-graph.c:617 builtin/pack-objects.c:2652
+#: commit-graph.c:671 builtin/pack-objects.c:2646

 #, c-format
 msgid "unable to get type of object %s"
 msgstr "incapaz de obtener el tipo de objeto: %s"
 
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "incapaz de obtener el tipo de objeto: %s"
 

-#: commit-graph.c:651
-msgid "Annotating commits in commit graph"
-msgstr "Anotando commits en commit graph"
+#: commit-graph.c:704
+msgid "Loading known commits in commit graph"
+msgstr "Cargando commits conocidos en commit graph"
+
+#: commit-graph.c:720
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expandiendo commits alcanzables en commit graph"
+
+#: commit-graph.c:732
+msgid "Clearing commit marks in commit graph"
+msgstr "Limpiando marcas de commits en commit graph"

 
 

-#: commit-graph.c:691
+#: commit-graph.c:752

 msgid "Computing commit graph generation numbers"
 msgstr "Calculando números de generación de commit graph"
 
 msgid "Computing commit graph generation numbers"
 msgstr "Calculando números de generación de commit graph"
 

-#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852
-msgid "Finding commits for commit graph"
-msgstr "Encontrando commits para commit graph"
+#: commit-graph.c:869
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Encontrando commits para commit graph en %d pack"
+msgstr[1] "Encontrando commits para commit graph en %d packs"

 
 

-#: commit-graph.c:812
+#: commit-graph.c:882

 #, c-format
 msgid "error adding pack %s"
 msgstr "error agregando pack %s"
 
 #, c-format
 msgid "error adding pack %s"
 msgstr "error agregando pack %s"
 

-#: commit-graph.c:814
+#: commit-graph.c:884

 #, c-format
 msgid "error opening index for %s"
 msgstr "error abriendo index para %s"
 
 #, c-format
 msgid "error opening index for %s"
 msgstr "error abriendo index para %s"
 

-#: commit-graph.c:868
+#: commit-graph.c:898
+#, c-format
+msgid "Finding commits for commit graph from %d ref"
+msgid_plural "Finding commits for commit graph from %d refs"
+msgstr[0] "Encontrando commits para commit graph de %d ref"
+msgstr[1] "Encontrando commits para commit graph de %d refs"
+
+#: commit-graph.c:930
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
+
+#: commit-graph.c:943
+msgid "Counting distinct commits in commit graph"
+msgstr "Contando commits distintos en commit graph"
+
+#: commit-graph.c:956

 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr "el formato de gráficos de commit no pudede escribir %d commits"
 
 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr "el formato de gráficos de commit no pudede escribir %d commits"
 

-#: commit-graph.c:895
+#: commit-graph.c:965
+msgid "Finding extra edges in commit graph"
+msgstr "Encontrando esquinas extra en commit graph"
+
+#: commit-graph.c:989

 msgid "too many commits to write graph"
 msgstr "demasiados commits para escribir el gráfico"
 
 msgid "too many commits to write graph"
 msgstr "demasiados commits para escribir el gráfico"
 

-#: commit-graph.c:902 midx.c:769
+#: commit-graph.c:996 midx.c:769

 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no se pudo crear directorios principales para %s"
 
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no se pudo crear directorios principales para %s"
 

-#: commit-graph.c:1002
+#: commit-graph.c:1036
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Escribiendo commit graph en %d paso"
+msgstr[1] "Escribiendo commit graph en %d pasos"
+
+#: commit-graph.c:1109

 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "el archivo de commit-graph tiene checksums incorrectos y probablemente está "
 "corrupto"
 
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "el archivo de commit-graph tiene checksums incorrectos y probablemente está "
 "corrupto"
 

-#: commit-graph.c:1046
+#: commit-graph.c:1153

 msgid "Verifying commits in commit graph"
 msgstr "Verificando commits en commit graph"
 
 msgid "Verifying commits in commit graph"
 msgstr "Verificando commits en commit graph"
 

-#: compat/obstack.c:405 compat/obstack.c:407
+#: compat/obstack.c:406 compat/obstack.c:408

 msgid "memory exhausted"
 msgstr "memoria agotada"
 
 msgid "memory exhausted"
 msgstr "memoria agotada"
 


@@ -1510,7 +1584,7 @@ msgstr "llave no contiene una sección: %s"
 msgid "key does not contain variable name: %s"
 msgstr "llave no contiene el nombre de variable: %s"
 
 msgid "key does not contain variable name: %s"
 msgstr "llave no contiene el nombre de variable: %s"
 

-#: config.c:378 sequencer.c:2296
+#: config.c:378 sequencer.c:2330

 #, c-format
 msgid "invalid key: %s"
 msgstr "llave inválida: %s"
 #, c-format
 msgid "invalid key: %s"
 msgstr "llave inválida: %s"


@@ -1648,7 +1722,7 @@ msgstr "valor malformado para %s: %s"
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "debe ser uno de nothing, matching, simple, upstream o current"
 
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "debe ser uno de nothing, matching, simple, upstream o current"
 

-#: config.c:1481 builtin/pack-objects.c:3391
+#: config.c:1481 builtin/pack-objects.c:3394

 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivel de compresión de pack erróneo %d"
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivel de compresión de pack erróneo %d"


@@ -1724,62 +1798,62 @@ msgstr "%s tiene múltiples valores"
 msgid "failed to write new configuration file %s"
 msgstr "falló al escribir nuevo archivo de configuración %s"
 
 msgid "failed to write new configuration file %s"
 msgstr "falló al escribir nuevo archivo de configuración %s"
 

-#: config.c:2717 config.c:3041
+#: config.c:2716 config.c:3040

 #, c-format
 msgid "could not lock config file %s"
 msgstr "no se pudo bloquear archivo de configuración %s"
 
 #, c-format
 msgid "could not lock config file %s"
 msgstr "no se pudo bloquear archivo de configuración %s"
 

-#: config.c:2728
+#: config.c:2727

 #, c-format
 msgid "opening %s"
 msgstr "abriendo %s"
 
 #, c-format
 msgid "opening %s"
 msgstr "abriendo %s"
 

-#: config.c:2763 builtin/config.c:327
+#: config.c:2762 builtin/config.c:328

 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patrón inválido: %s"
 
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patrón inválido: %s"
 

-#: config.c:2788
+#: config.c:2787

 #, c-format
 msgid "invalid config file %s"
 msgstr "archivo de configuración inválido: %s"
 
 #, c-format
 msgid "invalid config file %s"
 msgstr "archivo de configuración inválido: %s"
 

-#: config.c:2801 config.c:3054
+#: config.c:2800 config.c:3053

 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat en %s falló"
 
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat en %s falló"
 

-#: config.c:2812
+#: config.c:2811

 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "no es posible hacer mmap '%s'"
 
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "no es posible hacer mmap '%s'"
 

-#: config.c:2821 config.c:3059
+#: config.c:2820 config.c:3058

 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod en %s falló"
 
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod en %s falló"
 

-#: config.c:2906 config.c:3156
+#: config.c:2905 config.c:3155

 #, c-format
 msgid "could not write config file %s"
 msgstr "no se pudo escribir el archivo de configuración %s"
 
 #, c-format
 msgid "could not write config file %s"
 msgstr "no se pudo escribir el archivo de configuración %s"
 

-#: config.c:2940
+#: config.c:2939

 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no se pudo configurar '%s' a '%s'"
 
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no se pudo configurar '%s' a '%s'"
 

-#: config.c:2942 builtin/remote.c:782
+#: config.c:2941 builtin/remote.c:782

 #, c-format
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
 
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
 

-#: config.c:3032
+#: config.c:3031

 #, c-format
 msgid "invalid section name: %s"
 msgstr "sección de nombre inválida: %s"
 
 #, c-format
 msgid "invalid section name: %s"
 msgstr "sección de nombre inválida: %s"
 

-#: config.c:3199
+#: config.c:3198

 #, c-format
 msgid "missing value for '%s'"
 msgstr "valor faltante para '%s'"
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valor faltante para '%s'"


@@ -1832,50 +1906,45 @@ msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
 msgid "repository on the other end cannot be shallow"
 msgstr "el repositorio en el otro final no puede ser superficial"
 
 msgid "repository on the other end cannot be shallow"
 msgstr "el repositorio en el otro final no puede ser superficial"
 

-#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "error remoto: %s"
-
-#: connect.c:316
+#: connect.c:313

 msgid "invalid packet"
 msgstr "paquete inválido"
 
 msgid "invalid packet"
 msgstr "paquete inválido"
 

-#: connect.c:336
+#: connect.c:333

 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "error de protocolo: '%s' inesperado"
 
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "error de protocolo: '%s' inesperado"
 

-#: connect.c:444
+#: connect.c:441

 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "respuesta de referencias ls-refs inválida: %s"
 
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "respuesta de referencias ls-refs inválida: %s"
 

-#: connect.c:448
+#: connect.c:445

 msgid "expected flush after ref listing"
 msgstr "flush esperado tras listado de refs"
 
 msgid "expected flush after ref listing"
 msgstr "flush esperado tras listado de refs"
 

-#: connect.c:547
+#: connect.c:544

 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protocolo '%s' no es soportado"
 
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protocolo '%s' no es soportado"
 

-#: connect.c:598
+#: connect.c:595

 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "no es posible configurar SO_KEEPALIVE en el socket"
 
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "no es posible configurar SO_KEEPALIVE en el socket"
 

-#: connect.c:638 connect.c:701
+#: connect.c:635 connect.c:698

 #, c-format
 msgid "Looking up %s ... "
 msgstr "Revisando %s... "
 
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Revisando %s... "
 

-#: connect.c:642
+#: connect.c:639

 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "no se puede revisar %s (puerto %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "no se puede revisar %s (puerto %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "

-#: connect.c:646 connect.c:717
+#: connect.c:643 connect.c:714

 #, c-format
 msgid ""
 "done.\n"
 #, c-format
 msgid ""
 "done.\n"


@@ -1884,7 +1953,7 @@ msgstr ""
 "hecho.\n"
 "Conectando a %s (puerto %s) ... "
 
 "hecho.\n"
 "Conectando a %s (puerto %s) ... "
 

-#: connect.c:668 connect.c:745
+#: connect.c:665 connect.c:742

 #, c-format
 msgid ""
 "unable to connect to %s:\n"
 #, c-format
 msgid ""
 "unable to connect to %s:\n"


@@ -1894,62 +1963,62 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

-#: connect.c:674 connect.c:751
+#: connect.c:671 connect.c:748

 msgid "done."
 msgstr "hecho."
 
 msgid "done."
 msgstr "hecho."
 

-#: connect.c:705
+#: connect.c:702

 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "no es posible revisar %s (%s)"
 
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "no es posible revisar %s (%s)"
 

-#: connect.c:711
+#: connect.c:708

 #, c-format
 msgid "unknown port %s"
 msgstr "puerto desconocido %s"
 
 #, c-format
 msgid "unknown port %s"
 msgstr "puerto desconocido %s"
 

-#: connect.c:848 connect.c:1174
+#: connect.c:845 connect.c:1171

 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "hostname extraño '%s' bloqueado"
 
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "hostname extraño '%s' bloqueado"
 

-#: connect.c:850
+#: connect.c:847

 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "puerto extraño '%s' bloqueado"
 
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "puerto extraño '%s' bloqueado"
 

-#: connect.c:860
+#: connect.c:857

 #, c-format
 msgid "cannot start proxy %s"
 msgstr "no se puede comenzar proxy %s"
 
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "no se puede comenzar proxy %s"
 

-#: connect.c:927
+#: connect.c:924

 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"
 
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"
 

-#: connect.c:1122
+#: connect.c:1119

 msgid "ssh variant 'simple' does not support -4"
 msgstr "variante 'simple' de ssh no soporta -4"
 
 msgid "ssh variant 'simple' does not support -4"
 msgstr "variante 'simple' de ssh no soporta -4"
 

-#: connect.c:1134
+#: connect.c:1131

 msgid "ssh variant 'simple' does not support -6"
 msgstr "variante 'simple' de ssh no soporta -6"
 
 msgid "ssh variant 'simple' does not support -6"
 msgstr "variante 'simple' de ssh no soporta -6"
 

-#: connect.c:1151
+#: connect.c:1148

 msgid "ssh variant 'simple' does not support setting port"
 msgstr "variante ssh 'simple' no soporta configurar puerto"
 
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "variante ssh 'simple' no soporta configurar puerto"
 

-#: connect.c:1262
+#: connect.c:1259

 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ruta extraña '%s' bloqueada"
 
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ruta extraña '%s' bloqueada"
 

-#: connect.c:1307
+#: connect.c:1304

 msgid "unable to fork"
 msgstr "no es posible hacer fork"
 
 msgid "unable to fork"
 msgstr "no es posible hacer fork"
 

-#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147
+#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

 msgid "Checking connectivity"
 msgstr "Verificando conectividad"
 
 msgid "Checking connectivity"
 msgstr "Verificando conectividad"
 


@@ -1965,17 +2034,17 @@ msgstr "falló escribir a rev-list"
 msgid "failed to close rev-list's stdin"
 msgstr "falló al cerrar la entrada standard de rev-list"
 
 msgid "failed to close rev-list's stdin"
 msgstr "falló al cerrar la entrada standard de rev-list"
 

-#: convert.c:194
+#: convert.c:193

 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action %d ilegal"
 
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action %d ilegal"
 

-#: convert.c:207
+#: convert.c:206

 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF será reemplazado por LF en %s"
 
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF será reemplazado por LF en %s"
 

-#: convert.c:209
+#: convert.c:208

 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"


@@ -1984,12 +2053,12 @@ msgstr ""
 "CRLF será remplazado por LF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
 
 "CRLF será remplazado por LF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
 

-#: convert.c:217
+#: convert.c:216

 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF será reemplazado por CRLF en %s"
 
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF será reemplazado por CRLF en %s"
 

-#: convert.c:219
+#: convert.c:218

 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"


@@ -1998,12 +2067,12 @@ msgstr ""
 "LF será reemplazado por CRLF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
 
 "LF será reemplazado por CRLF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
 

-#: convert.c:280
+#: convert.c:279

 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM está prohibido en '%s' si es codificado como %s"
 
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM está prohibido en '%s' si es codificado como %s"
 

-#: convert.c:287
+#: convert.c:286

 #, c-format
 msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
 #, c-format
 msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"


@@ -2012,12 +2081,12 @@ msgstr ""
 "El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como "
 "working-tree-encoding."
 
 "El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como "
 "working-tree-encoding."
 

-#: convert.c:305
+#: convert.c:304

 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "BOM es requerido en '%s' si es codificado como %s"
 
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "BOM es requerido en '%s' si es codificado como %s"
 

-#: convert.c:307
+#: convert.c:306

 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"


@@ -2026,37 +2095,37 @@ msgstr ""
 "Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o "
 "UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding."
 
 "Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o "
 "UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding."
 

-#: convert.c:425 convert.c:496
+#: convert.c:424 convert.c:495

 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "falló al codificar '%s' de %s a %s"
 
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "falló al codificar '%s' de %s a %s"
 

-#: convert.c:468
+#: convert.c:467

 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
 
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
 

-#: convert.c:674
+#: convert.c:673

 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
 
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
 

-#: convert.c:694
+#: convert.c:693

 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "no se pueden alimentar de input a los filtros externos '%s'"
 
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "no se pueden alimentar de input a los filtros externos '%s'"
 

-#: convert.c:701
+#: convert.c:700

 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "filtro externo '%s' falló %d"
 
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "filtro externo '%s' falló %d"
 

-#: convert.c:736 convert.c:739
+#: convert.c:735 convert.c:738

 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "lectura de filtro externo '%s' falló"
 
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "lectura de filtro externo '%s' falló"
 

-#: convert.c:742 convert.c:796
+#: convert.c:741 convert.c:796

 #, c-format
 msgid "external filter '%s' failed"
 msgstr "filtro externo '%s' falló"
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "filtro externo '%s' falló"


@@ -2092,53 +2161,53 @@ msgstr "%s: falló al limpiar filtro '%s'"
 msgid "%s: smudge filter %s failed"
 msgstr "%s: filtro smudge %s falló"
 
 msgid "%s: smudge filter %s failed"
 msgstr "%s: filtro smudge %s falló"
 

-#: date.c:116
+#: date.c:137

 msgid "in the future"
 msgstr "en el futuro"
 
 msgid "in the future"
 msgstr "en el futuro"
 

-#: date.c:122
+#: date.c:143

 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "hace %<PRIuMAX> segundo"
 msgstr[1] "hace %<PRIuMAX> segundos"
 
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "hace %<PRIuMAX> segundo"
 msgstr[1] "hace %<PRIuMAX> segundos"
 

-#: date.c:129
+#: date.c:150

 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "hace %<PRIuMAX> minuto"
 msgstr[1] "hace %<PRIuMAX> minutos"
 
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "hace %<PRIuMAX> minuto"
 msgstr[1] "hace %<PRIuMAX> minutos"
 

-#: date.c:136
+#: date.c:157

 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "hace %<PRIuMAX> hora"
 msgstr[1] "hace %<PRIuMAX> horas"
 
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "hace %<PRIuMAX> hora"
 msgstr[1] "hace %<PRIuMAX> horas"
 

-#: date.c:143
+#: date.c:164

 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "hace %<PRIuMAX> día"
 msgstr[1] "hace %<PRIuMAX> días"
 
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "hace %<PRIuMAX> día"
 msgstr[1] "hace %<PRIuMAX> días"
 

-#: date.c:149
+#: date.c:170

 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "hace %<PRIuMAX> semana"
 msgstr[1] "hace %<PRIuMAX> semanas"
 
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "hace %<PRIuMAX> semana"
 msgstr[1] "hace %<PRIuMAX> semanas"
 

-#: date.c:156
+#: date.c:177

 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "hace %<PRIuMAX> mes"
 msgstr[1] "hace %<PRIuMAX> meses"
 
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "hace %<PRIuMAX> mes"
 msgstr[1] "hace %<PRIuMAX> meses"
 

-#: date.c:167
+#: date.c:188

 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"


@@ -2146,40 +2215,40 @@ msgstr[0] "%<PRIuMAX> año"
 msgstr[1] "%<PRIuMAX> años"
 
 #. TRANSLATORS: "%s" is "<n> years"
 msgstr[1] "%<PRIuMAX> años"
 
 #. TRANSLATORS: "%s" is "<n> years"

-#: date.c:170
+#: date.c:191

 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s, y %<PRIuMAX> mes atrás"
 msgstr[1] "%s, y %<PRIuMAX> meses atrás"
 
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s, y %<PRIuMAX> mes atrás"
 msgstr[1] "%s, y %<PRIuMAX> meses atrás"
 

-#: date.c:175 date.c:180
+#: date.c:196 date.c:201

 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] "hace %<PRIuMAX> año"
 msgstr[1] "hace %<PRIuMAX> años"
 
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] "hace %<PRIuMAX> año"
 msgstr[1] "hace %<PRIuMAX> años"
 

-#: delta-islands.c:268
+#: delta-islands.c:272

 msgid "Propagating island marks"
 msgstr "Propagando marcas isla"
 
 msgid "Propagating island marks"
 msgstr "Propagando marcas isla"
 

-#: delta-islands.c:286
+#: delta-islands.c:290

 #, c-format
 msgid "bad tree object %s"
 msgstr "mal objeto árbol %s"
 
 #, c-format
 msgid "bad tree object %s"
 msgstr "mal objeto árbol %s"
 

-#: delta-islands.c:330
+#: delta-islands.c:334

 #, c-format
 msgid "failed to load island regex for '%s': %s"
 msgstr "falló al cargar isla de regex para '%s': %s"
 
 #, c-format
 msgid "failed to load island regex for '%s': %s"
 msgstr "falló al cargar isla de regex para '%s': %s"
 

-#: delta-islands.c:386
+#: delta-islands.c:390

 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
 msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"
 
 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
 msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"
 

-#: delta-islands.c:462
+#: delta-islands.c:466

 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr "%d islas marcadas, listo.\n"
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr "%d islas marcadas, listo.\n"


@@ -2216,26 +2285,31 @@ msgstr ""
 "opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
 "'dimmed_zebra', 'plain'"
 
 "opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
 "'dimmed_zebra', 'plain'"
 

-#: diff.c:316
+#: diff.c:319

 #, c-format
 #, c-format

-msgid "ignoring unknown color-moved-ws mode '%s'"
-msgstr "ignorando modo desconocido color-moved-ws '%s'"
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
+msgstr ""
+"modo color-moved-ws desconocido '%s', valores posibles son 'ignore-space-"
+"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"change'"

 
 

-#: diff.c:323
+#: diff.c:327

 msgid ""
 msgid ""

-"color-moved-ws: allow-indentation-change cannot be combined with other white "
-"space modes"
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"

 msgstr ""
 "color-moved-ws: allow-indentation-change no puede ser combinado con otros "
 "modos de espacios en blanco"
 
 msgstr ""
 "color-moved-ws: allow-indentation-change no puede ser combinado con otros "
 "modos de espacios en blanco"
 

-#: diff.c:394
+#: diff.c:400

 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
 
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
 

-#: diff.c:454
+#: diff.c:460

 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"


@@ -2244,24 +2318,24 @@ msgstr ""
 "Errores en la variable de config 'diff.dirstat' encontrados:\n"
 "%s"
 
 "Errores en la variable de config 'diff.dirstat' encontrados:\n"
 "%s"
 

-#: diff.c:4140
+#: diff.c:4211

 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "diff externo murió, deteniendo en %s"
 
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "diff externo murió, deteniendo en %s"
 

-#: diff.c:4482
+#: diff.c:4553

 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
 
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
 

-#: diff.c:4485
+#: diff.c:4556

 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S y --find-object son mutuamente exclusivas"
 
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S y --find-object son mutuamente exclusivas"
 

-#: diff.c:4563
+#: diff.c:4634

 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requiere exactamente un pathspec"
 
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requiere exactamente un pathspec"
 

-#: diff.c:4729
+#: diff.c:4800

 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"


@@ -2270,22 +2344,22 @@ msgstr ""
 "Falló al analizar parámetro de opción --dirstat/-X:\n"
 "%s"
 
 "Falló al analizar parámetro de opción --dirstat/-X:\n"
 "%s"
 

-#: diff.c:4743
+#: diff.c:4814

 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Falló al analizar parámetro de opción --submodule: '%s'"
 
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Falló al analizar parámetro de opción --submodule: '%s'"
 

-#: diff.c:5823
+#: diff.c:5900

 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."
 
 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:5826
+#: diff.c:5903

 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "solo se encontraron copias de rutas modificadas por haber muchos archivos."
 
 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:5829
+#: diff.c:5906

 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."


@@ -2293,41 +2367,41 @@ msgstr ""
 "tal vez quiera configurar la variable %s para por lo menos %d y volver a "
 "intentar el comando."
 
 "tal vez quiera configurar la variable %s para por lo menos %d y volver a "
 "intentar el comando."
 

-#: dir.c:576
+#: dir.c:538

 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
 
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
 

-#: dir.c:965
+#: dir.c:927

 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "no se puede usar %s como archivo de exclusión"
 
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "no se puede usar %s como archivo de exclusión"
 

-#: dir.c:1880
+#: dir.c:1842

 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no se pudo abrir el directorio '%s'"
 
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no se pudo abrir el directorio '%s'"
 

-#: dir.c:2122
+#: dir.c:2084

 msgid "failed to get kernel name and information"
 msgstr "falló al conseguir la información y nombre del kernel"
 
 msgid "failed to get kernel name and information"
 msgstr "falló al conseguir la información y nombre del kernel"
 

-#: dir.c:2246
+#: dir.c:2208

 msgid "untracked cache is disabled on this system or location"
 msgstr "untracked cache está desactivado en este sistema o ubicación"
 
 msgid "untracked cache is disabled on this system or location"
 msgstr "untracked cache está desactivado en este sistema o ubicación"
 

-#: dir.c:3047
+#: dir.c:3009

 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "archivo índice corrompido en repositorio %s"
 
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "archivo índice corrompido en repositorio %s"
 

-#: dir.c:3092 dir.c:3097
+#: dir.c:3054 dir.c:3059

 #, c-format
 msgid "could not create directories for %s"
 msgstr "no se pudo crear directorios para %s"
 
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no se pudo crear directorios para %s"
 

-#: dir.c:3126
+#: dir.c:3088

 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no se pudo migrar el directorio git de '%s' a '%s'"


@@ -2369,235 +2443,240 @@ msgstr "Remoto sin URL"
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: lista poco profunda esperada"
 
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: lista poco profunda esperada"
 

-#: fetch-pack.c:163
+#: fetch-pack.c:154
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+"git fetch-pack: se esperaba un flush packet luego de la lista superficial"
+
+#: fetch-pack.c:165

 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
 
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
 

-#: fetch-pack.c:183
+#: fetch-pack.c:185

 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
 
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
 

-#: fetch-pack.c:253
+#: fetch-pack.c:256

 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requiere multi_ack_detailed"
 
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requiere multi_ack_detailed"
 

-#: fetch-pack.c:347 fetch-pack.c:1277
+#: fetch-pack.c:358 fetch-pack.c:1264

 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línea poco profunda inválida: %s"
 
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línea poco profunda inválida: %s"
 

-#: fetch-pack.c:353 fetch-pack.c:1283
+#: fetch-pack.c:364 fetch-pack.c:1271

 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línea superficial inválida: %s"
 
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línea superficial inválida: %s"
 

-#: fetch-pack.c:355 fetch-pack.c:1285
+#: fetch-pack.c:366 fetch-pack.c:1273

 #, c-format
 msgid "object not found: %s"
 msgstr "objeto no encontrado: %s"
 
 #, c-format
 msgid "object not found: %s"
 msgstr "objeto no encontrado: %s"
 

-#: fetch-pack.c:358 fetch-pack.c:1288
+#: fetch-pack.c:369 fetch-pack.c:1276

 #, c-format
 msgid "error in object: %s"
 msgstr "error en objeto: %s"
 
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objeto: %s"
 

-#: fetch-pack.c:360 fetch-pack.c:1290
+#: fetch-pack.c:371 fetch-pack.c:1278

 #, c-format
 msgid "no shallow found: %s"
 msgstr "superficie no encontrada: %s"
 
 #, c-format
 msgid "no shallow found: %s"
 msgstr "superficie no encontrada: %s"
 

-#: fetch-pack.c:363 fetch-pack.c:1293
+#: fetch-pack.c:374 fetch-pack.c:1282

 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "se esperaba shallow/unshallow, se obtuvo %s"
 
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "se esperaba shallow/unshallow, se obtuvo %s"
 

-#: fetch-pack.c:404
+#: fetch-pack.c:415

 #, c-format
 msgid "got %s %d %s"
 msgstr "se obtuvo %s %d %s"
 
 #, c-format
 msgid "got %s %d %s"
 msgstr "se obtuvo %s %d %s"
 

-#: fetch-pack.c:421
+#: fetch-pack.c:432

 #, c-format
 msgid "invalid commit %s"
 msgstr "commit inválido %s"
 
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit inválido %s"
 

-#: fetch-pack.c:452
+#: fetch-pack.c:463

 msgid "giving up"
 msgstr "rindiéndose"
 
 msgid "giving up"
 msgstr "rindiéndose"
 

-#: fetch-pack.c:464 progress.c:229
+#: fetch-pack.c:475 progress.c:229

 msgid "done"
 msgstr "listo"
 
 msgid "done"
 msgstr "listo"
 

-#: fetch-pack.c:476
+#: fetch-pack.c:487

 #, c-format
 msgid "got %s (%d) %s"
 msgstr "se obtuvo %s (%d) %s"
 
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "se obtuvo %s (%d) %s"
 

-#: fetch-pack.c:522
+#: fetch-pack.c:533

 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcando %s como completa"
 
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcando %s como completa"
 

-#: fetch-pack.c:764
+#: fetch-pack.c:740

 #, c-format
 msgid "already have %s (%s)"
 msgstr "ya se tiene %s (%s)"
 
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ya se tiene %s (%s)"
 

-#: fetch-pack.c:803
+#: fetch-pack.c:779

 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
 
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
 

-#: fetch-pack.c:811
+#: fetch-pack.c:787

 msgid "protocol error: bad pack header"
 msgstr "error de protocolo: paquete de header erróneo"
 
 msgid "protocol error: bad pack header"
 msgstr "error de protocolo: paquete de header erróneo"
 

-#: fetch-pack.c:879
+#: fetch-pack.c:855

 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no se puede quitar %s"
 
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no se puede quitar %s"
 

-#: fetch-pack.c:895
+#: fetch-pack.c:871

 #, c-format
 msgid "%s failed"
 msgstr "%s falló"
 
 #, c-format
 msgid "%s failed"
 msgstr "%s falló"
 

-#: fetch-pack.c:897
+#: fetch-pack.c:873

 msgid "error in sideband demultiplexer"
 msgstr "error en demultiplexor de banda lateral"
 
 msgid "error in sideband demultiplexer"
 msgstr "error en demultiplexor de banda lateral"
 

-#: fetch-pack.c:926
+#: fetch-pack.c:902

 msgid "Server does not support shallow clients"
 msgstr "El servidor no soporta clientes superficiales"
 
 msgid "Server does not support shallow clients"
 msgstr "El servidor no soporta clientes superficiales"
 

-#: fetch-pack.c:930
+#: fetch-pack.c:906

 msgid "Server supports multi_ack_detailed"
 msgstr "El servidor soporta ulti_ack_detailed"
 
 msgid "Server supports multi_ack_detailed"
 msgstr "El servidor soporta ulti_ack_detailed"
 

-#: fetch-pack.c:933
+#: fetch-pack.c:909

 msgid "Server supports no-done"
 msgstr "El servidor soporta no-done"
 
 msgid "Server supports no-done"
 msgstr "El servidor soporta no-done"
 

-#: fetch-pack.c:939
+#: fetch-pack.c:915

 msgid "Server supports multi_ack"
 msgstr "El servidor soporta multi_ack"
 
 msgid "Server supports multi_ack"
 msgstr "El servidor soporta multi_ack"
 

-#: fetch-pack.c:943
+#: fetch-pack.c:919

 msgid "Server supports side-band-64k"
 msgstr "El servidor soporta side-band-64k"
 
 msgid "Server supports side-band-64k"
 msgstr "El servidor soporta side-band-64k"
 

-#: fetch-pack.c:947
+#: fetch-pack.c:923

 msgid "Server supports side-band"
 msgstr "El servidor soporta side-band"
 
 msgid "Server supports side-band"
 msgstr "El servidor soporta side-band"
 

-#: fetch-pack.c:951
+#: fetch-pack.c:927

 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "El servidor soporta allow-tip-sha1-in-want"
 
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "El servidor soporta allow-tip-sha1-in-want"
 

-#: fetch-pack.c:955
+#: fetch-pack.c:931

 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "El servidor soporta allow-reachable-sha1-in-want"
 
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "El servidor soporta allow-reachable-sha1-in-want"
 

-#: fetch-pack.c:965
+#: fetch-pack.c:941

 msgid "Server supports ofs-delta"
 msgstr "El servidor soporta ofs-delta"
 
 msgid "Server supports ofs-delta"
 msgstr "El servidor soporta ofs-delta"
 

-#: fetch-pack.c:971 fetch-pack.c:1158
+#: fetch-pack.c:947 fetch-pack.c:1140

 msgid "Server supports filter"
 msgstr "El servidor soporta filtro"
 
 msgid "Server supports filter"
 msgstr "El servidor soporta filtro"
 

-#: fetch-pack.c:979
+#: fetch-pack.c:955

 #, c-format
 msgid "Server version is %.*s"
 msgstr "Versión de servidor es %.*s"
 
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Versión de servidor es %.*s"
 

-#: fetch-pack.c:985
+#: fetch-pack.c:961

 msgid "Server does not support --shallow-since"
 msgstr "El servidor no soporta --shalow-since"
 
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no soporta --shalow-since"
 

-#: fetch-pack.c:989
+#: fetch-pack.c:965

 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no soporta --shalow-exclude"
 
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no soporta --shalow-exclude"
 

-#: fetch-pack.c:991
+#: fetch-pack.c:967

 msgid "Server does not support --deepen"
 msgstr "El servidor no soporta --deepen"
 
 msgid "Server does not support --deepen"
 msgstr "El servidor no soporta --deepen"
 

-#: fetch-pack.c:1008
+#: fetch-pack.c:984

 msgid "no common commits"
 msgstr "no hay commits comunes"
 
 msgid "no common commits"
 msgstr "no hay commits comunes"
 

-#: fetch-pack.c:1020 fetch-pack.c:1418
+#: fetch-pack.c:996 fetch-pack.c:1419

 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch falló."
 
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch falló."
 

-#: fetch-pack.c:1153
+#: fetch-pack.c:1134

 msgid "Server does not support shallow requests"
 msgstr "El servidor no soporta peticiones superficiales"
 
 msgid "Server does not support shallow requests"
 msgstr "El servidor no soporta peticiones superficiales"
 

-#: fetch-pack.c:1199
+#: fetch-pack.c:1184

 #, c-format
 msgid "error reading section header '%s'"
 msgstr "error leyendo sección header '%s'"
 
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "error leyendo sección header '%s'"
 

-#: fetch-pack.c:1205
+#: fetch-pack.c:1190

 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "se esperaba '%s', se recibió '%s'"
 
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "se esperaba '%s', se recibió '%s'"
 

-#: fetch-pack.c:1244
+#: fetch-pack.c:1229

 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "linea de confirmación inesperada: '%s'"
 
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "linea de confirmación inesperada: '%s'"
 

-#: fetch-pack.c:1249
+#: fetch-pack.c:1234

 #, c-format
 msgid "error processing acks: %d"
 msgstr "error procesando acks: %d"
 
 #, c-format
 msgid "error processing acks: %d"
 msgstr "error procesando acks: %d"
 

-#: fetch-pack.c:1259
+#: fetch-pack.c:1244

 msgid "expected packfile to be sent after 'ready'"
 msgstr "espere que el packfile sea mandado luego del 'listo'"
 
 msgid "expected packfile to be sent after 'ready'"
 msgstr "espere que el packfile sea mandado luego del 'listo'"
 

-#: fetch-pack.c:1261
+#: fetch-pack.c:1246

 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"
 
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"
 

-#: fetch-pack.c:1298
+#: fetch-pack.c:1287

 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "error procesando información superficial: %d"
 
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "error procesando información superficial: %d"
 

-#: fetch-pack.c:1314
+#: fetch-pack.c:1308

 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "se esperaba wanted-ref, se obtuvo '%s'"
 
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "se esperaba wanted-ref, se obtuvo '%s'"
 

-#: fetch-pack.c:1324
+#: fetch-pack.c:1318

 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperado: '%s'"
 
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperado: '%s'"
 

-#: fetch-pack.c:1328
+#: fetch-pack.c:1322

 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "error procesando refs deseadas: %d"
 
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "error procesando refs deseadas: %d"
 

-#: fetch-pack.c:1642
+#: fetch-pack.c:1646

 msgid "no matching remote head"
 msgstr "no concuerda el head remoto"
 
 msgid "no matching remote head"
 msgstr "no concuerda el head remoto"
 

-#: fetch-pack.c:1660 builtin/clone.c:664
+#: fetch-pack.c:1664 builtin/clone.c:671

 msgid "remote did not send all necessary objects"
 msgstr "remoto no mando todos los objetos necesarios"
 
 msgid "remote did not send all necessary objects"
 msgstr "remoto no mando todos los objetos necesarios"
 

-#: fetch-pack.c:1686
+#: fetch-pack.c:1690

 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existe ref remota %s"
 
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existe ref remota %s"
 

-#: fetch-pack.c:1689
+#: fetch-pack.c:1693

 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"


@@ -2625,8 +2704,8 @@ msgstr "ignora color inválido '%.*s' en log.graphColors"
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 

-#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81
-#: builtin/rm.c:134
+#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: builtin/rm.c:135

 #, c-format
 msgid "failed to stat '%s'"
 msgstr "falló al marcar '%s'"
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "falló al marcar '%s'"


@@ -2688,41 +2767,41 @@ msgstr "Comandos de bajo nivel / Sincronización de repositorios"
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Comandos de bajo nivel / Auxiliares internos"
 
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Comandos de bajo nivel / Auxiliares internos"
 

-#: help.c:296
+#: help.c:298

 #, c-format
 msgid "available git commands in '%s'"
 msgstr "comandos disponibles de git en '%s'"
 
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "comandos disponibles de git en '%s'"
 

-#: help.c:303
+#: help.c:305

 msgid "git commands available from elsewhere on your $PATH"
 msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
 
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
 

-#: help.c:312
+#: help.c:314

 msgid "These are common Git commands used in various situations:"
 msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
 
 msgid "These are common Git commands used in various situations:"
 msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
 

-#: help.c:361 git.c:90
+#: help.c:363 git.c:90

 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "comando de listado de tipos no soportado '%s'"
 
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "comando de listado de tipos no soportado '%s'"
 

-#: help.c:408
+#: help.c:410

 msgid "The common Git guides are:"
 msgstr "Las guías comunes de Git son:"
 
 msgid "The common Git guides are:"
 msgstr "Las guías comunes de Git son:"
 

-#: help.c:517
+#: help.c:519

 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
 
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
 

-#: help.c:522
+#: help.c:524

 msgid "External commands"
 msgstr "Comandos externos"
 
 msgid "External commands"
 msgstr "Comandos externos"
 

-#: help.c:530
+#: help.c:539

 msgid "Command aliases"
 msgstr "Aliases de comando"
 
 msgid "Command aliases"
 msgstr "Aliases de comando"
 

-#: help.c:594
+#: help.c:603

 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"


@@ -2731,31 +2810,31 @@ msgstr ""
 "'%s' parece ser un comando de git, pero no hemos\n"
 "podido ejecutarlo. Tal vez git-%s se ha roto?"
 
 "'%s' parece ser un comando de git, pero no hemos\n"
 "podido ejecutarlo. Tal vez git-%s se ha roto?"
 

-#: help.c:653
+#: help.c:662

 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
 
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
 

-#: help.c:675
+#: help.c:684

 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
 
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
 

-#: help.c:680
+#: help.c:689

 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Continuando asumiendo que quisiste decir '%s'."
 
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Continuando asumiendo que quisiste decir '%s'."
 

-#: help.c:685
+#: help.c:694

 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
 
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
 

-#: help.c:693
+#: help.c:702

 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
 
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
 

-#: help.c:697
+#: help.c:706

 msgid ""
 "\n"
 "The most similar command is"
 msgid ""
 "\n"
 "The most similar command is"


@@ -2769,16 +2848,16 @@ msgstr[1] ""
 "\n"
 "Los comandos mas similares son"
 
 "\n"
 "Los comandos mas similares son"
 

-#: help.c:712
+#: help.c:721

 msgid "git version [<options>]"
 msgstr "git versión [<opciones>]"
 
 msgid "git version [<options>]"
 msgstr "git versión [<opciones>]"
 

-#: help.c:780
+#: help.c:789

 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 

-#: help.c:784
+#: help.c:793

 msgid ""
 "\n"
 "Did you mean this?"
 msgid ""
 "\n"
 "Did you mean this?"


@@ -2846,20 +2925,20 @@ msgstr "no se puede tener un nombre vacío (para <%s>)"
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nombre consiste solo de caracteres no permitidos: %s"
 
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nombre consiste solo de caracteres no permitidos: %s"
 

-#: ident.c:419 builtin/commit.c:606
+#: ident.c:419 builtin/commit.c:608

 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de fecha inválido: %s"
 
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de fecha inválido: %s"
 

-#: list-objects-filter-options.c:35
+#: list-objects-filter-options.c:36

 msgid "multiple filter-specs cannot be combined"
 msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
 
 #: list-objects-filter-options.c:58
 msgid "multiple filter-specs cannot be combined"
 msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
 
 #: list-objects-filter-options.c:58

-msgid "only 'tree:0' is supported"
-msgstr "solo 'tree:0' es soportado"
+msgid "expected 'tree:<depth>'"
+msgstr "se esperaba 'tree:<depth>'"

 
 

-#: list-objects-filter-options.c:137
+#: list-objects-filter-options.c:152

 msgid "cannot change partial clone promisor remote"
 msgstr "no se puede cambiar un clon parcial remoto promisor"
 
 msgid "cannot change partial clone promisor remote"
 msgstr "no se puede cambiar un clon parcial remoto promisor"
 


@@ -2892,94 +2971,94 @@ msgstr "No se pudo crear '%s.lock': %s"
 msgid "failed to read the cache"
 msgstr "falló al leer la cache"
 
 msgid "failed to read the cache"
 msgstr "falló al leer la cache"
 

-#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933
-#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764
+#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918
+#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

 msgid "unable to write new index file"
 msgstr "no es posible escribir el archivo índice"
 
 msgid "unable to write new index file"
 msgstr "no es posible escribir el archivo índice"
 

-#: merge-recursive.c:323
+#: merge-recursive.c:332

 msgid "(bad commit)\n"
 msgstr "(commit erróneo)\n"
 
 msgid "(bad commit)\n"
 msgstr "(commit erróneo)\n"
 

-#: merge-recursive.c:345
+#: merge-recursive.c:355

 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
 
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
 

-#: merge-recursive.c:353
+#: merge-recursive.c:364

 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."
 
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."
 

-#: merge-recursive.c:435
+#: merge-recursive.c:447

 msgid "error building trees"
 msgstr "error construyendo árboles"
 
 msgid "error building trees"
 msgstr "error construyendo árboles"
 

-#: merge-recursive.c:906
+#: merge-recursive.c:902

 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "falló al crear la ruta '%s'%s"
 
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "falló al crear la ruta '%s'%s"
 

-#: merge-recursive.c:917
+#: merge-recursive.c:913

 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
 
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
 

-#: merge-recursive.c:931 merge-recursive.c:950
+#: merge-recursive.c:927 merge-recursive.c:946

 msgid ": perhaps a D/F conflict?"
 msgstr ": tal vez un conflicto D/F?"
 
 msgid ": perhaps a D/F conflict?"
 msgstr ": tal vez un conflicto D/F?"
 

-#: merge-recursive.c:940
+#: merge-recursive.c:936

 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "rehusando perder el archivo rastreado en '%s'"
 
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "rehusando perder el archivo rastreado en '%s'"
 

-#: merge-recursive.c:982 builtin/cat-file.c:39
+#: merge-recursive.c:978 builtin/cat-file.c:40

 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no se puede leer el objeto %s '%s'"
 
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no se puede leer el objeto %s '%s'"
 

-#: merge-recursive.c:984
+#: merge-recursive.c:980

 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "se esperaba blob para %s '%s'"
 
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "se esperaba blob para %s '%s'"
 

-#: merge-recursive.c:1008
+#: merge-recursive.c:1004

 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "falló al abrir '%s': %s"
 
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "falló al abrir '%s': %s"
 

-#: merge-recursive.c:1019
+#: merge-recursive.c:1015

 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "falló al crear el enlace simbólico '%s': %s"
 
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "falló al crear el enlace simbólico '%s': %s"
 

-#: merge-recursive.c:1024
+#: merge-recursive.c:1020

 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se que hacer con %06o %s '%s'"
 
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se que hacer con %06o %s '%s'"
 

-#: merge-recursive.c:1212
+#: merge-recursive.c:1211

 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Falló al fusionar el submódulo %s (no revisado)"
 
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Falló al fusionar el submódulo %s (no revisado)"
 

-#: merge-recursive.c:1219
+#: merge-recursive.c:1218

 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
 
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
 

-#: merge-recursive.c:1226
+#: merge-recursive.c:1225

 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
 
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
 

-#: merge-recursive.c:1234 merge-recursive.c:1246
+#: merge-recursive.c:1233 merge-recursive.c:1245

 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"
 
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"
 

-#: merge-recursive.c:1237 merge-recursive.c:1249
+#: merge-recursive.c:1236 merge-recursive.c:1248

 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rápido en submódulo %s"
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rápido en submódulo %s"


@@ -3021,28 +3100,28 @@ msgstr ""
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
 
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
 

-#: merge-recursive.c:1358
+#: merge-recursive.c:1361

 msgid "Failed to execute internal merge"
 msgstr "Falló al ejecutar la fusión interna"
 
 msgid "Failed to execute internal merge"
 msgstr "Falló al ejecutar la fusión interna"
 

-#: merge-recursive.c:1363
+#: merge-recursive.c:1366

 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No es posible agregar %s a la base de datos"
 
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No es posible agregar %s a la base de datos"
 

-#: merge-recursive.c:1395
+#: merge-recursive.c:1398

 #, c-format
 msgid "Auto-merging %s"
 msgstr "Auto-fusionando %s"
 
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Auto-fusionando %s"
 

-#: merge-recursive.c:1416
+#: merge-recursive.c:1419

 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
 "cambio."
 
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
 "cambio."
 

-#: merge-recursive.c:1483
+#: merge-recursive.c:1486

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "


@@ -3051,7 +3130,7 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "
 "en el árbol."
 
 "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "
 "en el árbol."
 

-#: merge-recursive.c:1488
+#: merge-recursive.c:1491

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "


@@ -3060,7 +3139,7 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
 "permanece en el árbol."
 
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
 "permanece en el árbol."
 

-#: merge-recursive.c:1495
+#: merge-recursive.c:1498

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "


@@ -3069,7 +3148,7 @@ msgstr ""
 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
 "dejada en el árbol, en %s."
 
 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
 "dejada en el árbol, en %s."
 

-#: merge-recursive.c:1500
+#: merge-recursive.c:1503

 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "


@@ -3078,32 +3157,44 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
 "permanece en el árbol en %s."
 
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
 "permanece en el árbol en %s."
 

-#: merge-recursive.c:1534
+#: merge-recursive.c:1537

 msgid "rename"
 msgstr "renombrar"
 
 msgid "rename"
 msgstr "renombrar"
 

-#: merge-recursive.c:1534
+#: merge-recursive.c:1537

 msgid "renamed"
 msgstr "renombrado"
 
 msgid "renamed"
 msgstr "renombrado"
 

-#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369
-#: merge-recursive.c:3124
+#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Rehusando perder el archivo sucio en %s"
 
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Rehusando perder el archivo sucio en %s"
 

-#: merge-recursive.c:1602
+#: merge-recursive.c:1643
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
+"interponiendo."
+
+#: merge-recursive.c:1706
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgstr ""
+"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s.  %s agregado en %s"
+
+#: merge-recursive.c:1734

 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s es un directorio en %s agregando como %s más bien"
 
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s es un directorio en %s agregando como %s más bien"
 

-#: merge-recursive.c:1607
+#: merge-recursive.c:1739

 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"
 
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"
 

-#: merge-recursive.c:1633
+#: merge-recursive.c:1759

 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"


@@ -3112,30 +3203,18 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
 "renombrar \"%s\"->\"%s\" en \"%s\"%s"
 
 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
 "renombrar \"%s\"->\"%s\" en \"%s\"%s"
 

-#: merge-recursive.c:1638
+#: merge-recursive.c:1764

 msgid " (left unresolved)"
 msgstr " (dejado sin resolver)"
 
 msgid " (left unresolved)"
 msgstr " (dejado sin resolver)"
 

-#: merge-recursive.c:1699
+#: merge-recursive.c:1868

 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
 "%s"
 
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
 "%s"
 

-#: merge-recursive.c:1734
-#, c-format
-msgid "Renaming %s to %s and %s to %s instead"
-msgstr "Renombrando %s a %s y %s a %s más bien"
-
-#: merge-recursive.c:1746
-#, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr ""
-"Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
-"interponiendo."
-
-#: merge-recursive.c:1952
+#: merge-recursive.c:2064

 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "


@@ -3146,7 +3225,7 @@ msgstr ""
 "colocar %s porque el directorio %s fue renombrado a otros múltiples "
 "directorios, sin ningún que contenga la mayoría de archivos."
 
 "colocar %s porque el directorio %s fue renombrado a otros múltiples "
 "directorios, sin ningún que contenga la mayoría de archivos."
 

-#: merge-recursive.c:1984
+#: merge-recursive.c:2096

 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "


@@ -3156,7 +3235,7 @@ msgstr ""
 "existente en %s se interpone con el cambio de nombres implícito, poniendo "
 "la(s) siguiente(s) ruta(s) aquí: %s."
 
 "existente en %s se interpone con el cambio de nombres implícito, poniendo "
 "la(s) siguiente(s) ruta(s) aquí: %s."
 

-#: merge-recursive.c:1994
+#: merge-recursive.c:2106

 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "


@@ -3165,7 +3244,7 @@ msgstr ""
 "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
 "para %s; cambio de nombre implícito intentó poner estas rutas: %s"
 
 "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
 "para %s; cambio de nombre implícito intentó poner estas rutas: %s"
 

-#: merge-recursive.c:2086
+#: merge-recursive.c:2198

 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"


@@ -3174,7 +3253,7 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
 "Renombrar directorio %s->%s en %s"
 
 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
 "Renombrar directorio %s->%s en %s"
 

-#: merge-recursive.c:2331
+#: merge-recursive.c:2443

 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "


@@ -3183,88 +3262,82 @@ msgstr ""
 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
 "renombrado."
 
 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
 "renombrado."
 

-#: merge-recursive.c:2737
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr ""
-"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
-
-#: merge-recursive.c:2763
-#, c-format
-msgid "Adding merged %s"
-msgstr "Agregar %s fusionado"
-
-#: merge-recursive.c:2770 merge-recursive.c:3127
-#, c-format
-msgid "Adding as %s instead"
-msgstr "Agregando más bien como %s"
-
-#: merge-recursive.c:2934
+#: merge-recursive.c:3022

 #, c-format
 msgid "cannot read object %s"
 msgstr "no se pudo leer el objeto %s"
 
 #, c-format
 msgid "cannot read object %s"
 msgstr "no se pudo leer el objeto %s"
 

-#: merge-recursive.c:2937
+#: merge-recursive.c:3025

 #, c-format
 msgid "object %s is not a blob"
 msgstr "objeto %s no es un blob"
 
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objeto %s no es un blob"
 

-#: merge-recursive.c:3006
+#: merge-recursive.c:3094

 msgid "modify"
 msgstr "modificar"
 
 msgid "modify"
 msgstr "modificar"
 

-#: merge-recursive.c:3006
+#: merge-recursive.c:3094

 msgid "modified"
 msgstr "modificado"
 
 msgid "modified"
 msgstr "modificado"
 

-#: merge-recursive.c:3017
+#: merge-recursive.c:3105

 msgid "content"
 msgstr "contenido"
 
 msgid "content"
 msgstr "contenido"
 

-#: merge-recursive.c:3024
+#: merge-recursive.c:3112

 msgid "add/add"
 msgstr "agregar/agregar"
 
 msgid "add/add"
 msgstr "agregar/agregar"
 

-#: merge-recursive.c:3071
+#: merge-recursive.c:3160

 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Saltado %s (fusionado como existente)"
 
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Saltado %s (fusionado como existente)"
 

-#: merge-recursive.c:3093 git-submodule.sh:858
+#: merge-recursive.c:3182 git-submodule.sh:861

 msgid "submodule"
 msgstr "submódulo"
 
 msgid "submodule"
 msgstr "submódulo"
 

-#: merge-recursive.c:3094
+#: merge-recursive.c:3183

 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
 
 #: merge-recursive.c:3216
 #, c-format
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
 
 #: merge-recursive.c:3216
 #, c-format

+msgid "Adding as %s instead"
+msgstr "Agregando más bien como %s"
+
+#: merge-recursive.c:3319
+#, c-format

 msgid "Removing %s"
 msgstr "Eliminando %s"
 
 msgid "Removing %s"
 msgstr "Eliminando %s"
 

-#: merge-recursive.c:3242
+#: merge-recursive.c:3345

 msgid "file/directory"
 msgstr "archivo/directorio"
 
 msgid "file/directory"
 msgstr "archivo/directorio"
 

-#: merge-recursive.c:3248
+#: merge-recursive.c:3351

 msgid "directory/file"
 msgstr "directorio/archivo"
 
 msgid "directory/file"
 msgstr "directorio/archivo"
 

-#: merge-recursive.c:3255
+#: merge-recursive.c:3358

 #, 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"
 
 #, 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:3264
+#: merge-recursive.c:3367

 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 
 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 

-#: merge-recursive.c:3300
+#: merge-recursive.c:3376
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
+
+#: merge-recursive.c:3417

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"


@@ -3274,36 +3347,36 @@ msgstr ""
 "merge:\n"
 "  %s"
 
 "merge:\n"
 "  %s"
 

-#: merge-recursive.c:3311
+#: merge-recursive.c:3428

 msgid "Already up to date!"
 msgstr "¡Ya está actualizado!"
 
 msgid "Already up to date!"
 msgstr "¡Ya está actualizado!"
 

-#: merge-recursive.c:3320
+#: merge-recursive.c:3437

 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "falló la fusión de los árboles %s y %s"
 
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "falló la fusión de los árboles %s y %s"
 

-#: merge-recursive.c:3419
+#: merge-recursive.c:3536

 msgid "Merging:"
 msgstr "Fusionando:"
 
 msgid "Merging:"
 msgstr "Fusionando:"
 

-#: merge-recursive.c:3432
+#: merge-recursive.c:3549

 #, 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:"
 
 #, 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:3471
+#: merge-recursive.c:3588

 msgid "merge returned no commit"
 msgstr "la fusión no devolvió ningún commit"
 
 msgid "merge returned no commit"
 msgstr "la fusión no devolvió ningún commit"
 

-#: merge-recursive.c:3537
+#: merge-recursive.c:3654

 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 

-#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849
+#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

 msgid "Unable to write index."
 msgstr "Incapaz de escribir el índice."
 
 msgid "Unable to write index."
 msgstr "Incapaz de escribir el índice."
 


@@ -3422,22 +3495,22 @@ msgstr "falló al cargar el pack-index para packfile %s"
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 

-#: name-hash.c:532
+#: name-hash.c:531

 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "no es posible crear hilo lazy_dir: %s"
 
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "no es posible crear hilo lazy_dir: %s"
 

-#: name-hash.c:554
+#: name-hash.c:553

 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "no es posible crear hilo lazy_name: %s"
 
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "no es posible crear hilo lazy_name: %s"
 

-#: name-hash.c:560
+#: name-hash.c:559

 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "no es posible unir hilo lazy_name: %s"
 
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "no es posible unir hilo lazy_name: %s"
 

-#: notes-merge.c:275
+#: notes-merge.c:277

 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"


@@ -3449,23 +3522,23 @@ msgstr ""
 "confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "
 "nota de fusión."
 
 "confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "
 "nota de fusión."
 

-#: notes-merge.c:282
+#: notes-merge.c:284

 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "No has terminado tus notas de fusión (%s existe)."
 
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "No has terminado tus notas de fusión (%s existe)."
 

-#: notes-utils.c:45
+#: notes-utils.c:46

 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 "No se puede realizar commit, notas del árbol no inicializadas o no "
 "referenciadas"
 
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 "No se puede realizar commit, notas del árbol no inicializadas o no "
 "referenciadas"
 

-#: notes-utils.c:104
+#: notes-utils.c:105

 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Valor erróneo para notes.rewriteMode: '%s'"
 
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Valor erróneo para notes.rewriteMode: '%s'"
 

-#: notes-utils.c:114
+#: notes-utils.c:115

 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"


@@ -3474,7 +3547,7 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
 #. the environment variable, the second %s is
 #. its value.
 #.
 #. the environment variable, the second %s is
 #. its value.
 #.

-#: notes-utils.c:144
+#: notes-utils.c:145

 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Valor erróneo para %s: '%s'"
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Valor erróneo para %s: '%s'"


@@ -3484,47 +3557,107 @@ msgstr "Valor erróneo para %s: '%s'"
 msgid "invalid object type \"%s\""
 msgstr "tipo de objeto \"%s\" inválido"
 
 msgid "invalid object type \"%s\""
 msgstr "tipo de objeto \"%s\" inválido"
 

-#: object.c:173
+#: object.c:174

 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "objeto %s es un %s, no un %s"
 
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "objeto %s es un %s, no un %s"
 

-#: object.c:233
+#: object.c:234

 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "el objeto %s tiene un id de tipo desconocido %d"
 
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "el objeto %s tiene un id de tipo desconocido %d"
 

-#: object.c:246
+#: object.c:247

 #, c-format
 msgid "unable to parse object: %s"
 msgstr "incapaz de analizar objeto: %s"
 
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "incapaz de analizar objeto: %s"
 

-#: object.c:266 object.c:277
+#: object.c:267 object.c:278

 #, c-format
 #, c-format

-msgid "sha1 mismatch %s"
-msgstr "sha1 no concuerda %s"
+msgid "hash mismatch %s"
+msgstr "hash no concuerda %s"

 
 #: packfile.c:607
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes del final del paquete (broken .idx?)"
 
 
 #: packfile.c:607
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes del final del paquete (broken .idx?)"
 

-#: packfile.c:1864
+#: packfile.c:1870

 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
 
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "offset antes del comienzo del índice del paquete para %s (índice corrupto?)"
 

-#: packfile.c:1868
+#: packfile.c:1874

 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset más allá del índice de fin de paquete para %s (índice truncado?)"
 
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset más allá del índice de fin de paquete para %s (índice truncado?)"
 

-#: parse-options.c:672
+#: parse-options.c:35
+#, c-format
+msgid "%s requires a value"
+msgstr "%s requiere un valor"
+
+#: parse-options.c:69
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s es incompatible con %s"
+
+#: parse-options.c:74
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s : incompatible con otra cosa"
+
+#: parse-options.c:88 parse-options.c:92 parse-options.c:260
+#, c-format
+msgid "%s takes no value"
+msgstr "%s no toma valores"
+
+#: parse-options.c:90
+#, c-format
+msgid "%s isn't available"
+msgstr "%s no está disponible"
+
+#: parse-options.c:178
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s espera un valor numérico"
+
+#: parse-options.c:194
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
+
+#: parse-options.c:322
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
+
+#: parse-options.c:356 parse-options.c:364
+#, c-format
+msgid "did you mean `--%s` (with two dashes ?)"
+msgstr "¿quisiste decir `--%s` (con dos guiones)?"
+
+#: parse-options.c:649
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opción `%s' desconocida"
+
+#: parse-options.c:651
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "switch desconocido `%c'"
+
+#: parse-options.c:653
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "opcion desconocida en string no ascii: `%s'"
+
+#: parse-options.c:675

 msgid "..."
 msgstr "..."
 
 msgid "..."
 msgstr "..."
 

-#: parse-options.c:691
+#: parse-options.c:694

 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"


@@ -3532,26 +3665,36 @@ msgstr "uso: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.

-#: parse-options.c:697
+#: parse-options.c:700

 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
 
 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
 

-#: parse-options.c:700
+#: parse-options.c:703

 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 

-#: parse-options.c:739
+#: parse-options.c:742

 msgid "-NUM"
 msgstr "-NUM"
 
 msgid "-NUM"
 msgstr "-NUM"
 

-#: parse-options-cb.c:37
+#: parse-options-cb.c:21
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "opción `%s' espera un valor numérico"
+
+#: parse-options-cb.c:38

 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "fecha de expiración mal formada: '%s'"
 
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "fecha de expiración mal formada: '%s'"
 

-#: parse-options-cb.c:109
+#: parse-options-cb.c:51
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
+
+#: parse-options-cb.c:110

 #, c-format
 msgid "malformed object name '%s'"
 msgstr "nombre de objeto mal formado '%s'"
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "nombre de objeto mal formado '%s'"


@@ -3561,30 +3704,30 @@ msgstr "nombre de objeto mal formado '%s'"
 msgid "Could not make %s writable by group"
 msgstr "No se pudo hacer que %s fuera escribible por el grupo"
 
 msgid "Could not make %s writable by group"
 msgstr "No se pudo hacer que %s fuera escribible por el grupo"
 

-#: pathspec.c:129
+#: pathspec.c:128

 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Carácter de escape '\\' no permitido como último carácter en el valor attr"
 
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Carácter de escape '\\' no permitido como último carácter en el valor attr"
 

-#: pathspec.c:147
+#: pathspec.c:146

 msgid "Only one 'attr:' specification is allowed."
 msgstr "Solo una especificación 'attr' es permitida."
 
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Solo una especificación 'attr' es permitida."
 

-#: pathspec.c:150
+#: pathspec.c:149

 msgid "attr spec must not be empty"
 msgstr "especificación attr no puede estar vacía"
 
 msgid "attr spec must not be empty"
 msgstr "especificación attr no puede estar vacía"
 

-#: pathspec.c:193
+#: pathspec.c:192

 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nombre de atributo %s inválido"
 
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nombre de atributo %s inválido"
 

-#: pathspec.c:258
+#: pathspec.c:257

 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
 
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
 

-#: pathspec.c:265
+#: pathspec.c:264

 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"


@@ -3592,46 +3735,46 @@ msgstr ""
 "la configuración global de 'literal' para patrones de ruta es incompatible "
 "con las demás configuraciones globales de patrones de ruta"
 
 "la configuración global de 'literal' para patrones de ruta es incompatible "
 "con las demás configuraciones globales de patrones de ruta"
 

-#: pathspec.c:305
+#: pathspec.c:304

 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "parámetro no válido para el prefijo 'magic pathspec'"
 
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "parámetro no válido para el prefijo 'magic pathspec'"
 

-#: pathspec.c:326
+#: pathspec.c:325

 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Magic pathspec inválido '%.*s' en '%s'"
 
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Magic pathspec inválido '%.*s' en '%s'"
 

-#: pathspec.c:331
+#: pathspec.c:330

 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Falta ')' al final del magic pathspec en '%s'"
 
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Falta ')' al final del magic pathspec en '%s'"
 

-#: pathspec.c:369
+#: pathspec.c:368

 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Magic pathspec '%c' no implementado en '%s'"
 
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Magic pathspec '%c' no implementado en '%s'"
 

-#: pathspec.c:428
+#: pathspec.c:427

 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' y 'glob' son incompatibles"
 
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' y 'glob' son incompatibles"
 

-#: pathspec.c:441
+#: pathspec.c:440

 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s: '%s' está fuera del repositorio"
 
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s: '%s' está fuera del repositorio"
 

-#: pathspec.c:515
+#: pathspec.c:514

 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (nemotécnico: '%c')"
 
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (nemotécnico: '%c')"
 

-#: pathspec.c:525
+#: pathspec.c:524

 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: magic pathspec no soportado por este comando: %s"
 
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: magic pathspec no soportado por este comando: %s"
 

-#: pathspec.c:592
+#: pathspec.c:591

 #, 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"
 #, 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"


@@ -3640,50 +3783,55 @@ msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
 msgid "flush packet write failed"
 msgstr "limpieza de escritura de paquetes falló"
 
 msgid "flush packet write failed"
 msgstr "limpieza de escritura de paquetes falló"
 

-#: pkt-line.c:142 pkt-line.c:228
+#: pkt-line.c:144 pkt-line.c:230

 msgid "protocol error: impossibly long line"
 msgstr "error de protocolo: línea imposiblemente larga"
 
 msgid "protocol error: impossibly long line"
 msgstr "error de protocolo: línea imposiblemente larga"
 

-#: pkt-line.c:158 pkt-line.c:160
+#: pkt-line.c:160 pkt-line.c:162

 msgid "packet write with format failed"
 msgstr "escritura de paquetes con formato falló"
 
 msgid "packet write with format failed"
 msgstr "escritura de paquetes con formato falló"
 

-#: pkt-line.c:192
+#: pkt-line.c:194

 msgid "packet write failed - data exceeds max packet size"
 msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
 
 msgid "packet write failed - data exceeds max packet size"
 msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
 

-#: pkt-line.c:199 pkt-line.c:206
+#: pkt-line.c:201 pkt-line.c:208

 msgid "packet write failed"
 msgstr "escritura de paquetes falló"
 
 msgid "packet write failed"
 msgstr "escritura de paquetes falló"
 

-#: pkt-line.c:291
+#: pkt-line.c:293

 msgid "read error"
 msgstr "error de lectura"
 
 msgid "read error"
 msgstr "error de lectura"
 

-#: pkt-line.c:299
+#: pkt-line.c:301

 msgid "the remote end hung up unexpectedly"
 msgstr "el remoto se colgó de manera inesperada"
 
 msgid "the remote end hung up unexpectedly"
 msgstr "el remoto se colgó de manera inesperada"
 

-#: pkt-line.c:327
+#: pkt-line.c:329

 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
 
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
 

-#: pkt-line.c:337 pkt-line.c:342
+#: pkt-line.c:339 pkt-line.c:344

 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "error de protocolo: mal largo de línea %d"
 
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "error de protocolo: mal largo de línea %d"
 

-#: preload-index.c:118
+#: pkt-line.c:353
+#, c-format
+msgid "remote error: %s"
+msgstr "error remoto: %s"
+
+#: preload-index.c:119

 msgid "Refreshing index"
 msgstr "Refrescando index"
 
 msgid "Refreshing index"
 msgstr "Refrescando index"
 

-#: preload-index.c:137
+#: preload-index.c:138

 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "no es posible crear lstat hilado: %s"
 
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "no es posible crear lstat hilado: %s"
 

-#: pretty.c:962
+#: pretty.c:963

 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 
 msgid "unable to parse --pretty format"
 msgstr "incapaz de analizar el formato --pretty"
 


@@ -3695,7 +3843,7 @@ msgstr "no se pudo comenzar `log`"
 msgid "could not read `log` output"
 msgstr "no se pudo leer output de `log`"
 
 msgid "could not read `log` output"
 msgstr "no se pudo leer output de `log`"
 

-#: range-diff.c:74 sequencer.c:4764
+#: range-diff.c:74 sequencer.c:4828

 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no se pudo analizar commit '%s'"
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no se pudo analizar commit '%s'"


@@ -3709,11 +3857,46 @@ msgstr "falló al generar diff"
 msgid "could not parse log for '%s'"
 msgstr "no se pudo leer el log para '%s'"
 
 msgid "could not parse log for '%s'"
 msgstr "no se pudo leer el log para '%s'"
 

-#: read-cache.c:1490
+#: read-cache.c:673
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)"
+
+#: read-cache.c:689
+msgid "cannot create an empty blob in the object database"
+msgstr "no se puede crear un blob vacío en la base de datos de objetos"
+
+#: read-cache.c:710
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: solo puede agregar archivos regulares, symbolic links o git-directories"
+
+#: read-cache.c:765
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "no es posible indexar archivo '%s'"
+
+#: read-cache.c:784
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "No es posible agregar '%s' al index"
+
+#: read-cache.c:795
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "incapaz de correr stat en '%s'"
+
+#: read-cache.c:1304
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' parece ser un directorio y un archivo a la vez"
+
+#: read-cache.c:1489

 msgid "Refresh index"
 msgstr "Refrescar index"
 
 msgid "Refresh index"
 msgstr "Refrescar index"
 

-#: read-cache.c:1604
+#: read-cache.c:1603

 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"


@@ -3722,7 +3905,7 @@ msgstr ""
 "index.version configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
 "index.version configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 

-#: read-cache.c:1614
+#: read-cache.c:1613

 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"


@@ -3731,59 +3914,143 @@ msgstr ""
 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 

-#: read-cache.c:1792
+#: read-cache.c:1684
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "mala firma 0x%08x"
+
+#: read-cache.c:1687
+#, c-format
+msgid "bad index version %d"
+msgstr "mala versión del índice %d"
+
+#: read-cache.c:1696
+msgid "bad index file sha1 signature"
+msgstr "mala firma sha1 del archivo index"
+
+#: read-cache.c:1726
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "index usa %.4s extensiones, cosa que no entendemos"
+
+#: read-cache.c:1728
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "ignorando extensión %.4s"
+
+#: read-cache.c:1765
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "Formato de index desconocido 0x%08x"
+
+#: read-cache.c:1781

 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"
 
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "campo nombre malformado en el index, cerca a ruta '%s'"
 

-#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458
-#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585
-#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343
-#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144
-#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329
+#: read-cache.c:1836
+msgid "unordered stage entries in index"
+msgstr "entradas en stage desordenadas en index"
+
+#: read-cache.c:1839
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "múltiples entradas extrañas para archivo fusionado '%s'"
+
+#: read-cache.c:1842
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entradas de stage desordenadas para '%s'"
+
+#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111
+#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294
+#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955
+#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498
+#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
+#: builtin/submodule--helper.c:330

 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 
 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 

-#: read-cache.c:2101
+#: read-cache.c:2090

 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "no es posible crear hilo load_cache_entries: %s"
 
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "no es posible crear hilo load_cache_entries: %s"
 

-#: read-cache.c:2114
+#: read-cache.c:2103

 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "no es posible unir hilo load_cache_entires: %s"
 
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "no es posible unir hilo load_cache_entires: %s"
 

-#: read-cache.c:2201
+#: read-cache.c:2136
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: falló al abrir el archivo index"
+
+#: read-cache.c:2140
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: no se puede hacer stat del index abierto"
+
+#: read-cache.c:2144
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: archivo index más pequeño de lo esperado"
+
+#: read-cache.c:2148
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: no se pudo mapear el archivo index"
+
+#: read-cache.c:2190

 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "no es posible crear hilo load_index_extensions: %s"
 
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "no es posible crear hilo load_index_extensions: %s"
 

-#: read-cache.c:2228
+#: read-cache.c:2217

 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "no es posible unir hilo load_index_extensions: %s"
 
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "no es posible unir hilo load_index_extensions: %s"
 

-#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
+#: read-cache.c:2239
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "no se pudo refrescar el index compartido '%s'"
+
+#: read-cache.c:2274
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
+
+#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

 #, c-format
 msgid "could not close '%s'"
 msgstr "no se pudo cerrar '%s'"
 
 #, c-format
 msgid "could not close '%s'"
 msgstr "no se pudo cerrar '%s'"
 

-#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
+#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

 #, c-format
 msgid "could not stat '%s'"
 msgstr "no se pudo definir '%s'"
 
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no se pudo definir '%s'"
 

-#: read-cache.c:3068
+#: read-cache.c:3057

 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no es posible abrir el directorio de git: %s"
 
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no es posible abrir el directorio de git: %s"
 

-#: read-cache.c:3080
+#: read-cache.c:3069

 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible eliminar el vinculo: %s"
 
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible eliminar el vinculo: %s"
 

+#: read-cache.c:3088
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "no se pudo arreglar bits de permisos en '%s'"
+
+#: read-cache.c:3237
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: no se puede eliminar a stage #0"
+

 #: rebase-interactive.c:10
 msgid ""
 "\n"
 #: rebase-interactive.c:10
 msgid ""
 "\n"


@@ -3870,8 +4137,8 @@ msgstr ""
 msgid "Note that empty commits are commented out"
 msgstr "Tenga en cuenta que los commits vacíos están comentados"
 
 msgid "Note that empty commits are commented out"
 msgstr "Tenga en cuenta que los commits vacíos están comentados"
 

-#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186
-#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836
+#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219
+#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

 #, c-format
 msgid "could not read '%s'."
 msgstr "no se puede leer '%s'."
 #, c-format
 msgid "could not read '%s'."
 msgstr "no se puede leer '%s'."


@@ -3886,7 +4153,7 @@ msgstr "%s no apunta a ningún objeto válido!"
 msgid "ignoring dangling symref %s"
 msgstr "ignorando referencia rota %s"
 
 msgid "ignoring dangling symref %s"
 msgstr "ignorando referencia rota %s"
 

-#: refs.c:585 ref-filter.c:1951
+#: refs.c:585 ref-filter.c:1976

 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorando referencia rota %s"
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorando referencia rota %s"


@@ -3911,15 +4178,15 @@ msgstr "ref '%s' ya existe"
 msgid "unexpected object ID when writing '%s'"
 msgstr "ID de objecto inesperado cuando se escribía '%s'"
 
 msgid "unexpected object ID when writing '%s'"
 msgstr "ID de objecto inesperado cuando se escribía '%s'"
 

-#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636
-#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788
+#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675
+#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

 #: wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no se pudo escribir en '%s'"
 
 #: wrapper.c:656
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no se pudo escribir en '%s'"
 

-#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395
-#: builtin/am.c:728
+#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:713 builtin/rebase.c:575

 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no se pudo abrir '%s' para escritura"
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no se pudo abrir '%s' para escritura"


@@ -3994,7 +4261,7 @@ msgstr "no se pudo eliminar la referencia: %s"
 msgid "invalid refspec '%s'"
 msgstr "refspec inválido: '%s'"
 
 msgid "invalid refspec '%s'"
 msgstr "refspec inválido: '%s'"
 

-#: ref-filter.c:39 wt-status.c:1855
+#: ref-filter.c:39 wt-status.c:1861

 msgid "gone"
 msgstr "desaparecido"
 
 msgid "gone"
 msgstr "desaparecido"
 


@@ -4043,149 +4310,154 @@ msgstr "argumento: %s no reconocido %%(%s)"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) no toma ningún argumento"
 
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) no toma ningún argumento"
 

-#: ref-filter.c:235
+#: ref-filter.c:245
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "%%(objectsize) no reconocido argumento: %s"
+
+#: ref-filter.c:253

 #, c-format
 #, c-format

-msgid "%%(objectsize) does not take arguments"
-msgstr "%%(objectsize) no toma argumentos"
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) no toma argumentos"

 
 

-#: ref-filter.c:247
+#: ref-filter.c:265

 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no toma ningún argumento"
 
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no toma ningún argumento"
 

-#: ref-filter.c:256
+#: ref-filter.c:274

 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) no toma ningún argumento"
 
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) no toma ningún argumento"
 

-#: ref-filter.c:278
+#: ref-filter.c:296

 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "%%(trailers) desconocidos, argumento: %s"
 
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "%%(trailers) desconocidos, argumento: %s"
 

-#: ref-filter.c:307
+#: ref-filter.c:325

 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positivo esperado contents:lines=%s"
 
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positivo esperado contents:lines=%s"
 

-#: ref-filter.c:309
+#: ref-filter.c:327

 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argumento %s no reconocido %%(contents)"
 
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argumento %s no reconocido %%(contents)"
 

-#: ref-filter.c:324
+#: ref-filter.c:342

 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valor positivo esperado objectname:short=%s"
 
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valor positivo esperado objectname:short=%s"
 

-#: ref-filter.c:328
+#: ref-filter.c:346

 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "argumento: %s no reconocido %%(objectname)"
 
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "argumento: %s no reconocido %%(objectname)"
 

-#: ref-filter.c:358
+#: ref-filter.c:376

 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato esperado: %%(align:<ancho>,<posición>)"
 
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato esperado: %%(align:<ancho>,<posición>)"
 

-#: ref-filter.c:370
+#: ref-filter.c:388

 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posición desconocida: %s"
 
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posición desconocida: %s"
 

-#: ref-filter.c:377
+#: ref-filter.c:395

 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ancho desconocido: %s"
 
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ancho desconocido: %s"
 

-#: ref-filter.c:386
+#: ref-filter.c:404

 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argumento no reconocido para %%(align): %s"
 
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argumento no reconocido para %%(align): %s"
 

-#: ref-filter.c:394
+#: ref-filter.c:412

 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "se esperaba un ancho positivo con el átomo %%(align)"
 
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "se esperaba un ancho positivo con el átomo %%(align)"
 

-#: ref-filter.c:412
+#: ref-filter.c:430

 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argumento: %s no reconocido %%(if)"
 
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argumento: %s no reconocido %%(if)"
 

-#: ref-filter.c:508
+#: ref-filter.c:527

 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nombre mal formado de campo: %.*s"
 
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nombre mal formado de campo: %.*s"
 

-#: ref-filter.c:535
+#: ref-filter.c:554

 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nombre de campo desconocido: %.*s"
 
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nombre de campo desconocido: %.*s"
 

-#: ref-filter.c:539
+#: ref-filter.c:558

 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"
 
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"
 

-#: ref-filter.c:663
+#: ref-filter.c:682

 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
 
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
 

-#: ref-filter.c:726
+#: ref-filter.c:745

 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
 
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
 

-#: ref-filter.c:728
+#: ref-filter.c:747

 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: átomo %%(then) usado mas de una vez"
 
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: átomo %%(then) usado mas de una vez"
 

-#: ref-filter.c:730
+#: ref-filter.c:749

 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: átomo %%(then) usado después de %%(else)"
 
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: átomo %%(then) usado después de %%(else)"
 

-#: ref-filter.c:758
+#: ref-filter.c:777

 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
 
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
 

-#: ref-filter.c:760
+#: ref-filter.c:779

 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
 
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
 

-#: ref-filter.c:762
+#: ref-filter.c:781

 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: átomo %%(else) usado mas de una vez"
 
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: átomo %%(else) usado mas de una vez"
 

-#: ref-filter.c:777
+#: ref-filter.c:796

 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
 
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
 

-#: ref-filter.c:834
+#: ref-filter.c:853

 #, c-format
 msgid "malformed format string %s"
 msgstr "formato de cadena mal formado %s"
 
 #, c-format
 msgid "malformed format string %s"
 msgstr "formato de cadena mal formado %s"
 

-#: ref-filter.c:1424
+#: ref-filter.c:1447

 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(no hay rama, rebasando %s)"
 
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(no hay rama, rebasando %s)"
 

-#: ref-filter.c:1427
+#: ref-filter.c:1450

 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
 
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
 

-#: ref-filter.c:1430
+#: ref-filter.c:1453

 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(no hay rama, comenzando biseccón en  %s)"
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(no hay rama, comenzando biseccón en  %s)"


@@ -4193,7 +4465,7 @@ msgstr "(no hay rama, comenzando biseccón en  %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.

-#: ref-filter.c:1438
+#: ref-filter.c:1461

 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD desacoplado en %s)"
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD desacoplado en %s)"


@@ -4201,143 +4473,289 @@ msgstr "(HEAD desacoplado en %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.

-#: ref-filter.c:1445
+#: ref-filter.c:1468

 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD desacoplado de %s)"
 
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD desacoplado de %s)"
 

-#: ref-filter.c:1449
+#: ref-filter.c:1472

 msgid "(no branch)"
 msgstr "(sin rama)"
 
 msgid "(no branch)"
 msgstr "(sin rama)"
 

-#: ref-filter.c:1483 ref-filter.c:1638
+#: ref-filter.c:1506 ref-filter.c:1663

 #, c-format
 msgid "missing object %s for %s"
 msgstr "falta objeto %s para %s"
 
 #, c-format
 msgid "missing object %s for %s"
 msgstr "falta objeto %s para %s"
 

-#: ref-filter.c:1491
+#: ref-filter.c:1516

 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer falló en %s para %s"
 
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer falló en %s para %s"
 

-#: ref-filter.c:1857
+#: ref-filter.c:1882

 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objeto mal formado en '%s'"
 
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objeto mal formado en '%s'"
 

-#: ref-filter.c:1946
+#: ref-filter.c:1971

 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorando referencia con nombre roto %s"
 
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorando referencia con nombre roto %s"
 

-#: ref-filter.c:2232
+#: ref-filter.c:2257

 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: falta átomo %%(end)"
 
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: falta átomo %%(end)"
 

-#: ref-filter.c:2338
+#: ref-filter.c:2352
+#, c-format
+msgid "option `%s' is incompatible with --merged"
+msgstr "opción `%s' es incompatible con --merged"
+
+#: ref-filter.c:2355
+#, c-format
+msgid "option `%s' is incompatible with --no-merged"
+msgstr "opción `%s' es incompatible con --no-merged"
+
+#: ref-filter.c:2365

 #, c-format
 msgid "malformed object name %s"
 msgstr "nombre de objeto mal formado %s"
 
 #, c-format
 msgid "malformed object name %s"
 msgstr "nombre de objeto mal formado %s"
 

-#: remote.c:607
+#: ref-filter.c:2370
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "opción '%s' debe apuntar a un commit"
+
+#: remote.c:363
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "config remote shorthand no puede comenzar con '/': %s"
+
+#: remote.c:410
+msgid "more than one receivepack given, using the first"
+msgstr "más de un receivepack dado, usando el primero"
+
+#: remote.c:418
+msgid "more than one uploadpack given, using the first"
+msgstr "más de un uploadpack dado, usando el primero"
+
+#: remote.c:608

 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No se pueden traer ambos %s y %s a %s"
 
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No se pueden traer ambos %s y %s a %s"
 

-#: remote.c:611
+#: remote.c:612

 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s por lo general hace seguimiento a %s, no a %s"
 
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s por lo general hace seguimiento a %s, no a %s"
 

-#: remote.c:615
+#: remote.c:616

 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s hace seguimiento tanto a %s como a %s"
 
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s hace seguimiento tanto a %s como a %s"
 

-#: remote.c:623
-msgid "Internal error"
-msgstr "Error interno"
+#: remote.c:684
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "llave '%s' de patrón no tuvo '*'"
+
+#: remote.c:694
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "valor '%s' del patrón no tiene '*'"
+
+#: remote.c:1000
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "src refsoec %s: no concuerda con ninguno"
+
+#: remote.c:1005
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "src refspec %s concuerda con más de uno"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1020
+#, c-format
+msgid ""
+"The destination you provided is not a full refname (i.e.,\n"
+"starting with \"refs/\"). We tried to guess what you meant by:\n"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"El destino que provees no es un full refname (i.e.,\n"
+"comienza con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n"
+"\n"
+"- Buscando un ref que concuerde con '%s' en el lado remoto.\n"
+"- Revisando si el <src> es usado en el push('%s')\n"
+"  es un ref en \"refs/{heads,tags}/\". Si es así, agregamos el prefijo\n"
+"  refs/{heads,tags}/ correspondiente al lado remoto.\n"
+"\n"
+"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "
+"full ref."
+
+#: remote.c:1040
+#, c-format
+msgid ""
+"The <src> part of the refspec is a commit object.\n"
+"Did you mean to create a new branch by pushing to\n"
+"'%s:refs/heads/%s'?"
+msgstr ""
+"La parte <src> del refspec es un objeto commit.\n"
+"¿Quisiste crear un branch nuevo mediante un push a\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1045
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"The <src> part of the refspec is a tag object.\n"
+"Did you mean to create a new tag by pushing to\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1050
+#, c-format
+msgid ""
+"The <src> part of the refspec is a tree object.\n"
+"Did you mean to tag a new tree by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La parte <src> del refspec es un objeto tree.\n"
+"¿Quisiste crear un tag nuevo mediante un push a\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1055
+#, c-format
+msgid ""
+"The <src> part of the refspec is a blob object.\n"
+"Did you mean to tag a new blob by pushing to\n"
+"'%s:refs/tags/%s'?"
+msgstr ""
+"La parte <src> del refspec es un objeto blob.\n"
+"¿Quisiste crear un tag nuevo mediante un push a\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1091
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s no puede ser resolver a un branch"
+
+#: remote.c:1102
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "no es posible borrar '%s': ref remoto no existe"
+
+#: remote.c:1114
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "dst refspec %s concuerda con más de uno"
+
+#: remote.c:1121
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "dst ref %s recibe de más de un src"

 
 

-#: remote.c:1569 remote.c:1670
+#: remote.c:1624 remote.c:1725

 msgid "HEAD does not point to a branch"
 msgstr "HEAD no apunta a ninguna rama"
 
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no apunta a ninguna rama"
 

-#: remote.c:1578
+#: remote.c:1633

 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existe tal rama: '%s'"
 
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existe tal rama: '%s'"
 

-#: remote.c:1581
+#: remote.c:1636

 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "no se ha configurado upstream para la rama '%s'"
 
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "no se ha configurado upstream para la rama '%s'"
 

-#: remote.c:1587
+#: remote.c:1642

 #, 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"
 
 #, 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:1602
+#: remote.c:1657

 #, 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"
 
 #, 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:1614
+#: remote.c:1669

 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la rama '%s' no tiene remoto para enviar"
 
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la rama '%s' no tiene remoto para enviar"
 

-#: remote.c:1624
+#: remote.c:1679

 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "refspecs del push para '%s' no incluyen '%s'"
 
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "refspecs del push para '%s' no incluyen '%s'"
 

-#: remote.c:1637
+#: remote.c:1692

 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no tiene destino (push.default es 'nada')"
 
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no tiene destino (push.default es 'nada')"
 

-#: remote.c:1659
+#: remote.c:1714

 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no se puede resolver push 'simple' para un destino único"
 
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no se puede resolver push 'simple' para un destino único"
 

-#: remote.c:1935
+#: remote.c:1840
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "No se puedo encontrar ref remota %s"
+
+#: remote.c:1853
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Ignorando ref graciosa '%s' localmente"
+
+#: remote.c:1990

 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
 
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
 

-#: remote.c:1939
+#: remote.c:1994

 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
 
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
 

-#: remote.c:1942
+#: remote.c:1997

 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Tu rama está actualizada con '%s'.\n"
 
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Tu rama está actualizada con '%s'.\n"
 

-#: remote.c:1946
+#: remote.c:2001

 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
 
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
 

-#: remote.c:1949
+#: remote.c:2004

 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (usa \"%s\" para detalles)\n"
 
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (usa \"%s\" para detalles)\n"
 

-#: remote.c:1953
+#: remote.c:2008

 #, 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"
 
 #, 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:1959
+#: remote.c:2014

 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (usa \"git push\" para publicar tus commits locales)\n"
 
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (usa \"git push\" para publicar tus commits locales)\n"
 

-#: remote.c:1962
+#: remote.c:2017

 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""


@@ -4347,11 +4765,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Tu rama está detrás de '%s' por %d commits, 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"
 

-#: remote.c:1970
+#: remote.c:2025

 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
 
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
 

-#: remote.c:1973
+#: remote.c:2028

 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"


@@ -4366,10 +4784,15 @@ msgstr[1] ""
 "Tu rama y '%s' han divergido,\n"
 "y tienen %d y %d commits diferentes cada una respectivamente.\n"
 
 "Tu rama y '%s' han divergido,\n"
 "y tienen %d y %d commits diferentes cada una respectivamente.\n"
 

-#: remote.c:1983
+#: remote.c:2038

 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"
 
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
 

+#: remote.c:2221
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "no se puede leer el nombre de objeto '%s'"
+

 #: replace-object.c:21
 #, c-format
 msgid "bad replace ref name: %s"
 #: replace-object.c:21
 #, c-format
 msgid "bad replace ref name: %s"


@@ -4393,7 +4816,8 @@ msgstr "MERGE_RR corrupto"
 msgid "unable to write rerere record"
 msgstr "incapaz de escribir entrada rerere"
 
 msgid "unable to write rerere record"
 msgstr "incapaz de escribir entrada rerere"
 

-#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162
+#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212
+#: builtin/fsck.c:314

 #, c-format
 msgid "could not write '%s'"
 msgstr "no se pudo escribir '%s'"
 #, c-format
 msgid "could not write '%s'"
 msgstr "no se pudo escribir '%s'"


@@ -4448,8 +4872,8 @@ msgstr "no se puede desvincular stray '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "Resolución precargada para '%s'"
 
 msgid "Recorded preimage for '%s'"
 msgstr "Resolución precargada para '%s'"
 

-#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413
-#: builtin/submodule--helper.c:1423
+#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417
+#: builtin/submodule--helper.c:1427

 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no se pudo crear el directorio '%s'"
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no se pudo crear el directorio '%s'"


@@ -4483,29 +4907,29 @@ msgstr "Se olvidó resolución para '%s'\n"
 msgid "unable to open rr-cache directory"
 msgstr "no es posible abrir directorio rr-cache"
 
 msgid "unable to open rr-cache directory"
 msgstr "no es posible abrir directorio rr-cache"
 

-#: revision.c:2324
+#: revision.c:2484

 msgid "your current branch appears to be broken"
 msgstr "tu rama actual parece estar rota"
 
 msgid "your current branch appears to be broken"
 msgstr "tu rama actual parece estar rota"
 

-#: revision.c:2327
+#: revision.c:2487

 #, 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"
 
 #, 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:2523
+#: revision.c:2684

 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent es incompatible con --bisect"
 
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent es incompatible con --bisect"
 

-#: run-command.c:740
+#: run-command.c:742

 msgid "open /dev/null failed"
 msgstr "falló al abrir /dev/null"
 
 msgid "open /dev/null failed"
 msgstr "falló al abrir /dev/null"
 

-#: run-command.c:1229
+#: run-command.c:1231

 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "no es posible crear hilo async: %s"
 
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "no es posible crear hilo async: %s"
 

-#: run-command.c:1293
+#: run-command.c:1295

 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"


@@ -4515,30 +4939,30 @@ msgstr ""
 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "
 "false`."
 
 "Puedes desactivar esta advertencias con `git config advice.ignoredHook "
 "false`."
 

-#: send-pack.c:142
+#: send-pack.c:141

 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "flush packet inesperado mientras se leía estatus de desempaquetado remoto"
 
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "flush packet inesperado mientras se leía estatus de desempaquetado remoto"
 

-#: send-pack.c:144
+#: send-pack.c:143

 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
 
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
 

-#: send-pack.c:146
+#: send-pack.c:145

 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "desempaquetado remoto falló: %s"
 
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "desempaquetado remoto falló: %s"
 

-#: send-pack.c:308
+#: send-pack.c:306

 msgid "failed to sign the push certificate"
 msgstr "falló al firmar el certificado de push"
 
 msgid "failed to sign the push certificate"
 msgstr "falló al firmar el certificado de push"
 

-#: send-pack.c:421
+#: send-pack.c:420

 msgid "the receiving end does not support --signed push"
 msgstr "el final receptor no soporta --signed push"
 
 msgid "the receiving end does not support --signed push"
 msgstr "el final receptor no soporta --signed push"
 

-#: send-pack.c:423
+#: send-pack.c:422

 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"


@@ -4546,42 +4970,42 @@ msgstr ""
 "no se manda un certificado de push ya que el destino no soporta push firmado "
 "(--signed )"
 
 "no se manda un certificado de push ya que el destino no soporta push firmado "
 "(--signed )"
 

-#: send-pack.c:435
+#: send-pack.c:434

 msgid "the receiving end does not support --atomic push"
 msgstr "el destino no soporta push atómicos (--atomic)"
 
 msgid "the receiving end does not support --atomic push"
 msgstr "el destino no soporta push atómicos (--atomic)"
 

-#: send-pack.c:440
+#: send-pack.c:439

 msgid "the receiving end does not support push options"
 msgstr "el destino no soporta opciones de push"
 
 msgid "the receiving end does not support push options"
 msgstr "el destino no soporta opciones de push"
 

-#: sequencer.c:183
+#: sequencer.c:184

 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mensaje de commit inválido, modo cleanup '%s'"
 
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mensaje de commit inválido, modo cleanup '%s'"
 

-#: sequencer.c:287
+#: sequencer.c:288

 #, c-format
 msgid "could not delete '%s'"
 msgstr "no se pudo borrar '%s'"
 
 #, c-format
 msgid "could not delete '%s'"
 msgstr "no se pudo borrar '%s'"
 

-#: sequencer.c:313
+#: sequencer.c:314

 msgid "revert"
 msgstr "revertir"
 
 msgid "revert"
 msgstr "revertir"
 

-#: sequencer.c:315
+#: sequencer.c:316

 msgid "cherry-pick"
 msgstr "cherry-pick"
 
 msgid "cherry-pick"
 msgstr "cherry-pick"
 

-#: sequencer.c:317
+#: sequencer.c:318

 msgid "rebase -i"
 msgstr "rebase -i"
 
 msgid "rebase -i"
 msgstr "rebase -i"
 

-#: sequencer.c:319
+#: sequencer.c:320

 #, c-format
 msgid "unknown action: %d"
 msgstr "acción desconocida: %d"
 
 #, c-format
 msgid "unknown action: %d"
 msgstr "acción desconocida: %d"
 

-#: sequencer.c:376
+#: sequencer.c:378

 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"


@@ -4589,7 +5013,7 @@ msgstr ""
 "después de resolver los conflictos, marca las rutas corregidas\n"
 "con 'git add <rutas>' o 'git rm <rutas>'"
 
 "después de resolver los conflictos, marca las rutas corregidas\n"
 "con 'git add <rutas>' o 'git rm <rutas>'"
 

-#: sequencer.c:379
+#: sequencer.c:381

 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"


@@ -4599,39 +5023,39 @@ msgstr ""
 "con 'git add <rutas>' o 'git rm <rutas>'\n"
 "y haz un commit del resultado con 'git commit'"
 
 "con 'git add <rutas>' o 'git rm <rutas>'\n"
 "y haz un commit del resultado con 'git commit'"
 

-#: sequencer.c:392 sequencer.c:2632
+#: sequencer.c:394 sequencer.c:2671

 #, c-format
 msgid "could not lock '%s'"
 msgstr "no se pudo bloquear '%s'"
 
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no se pudo bloquear '%s'"
 

-#: sequencer.c:399
+#: sequencer.c:401

 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no se pudo escribir EOL en '%s'"
 
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no se pudo escribir EOL en '%s'"
 

-#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652
-#: sequencer.c:2885
+#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691
+#: sequencer.c:2931

 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "falló al finalizar '%s'"
 
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "falló al finalizar '%s'"
 

-#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535
-#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746
-#: builtin/merge.c:1084 builtin/rebase.c:152
+#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574
+#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748
+#: builtin/merge.c:1085 builtin/rebase.c:154

 #, c-format
 msgid "could not read '%s'"
 msgstr "no se pudo leer '%s'"
 
 #, c-format
 msgid "could not read '%s'"
 msgstr "no se pudo leer '%s'"
 

-#: sequencer.c:453
+#: sequencer.c:455

 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "tus cambios locales serán sobreescritos por %s."
 
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "tus cambios locales serán sobreescritos por %s."
 

-#: sequencer.c:457
+#: sequencer.c:459

 msgid "commit your changes or stash them to proceed."
 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
 
 msgid "commit your changes or stash them to proceed."
 msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
 

-#: sequencer.c:486
+#: sequencer.c:491

 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"


@@ -4639,70 +5063,70 @@ msgstr "%s: avance rápido"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase -i".
 #.

-#: sequencer.c:575
+#: sequencer.c:582

 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Incapaz de escribir el nuevo archivo índice"
 
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Incapaz de escribir el nuevo archivo índice"
 

-#: sequencer.c:591
+#: sequencer.c:598

 msgid "unable to update cache tree"
 msgstr "no es posible actualizar el árbol de la caché"
 
 msgid "unable to update cache tree"
 msgstr "no es posible actualizar el árbol de la caché"
 

-#: sequencer.c:604
+#: sequencer.c:612

 msgid "could not resolve HEAD commit"
 msgstr "no se pudo resolver el commit de HEAD"
 
 msgid "could not resolve HEAD commit"
 msgstr "no se pudo resolver el commit de HEAD"
 

-#: sequencer.c:684
+#: sequencer.c:692

 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "no hay llave presente en '%.*s'"
 
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "no hay llave presente en '%.*s'"
 

-#: sequencer.c:695
+#: sequencer.c:703

 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "no es posible dequote para '%s'"
 
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "no es posible dequote para '%s'"
 

-#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719
-#: builtin/am.c:811 builtin/merge.c:1081
+#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704
+#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no se pudo abrir '%s' para lectura"
 
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no se pudo abrir '%s' para lectura"
 

-#: sequencer.c:742
+#: sequencer.c:750

 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
 
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
 

-#: sequencer.c:747
+#: sequencer.c:755

 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
 
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
 

-#: sequencer.c:752
+#: sequencer.c:760

 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
 
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
 

-#: sequencer.c:756
+#: sequencer.c:764

 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable desconocida '%s'"
 
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable desconocida '%s'"
 

-#: sequencer.c:761
+#: sequencer.c:769

 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta 'GIT_AUTHOR_NAME'"
 
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta 'GIT_AUTHOR_NAME'"
 

-#: sequencer.c:763
+#: sequencer.c:771

 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta 'GIT_AUTHOR_EMAIL'"
 
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta 'GIT_AUTHOR_EMAIL'"
 

-#: sequencer.c:765
+#: sequencer.c:773

 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta 'GIT_AUTHOR_DATE'"
 
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta 'GIT_AUTHOR_DATE'"
 

-#: sequencer.c:825
+#: sequencer.c:833

 #, c-format
 msgid "invalid date format '%s' in '%s'"
 msgstr "formato de fecha inválido '%s' en '%s'"
 
 #, c-format
 msgid "invalid date format '%s' in '%s'"
 msgstr "formato de fecha inválido '%s' en '%s'"
 

-#: sequencer.c:842
+#: sequencer.c:850

 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"


@@ -4732,15 +5156,15 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
 "\n"
 "  git rebase --continue\n"
 

-#: sequencer.c:935
+#: sequencer.c:945

 msgid "writing root commit"
 msgstr "escribiendo commit raíz"
 
 msgid "writing root commit"
 msgstr "escribiendo commit raíz"
 

-#: sequencer.c:1142
+#: sequencer.c:1155

 msgid "'prepare-commit-msg' hook failed"
 msgstr "hook 'prepare-commit-msg' falló"
 
 msgid "'prepare-commit-msg' hook failed"
 msgstr "hook 'prepare-commit-msg' falló"
 

-#: sequencer.c:1149
+#: sequencer.c:1162

 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"


@@ -4767,7 +5191,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
 "\n"
 "    git commit --amend --reset-author\n"
 

-#: sequencer.c:1162
+#: sequencer.c:1175

 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"


@@ -4791,299 +5215,294 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
 "\n"
 "    git commit --amend --reset-author\n"
 

-#: sequencer.c:1202
+#: sequencer.c:1217

 msgid "couldn't look up newly created commit"
 msgstr "no se pudo revisar el commit recién creado"
 
 msgid "couldn't look up newly created commit"
 msgstr "no se pudo revisar el commit recién creado"
 

-#: sequencer.c:1204
+#: sequencer.c:1219

 msgid "could not parse newly created commit"
 msgstr "no se pudo analizar el commit recién creado"
 
 msgid "could not parse newly created commit"
 msgstr "no se pudo analizar el commit recién creado"
 

-#: sequencer.c:1250
+#: sequencer.c:1265

 msgid "unable to resolve HEAD after creating commit"
 msgstr "no se pudo resolver HEAD tras crear el commit"
 
 msgid "unable to resolve HEAD after creating commit"
 msgstr "no se pudo resolver HEAD tras crear el commit"
 

-#: sequencer.c:1252
+#: sequencer.c:1267

 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 
 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 

-#: sequencer.c:1256
+#: sequencer.c:1271

 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 
 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 

-#: sequencer.c:1277
+#: sequencer.c:1292

 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 
 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 

-#: sequencer.c:1279
+#: sequencer.c:1294

 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s no es un commit!"
 
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s no es un commit!"
 

-#: sequencer.c:1283 builtin/commit.c:1543
+#: sequencer.c:1298 builtin/commit.c:1546

 msgid "could not parse HEAD commit"
 msgstr "no se pudo analizar el commit de HEAD"
 
 msgid "could not parse HEAD commit"
 msgstr "no se pudo analizar el commit de HEAD"
 

-#: sequencer.c:1334 sequencer.c:1934
+#: sequencer.c:1350 sequencer.c:1964

 msgid "unable to parse commit author"
 msgstr "no es posible analizar el autor del commit"
 
 msgid "unable to parse commit author"
 msgstr "no es posible analizar el autor del commit"
 

-#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677
+#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree falló al escribir el árbol"
 
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree falló al escribir el árbol"
 

-#: sequencer.c:1361 sequencer.c:1416
+#: sequencer.c:1377 sequencer.c:1433

 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "no se puede leer el mensaje del commit de '%s'"
 
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "no se puede leer el mensaje del commit de '%s'"
 

-#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858
-#: builtin/merge.c:883
+#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859
+#: builtin/merge.c:884

 msgid "failed to write commit object"
 msgstr "falló al escribir el objeto commit"
 
 msgid "failed to write commit object"
 msgstr "falló al escribir el objeto commit"
 

-#: sequencer.c:1443
+#: sequencer.c:1460

 #, c-format
 msgid "could not parse commit %s"
 msgstr "no se pudo analizar commit %s"
 
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no se pudo analizar commit %s"
 

-#: sequencer.c:1448
+#: sequencer.c:1465

 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no se pudo analizar el commit padre %s"
 
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no se pudo analizar el commit padre %s"
 

-#: sequencer.c:1546 sequencer.c:1654
+#: sequencer.c:1565 sequencer.c:1675

 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 

-#: sequencer.c:1601 sequencer.c:1626
+#: sequencer.c:1622 sequencer.c:1647

 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Esta es una combinación de %d commits."
 
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Esta es una combinación de %d commits."
 

-#: sequencer.c:1611 sequencer.c:4744
+#: sequencer.c:1632 sequencer.c:4808

 msgid "need a HEAD to fixup"
 msgstr "se necesita un HEAD para arreglar"
 
 msgid "need a HEAD to fixup"
 msgstr "se necesita un HEAD para arreglar"
 

-#: sequencer.c:1613 sequencer.c:2912
+#: sequencer.c:1634 sequencer.c:2958

 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 
 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 

-#: sequencer.c:1615
+#: sequencer.c:1636

 msgid "could not read HEAD's commit message"
 msgstr "no se pudo leer el mensaje de commit de HEAD"
 
 msgid "could not read HEAD's commit message"
 msgstr "no se pudo leer el mensaje de commit de HEAD"
 

-#: sequencer.c:1621
+#: sequencer.c:1642

 #, c-format
 msgid "cannot write '%s'"
 msgstr "no se puede escribir '%s'"
 
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no se puede escribir '%s'"
 

-#: sequencer.c:1628 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

 msgid "This is the 1st commit message:"
 msgstr "Este es el mensaje del 1er commit:"
 
 msgid "This is the 1st commit message:"
 msgstr "Este es el mensaje del 1er commit:"
 

-#: sequencer.c:1636
+#: sequencer.c:1657

 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no se puede leer el mensaje del commit de %s"
 
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no se puede leer el mensaje del commit de %s"
 

-#: sequencer.c:1643
+#: sequencer.c:1664

 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Este es el mensaje del commit #%d:"
 
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Este es el mensaje del commit #%d:"
 

-#: sequencer.c:1649
+#: sequencer.c:1670

 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El mensaje del commit #%d será saltado:"
 
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El mensaje del commit #%d será saltado:"
 

-#: sequencer.c:1732
+#: sequencer.c:1758

 msgid "your index file is unmerged."
 msgstr "tu archivo índice no está fusionado."
 
 msgid "your index file is unmerged."
 msgstr "tu archivo índice no está fusionado."
 

-#: sequencer.c:1739
+#: sequencer.c:1765

 msgid "cannot fixup root commit"
 msgstr "no se puede arreglar el commit raíz"
 
 msgid "cannot fixup root commit"
 msgstr "no se puede arreglar el commit raíz"
 

-#: sequencer.c:1758
+#: sequencer.c:1784

 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
 
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
 

-#: sequencer.c:1766
+#: sequencer.c:1792 sequencer.c:1800

 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "el commit %s no tiene un padre %d"
 
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "el commit %s no tiene un padre %d"
 

-#: sequencer.c:1770
-#, 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:1776
+#: sequencer.c:1806

 #, 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.
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "no se puede obtener el mensaje de commit para %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.

-#: sequencer.c:1795
+#: sequencer.c:1825

 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no se puede analizar el commit padre %s"
 
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no se puede analizar el commit padre %s"
 

-#: sequencer.c:1860
+#: sequencer.c:1890

 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no se puede renombrar '%s' a '%s'"
 
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no se puede renombrar '%s' a '%s'"
 

-#: sequencer.c:1915
+#: sequencer.c:1945

 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no se pudo revertir %s... %s"
 
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no se pudo revertir %s... %s"
 

-#: sequencer.c:1916
+#: sequencer.c:1946

 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no se pudo aplicar %s... %s"
 
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no se pudo aplicar %s... %s"
 

-#: sequencer.c:1974
+#: sequencer.c:2005

 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: falló al leer el índice"
 
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: falló al leer el índice"
 

-#: sequencer.c:1981
+#: sequencer.c:2012

 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: falló al refrescar el índice"
 
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: falló al refrescar el índice"
 

-#: sequencer.c:2062
+#: sequencer.c:2094

 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s no acepta los argumentos: '%s'"
 
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s no acepta los argumentos: '%s'"
 

-#: sequencer.c:2071
+#: sequencer.c:2103

 #, c-format
 msgid "missing arguments for %s"
 msgstr "faltan argumentos para para %s"
 
 #, c-format
 msgid "missing arguments for %s"
 msgstr "faltan argumentos para para %s"
 

-#: sequencer.c:2130
+#: sequencer.c:2163

 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línea inválida %d: %.*s"
 
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línea inválida %d: %.*s"
 

-#: sequencer.c:2138
+#: sequencer.c:2171

 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "no se puede  '%s' sin un commit previo"
 
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "no se puede  '%s' sin un commit previo"
 

-#: sequencer.c:2209
+#: sequencer.c:2243

 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
 
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
 

-#: sequencer.c:2211
+#: sequencer.c:2245

 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "hoja de instrucciones inutilizable: '%s'"
 
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "hoja de instrucciones inutilizable: '%s'"
 

-#: sequencer.c:2216
+#: sequencer.c:2250

 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 
 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 

-#: sequencer.c:2227
+#: sequencer.c:2261

 msgid "cannot cherry-pick during a revert."
 msgstr "no se puede realizar cherry-pick durante un revert."
 
 msgid "cannot cherry-pick during a revert."
 msgstr "no se puede realizar cherry-pick durante un revert."
 

-#: sequencer.c:2229
+#: sequencer.c:2263

 msgid "cannot revert during a cherry-pick."
 msgstr "no se puede realizar un revert durante un cherry-pick."
 
 msgid "cannot revert during a cherry-pick."
 msgstr "no se puede realizar un revert durante un cherry-pick."
 

-#: sequencer.c:2299
+#: sequencer.c:2333

 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor inválido para %s: %s"
 
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor inválido para %s: %s"
 

-#: sequencer.c:2380
+#: sequencer.c:2420

 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 
 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 

-#: sequencer.c:2396
+#: sequencer.c:2436

 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hoja de opciones mal formada: '%s'"
 
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hoja de opciones mal formada: '%s'"
 

-#: sequencer.c:2479 sequencer.c:4005
+#: sequencer.c:2518 sequencer.c:4067

 msgid "empty commit set passed"
 msgstr "conjunto de commits vacío entregado"
 
 msgid "empty commit set passed"
 msgstr "conjunto de commits vacío entregado"
 

-#: sequencer.c:2487
+#: sequencer.c:2526

 msgid "a cherry-pick or revert is already in progress"
 msgstr "un cherry-pick o revert ya está en progreso"
 
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un cherry-pick o revert ya está en progreso"
 

-#: sequencer.c:2488
+#: sequencer.c:2527

 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
 
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
 

-#: sequencer.c:2491
+#: sequencer.c:2530

 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no se pudo crear un directorio secuenciador '%s'"
 
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no se pudo crear un directorio secuenciador '%s'"
 

-#: sequencer.c:2505
+#: sequencer.c:2544

 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 
 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 

-#: sequencer.c:2560 sequencer.c:3761
+#: sequencer.c:2599 sequencer.c:3819

 msgid "no cherry-pick or revert in progress"
 msgstr "ningún cherry-pick o revert en progreso"
 
 msgid "no cherry-pick or revert in progress"
 msgstr "ningún cherry-pick o revert en progreso"
 

-#: sequencer.c:2562
+#: sequencer.c:2601

 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 
 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 

-#: sequencer.c:2564 sequencer.c:2599
+#: sequencer.c:2603 sequencer.c:2638

 msgid "cannot abort from a branch yet to be born"
 msgstr "no se puede abortar de una rama por nacer"
 
 msgid "cannot abort from a branch yet to be born"
 msgstr "no se puede abortar de una rama por nacer"
 

-#: sequencer.c:2585 builtin/grep.c:721
+#: sequencer.c:2624 builtin/grep.c:732

 #, c-format
 msgid "cannot open '%s'"
 msgstr "no se puede abrir '%s'"
 
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no se puede abrir '%s'"
 

-#: sequencer.c:2587
+#: sequencer.c:2626

 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no se puede leer '%s': %s"
 
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no se puede leer '%s': %s"
 

-#: sequencer.c:2588
+#: sequencer.c:2627

 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 
 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 

-#: sequencer.c:2594
+#: sequencer.c:2633

 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"
 
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"
 

-#: sequencer.c:2605
+#: sequencer.c:2644

 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!"
 
 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:2709 sequencer.c:3679
+#: sequencer.c:2750 sequencer.c:3735

 #, c-format
 msgid "could not update %s"
 msgstr "no se puede actualizar %s"
 
 #, c-format
 msgid "could not update %s"
 msgstr "no se puede actualizar %s"
 

-#: sequencer.c:2747 sequencer.c:3659
+#: sequencer.c:2788 sequencer.c:3715

 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 
 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 

-#: sequencer.c:2762
+#: sequencer.c:2805

 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 

-#: sequencer.c:2770
+#: sequencer.c:2813

 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"


@@ -5102,27 +5521,27 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
 "\n"
 "\tgit rebase --continue\n"
 

-#: sequencer.c:2780
+#: sequencer.c:2823

 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No se pudo aplicar %s... %.*s"
 
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No se pudo aplicar %s... %.*s"
 

-#: sequencer.c:2787
+#: sequencer.c:2830

 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No se pudo fusionar %.*s"
 
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No se pudo fusionar %.*s"
 

-#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640
+#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641

 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 

-#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
-#: builtin/rebase.c:1372 builtin/rebase.c:1426
+#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230
+#: builtin/rebase.c:1591 builtin/rebase.c:1646

 msgid "could not read index"
 msgstr "no se pudo leer índice"
 
 msgid "could not read index"
 msgstr "no se pudo leer índice"
 

-#: sequencer.c:2829
+#: sequencer.c:2875

 #, c-format
 msgid ""
 "execution failed: %s\n"
 #, c-format
 msgid ""
 "execution failed: %s\n"


@@ -5137,11 +5556,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
 "  git rebase --continue\n"
 "\n"
 

-#: sequencer.c:2835
+#: sequencer.c:2881

 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"
 
 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:2841
+#: sequencer.c:2887

 #, c-format
 msgid ""
 "execution succeeded: %s\n"
 #, c-format
 msgid ""
 "execution succeeded: %s\n"


@@ -5158,76 +5577,76 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
 "  git rebase --continue\n"
 "\n"
 

-#: sequencer.c:2902
+#: sequencer.c:2948

 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nombre de label ilegal: '%.*s'"
 
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nombre de label ilegal: '%.*s'"
 

-#: sequencer.c:2954
+#: sequencer.c:3002

 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 
 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 

-#: sequencer.c:2959
+#: sequencer.c:3007

 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 
 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 

-#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
+#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435

 #, c-format
 msgid "failed to find tree of %s"
 msgstr "falló al encontrar árbol de %s"
 
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "falló al encontrar árbol de %s"
 

-#: sequencer.c:3015 builtin/rebase.c:604
+#: sequencer.c:3063 builtin/rebase.c:448

 msgid "could not write index"
 msgstr "no se pudo escribir índice"
 
 msgid "could not write index"
 msgstr "no se pudo escribir índice"
 

-#: sequencer.c:3042
+#: sequencer.c:3090

 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no se pudo resolver '%s'"
 
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no se pudo resolver '%s'"
 

-#: sequencer.c:3068
+#: sequencer.c:3118

 msgid "cannot merge without a current revision"
 msgstr "no se puede fusionar sin una versión actual"
 
 msgid "cannot merge without a current revision"
 msgstr "no se puede fusionar sin una versión actual"
 

-#: sequencer.c:3090
+#: sequencer.c:3140

 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no se puede analizar '%.*s'"
 
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no se puede analizar '%.*s'"
 

-#: sequencer.c:3099
+#: sequencer.c:3149

 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nada para fusionar: '%.*s'"
 
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nada para fusionar: '%.*s'"
 

-#: sequencer.c:3111
+#: sequencer.c:3161

 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
 
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
 

-#: sequencer.c:3126
+#: sequencer.c:3176

 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no se puede leer el mensaje del commit '%s'"
 
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no se puede leer el mensaje del commit '%s'"
 

-#: sequencer.c:3274
+#: sequencer.c:3325

 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no se pudo intentar fusionar '%.*s'"
 
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no se pudo intentar fusionar '%.*s'"
 

-#: sequencer.c:3290
+#: sequencer.c:3341

 msgid "merge: Unable to write new index file"
 msgstr "fusión: No se puede escribir el nuevo archivo índice"
 
 msgid "merge: Unable to write new index file"
 msgstr "fusión: No se puede escribir el nuevo archivo índice"
 

-#: sequencer.c:3358 builtin/rebase.c:268
+#: sequencer.c:3409 builtin/rebase.c:298

 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 

-#: sequencer.c:3370
+#: sequencer.c:3421

 #, c-format
 msgid "cannot store %s"
 msgstr "no se puede guardar %s"
 
 #, c-format
 msgid "cannot store %s"
 msgstr "no se puede guardar %s"
 

-#: sequencer.c:3373 builtin/rebase.c:284
+#: sequencer.c:3424 builtin/rebase.c:314

 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"


@@ -5239,31 +5658,31 @@ msgstr ""
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 

-#: sequencer.c:3427
+#: sequencer.c:3478

 #, c-format
 msgid "could not checkout %s"
 msgstr "no se puede hacer checkout a %s"
 
 #, c-format
 msgid "could not checkout %s"
 msgstr "no se puede hacer checkout a %s"
 

-#: sequencer.c:3441
+#: sequencer.c:3492

 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s no es OID válido"
 
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s no es OID válido"
 

-#: sequencer.c:3446 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3497 git-rebase--preserve-merges.sh:724

 msgid "could not detach HEAD"
 msgstr "no se puede desacoplar HEAD"
 
 msgid "could not detach HEAD"
 msgstr "no se puede desacoplar HEAD"
 

-#: sequencer.c:3461
+#: sequencer.c:3512

 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Detenido en HEAD\n"
 
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Detenido en HEAD\n"
 

-#: sequencer.c:3463
+#: sequencer.c:3514

 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Detenido en %s\n"
 
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Detenido en %s\n"
 

-#: sequencer.c:3471
+#: sequencer.c:3522

 #, c-format
 msgid ""
 "Could not execute the todo command\n"
 #, c-format
 msgid ""
 "Could not execute the todo command\n"


@@ -5284,48 +5703,48 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 

-#: sequencer.c:3543
+#: sequencer.c:3597

 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Detenido en %s...  %.*s\n"
 
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Detenido en %s...  %.*s\n"
 

-#: sequencer.c:3622
+#: sequencer.c:3677

 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 

-#: sequencer.c:3667
+#: sequencer.c:3723

 msgid "could not read orig-head"
 msgstr "no se puede leer orig-head"
 
 msgid "could not read orig-head"
 msgstr "no se puede leer orig-head"
 

-#: sequencer.c:3672 sequencer.c:4741
+#: sequencer.c:3728 sequencer.c:4805

 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 
 msgid "could not read 'onto'"
 msgstr "no se puede leer 'onto'"
 

-#: sequencer.c:3686
+#: sequencer.c:3742

 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no se puede actualizar HEAD a %s"
 
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no se puede actualizar HEAD a %s"
 

-#: sequencer.c:3772
+#: sequencer.c:3831

 msgid "cannot rebase: You have unstaged changes."
 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
 
 msgid "cannot rebase: You have unstaged changes."
 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
 

-#: sequencer.c:3781
+#: sequencer.c:3840

 msgid "cannot amend non-existing commit"
 msgstr "no se puede arreglar un commit no existente"
 
 msgid "cannot amend non-existing commit"
 msgstr "no se puede arreglar un commit no existente"
 

-#: sequencer.c:3783
+#: sequencer.c:3842

 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo inválido: '%s'"
 
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo inválido: '%s'"
 

-#: sequencer.c:3785
+#: sequencer.c:3844

 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 

-#: sequencer.c:3788
+#: sequencer.c:3847

 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"


@@ -5336,54 +5755,54 @@ msgstr ""
 "un commit con estos\n"
 "primero y luego ejecuta 'git rebase --continue' de nuevo."
 
 "un commit con estos\n"
 "primero y luego ejecuta 'git rebase --continue' de nuevo."
 

-#: sequencer.c:3824 sequencer.c:3862
+#: sequencer.c:3883 sequencer.c:3921

 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no se pudo escribir el archivo: '%s'"
 
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no se pudo escribir el archivo: '%s'"
 

-#: sequencer.c:3877
+#: sequencer.c:3936

 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede eliminar CHERRY_PICK_HEAD"
 
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "no se puede eliminar CHERRY_PICK_HEAD"
 

-#: sequencer.c:3884
+#: sequencer.c:3943

 msgid "could not commit staged changes."
 msgstr "no se pudo realizar el commit con los cambios en el área de stage."
 
 msgid "could not commit staged changes."
 msgstr "no se pudo realizar el commit con los cambios en el área de stage."
 

-#: sequencer.c:3982
+#: sequencer.c:4044

 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no se puede aplicar cherry-pick a un %s"
 
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no se puede aplicar cherry-pick a un %s"
 

-#: sequencer.c:3986
+#: sequencer.c:4048

 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisión errónea"
 
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisión errónea"
 

-#: sequencer.c:4021
+#: sequencer.c:4083

 msgid "can't revert as initial commit"
 msgstr "no se puede revertir como commit inicial"
 
 msgid "can't revert as initial commit"
 msgstr "no se puede revertir como commit inicial"
 

-#: sequencer.c:4466
+#: sequencer.c:4529

 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 
 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 

-#: sequencer.c:4469
+#: sequencer.c:4532

 msgid "make_script: error preparing revisions"
 msgstr "make_script: error preparando revisiones"
 
 msgid "make_script: error preparing revisions"
 msgstr "make_script: error preparando revisiones"
 

-#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840
+#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904

 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "lista de pendientes inutilizable: '%s'"
 
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "lista de pendientes inutilizable: '%s'"
 

-#: sequencer.c:4620
+#: sequencer.c:4684

 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
 
 #, 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:4690
+#: sequencer.c:4754

 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"


@@ -5392,7 +5811,7 @@ msgstr ""
 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
 "Commits botados (empezando con el mas nuevo):\n"
 
 "Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
 "Commits botados (empezando con el mas nuevo):\n"
 

-#: sequencer.c:4697
+#: sequencer.c:4761

 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"


@@ -5410,7 +5829,7 @@ msgstr ""
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 
 "Los posibles comportamientos son: ignore,warn,error.\n"
 "\n"
 

-#: sequencer.c:4710
+#: sequencer.c:4774

 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 #, c-format
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"


@@ -5421,31 +5840,31 @@ msgstr ""
 "rebase --continue'.\n"
 "O se puede abortar el rebase con 'git rebase --abort'.\n"
 
 "rebase --continue'.\n"
 "O se puede abortar el rebase con 'git rebase --abort'.\n"
 

-#: sequencer.c:4848 sequencer.c:4886
+#: sequencer.c:4912 sequencer.c:4950

 msgid "nothing to do"
 msgstr "nada que hacer"
 
 msgid "nothing to do"
 msgstr "nada que hacer"
 

-#: sequencer.c:4852
+#: sequencer.c:4916

 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase %s en %s (%d comando)"
 msgstr[1] "Rebase %s en %s (%d comandos)"
 
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase %s en %s (%d comando)"
 msgstr[1] "Rebase %s en %s (%d comandos)"
 

-#: sequencer.c:4864
+#: sequencer.c:4928

 #, c-format
 msgid "could not copy '%s' to '%s'."
 msgstr "no se pudo copiar '%s' a '%s'."
 
 #, c-format
 msgid "could not copy '%s' to '%s'."
 msgstr "no se pudo copiar '%s' a '%s'."
 

-#: sequencer.c:4868 sequencer.c:4897
+#: sequencer.c:4932 sequencer.c:4961

 msgid "could not transform the todo list"
 msgstr "no se pudo transformar lista de pendientes"
 
 msgid "could not transform the todo list"
 msgstr "no se pudo transformar lista de pendientes"
 

-#: sequencer.c:4900
+#: sequencer.c:4964

 msgid "could not skip unnecessary pick commands"
 msgstr "no se pudo saltar los comandos pick innecesarios"
 
 msgid "could not skip unnecessary pick commands"
 msgstr "no se pudo saltar los comandos pick innecesarios"
 

-#: sequencer.c:4983
+#: sequencer.c:5047

 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 
 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 


@@ -5556,31 +5975,31 @@ msgstr "no es un repositorio git: '%s'"
 msgid "cannot chdir to '%s'"
 msgstr "no se puede aplicar chdir a '%s'"
 
 msgid "cannot chdir to '%s'"
 msgstr "no se puede aplicar chdir a '%s'"
 

-#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839
+#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824

 msgid "cannot come back to cwd"
 msgstr "no se puede volver a cwd"
 
 msgid "cannot come back to cwd"
 msgstr "no se puede volver a cwd"
 

-#: setup.c:837
-#, 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:848
+#: setup.c:838

 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "falló al determinar '%*s%s%s'"
 
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "falló al determinar '%*s%s%s'"
 

-#: setup.c:1078
+#: setup.c:1068

 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 
 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 

-#: setup.c:1090 setup.c:1096
+#: setup.c:1077 setup.c:1083

 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no se puede cambiar a '%s'"
 
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no se puede cambiar a '%s'"
 

-#: setup.c:1109
+#: setup.c:1088
+#, 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:1094

 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"


@@ -5590,7 +6009,7 @@ msgstr ""
 "Parando en el límite del sistema de archivos "
 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
 
 "Parando en el límite del sistema de archivos "
 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
 

-#: setup.c:1192
+#: setup.c:1204

 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"


@@ -5599,281 +6018,281 @@ 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."
 
 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
 "El dueño de los archivos tiene que tener permisos de lectura y escritura."
 

-#: setup.c:1235
+#: setup.c:1247

 msgid "open /dev/null or dup failed"
 msgstr "falló al abrir /dev/null o dup"
 
 msgid "open /dev/null or dup failed"
 msgstr "falló al abrir /dev/null o dup"
 

-#: setup.c:1250
+#: setup.c:1262

 msgid "fork failed"
 msgstr "falló fork"
 
 msgid "fork failed"
 msgstr "falló fork"
 

-#: setup.c:1255
+#: setup.c:1267

 msgid "setsid failed"
 msgstr "falló setsid"
 
 msgid "setsid failed"
 msgstr "falló setsid"
 

-#: sha1-file.c:381
+#: sha1-file.c:445

 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
 
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
 

-#: sha1-file.c:432
+#: sha1-file.c:496

 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
 
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
 

-#: sha1-file.c:503
+#: sha1-file.c:568

 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
 
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
 

-#: sha1-file.c:510
+#: sha1-file.c:575

 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "incapaz de normalizar directorio de objeto: %s"
 
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "incapaz de normalizar directorio de objeto: %s"
 

-#: sha1-file.c:565
+#: sha1-file.c:618

 msgid "unable to fdopen alternates lockfile"
 msgstr "no es posible hacer fdopen en lockfile alternos"
 
 msgid "unable to fdopen alternates lockfile"
 msgstr "no es posible hacer fdopen en lockfile alternos"
 

-#: sha1-file.c:583
+#: sha1-file.c:636

 msgid "unable to read alternates file"
 msgstr "no es posible leer archivos alternos"
 
 msgid "unable to read alternates file"
 msgstr "no es posible leer archivos alternos"
 

-#: sha1-file.c:590
+#: sha1-file.c:643

 msgid "unable to move new alternates file into place"
 msgstr "no es posible mover archivos alternos en el lugar"
 
 msgid "unable to move new alternates file into place"
 msgstr "no es posible mover archivos alternos en el lugar"
 

-#: sha1-file.c:625
+#: sha1-file.c:678

 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ruta '%s' no existe"
 
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ruta '%s' no existe"
 

-#: sha1-file.c:651
+#: sha1-file.c:704

 #, 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."
 
 #, 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:657
+#: sha1-file.c:710

 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repositorio de referencia '%s' no es un repositorio local."
 
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repositorio de referencia '%s' no es un repositorio local."
 

-#: sha1-file.c:663
+#: sha1-file.c:716

 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repositorio de referencia '%s' es superficial (shallow)"
 
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repositorio de referencia '%s' es superficial (shallow)"
 

-#: sha1-file.c:671
+#: sha1-file.c:724

 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
 
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
 

-#: sha1-file.c:781
+#: sha1-file.c:838

 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
 
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
 

-#: sha1-file.c:806
+#: sha1-file.c:863

 msgid "mmap failed"
 msgstr "mmap falló"
 
 msgid "mmap failed"
 msgstr "mmap falló"
 

-#: sha1-file.c:973
+#: sha1-file.c:1027

 #, c-format
 msgid "object file %s is empty"
 msgstr "archivo de objeto %s está vacío"
 
 #, c-format
 msgid "object file %s is empty"
 msgstr "archivo de objeto %s está vacío"
 

-#: sha1-file.c:1093 sha1-file.c:2215
+#: sha1-file.c:1151 sha1-file.c:2288

 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objeto perdido corrupto '%s'"
 
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objeto perdido corrupto '%s'"
 

-#: sha1-file.c:1095 sha1-file.c:2219
+#: sha1-file.c:1153 sha1-file.c:2292

 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "basura al final del objeto perdido '%s'"
 
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "basura al final del objeto perdido '%s'"
 

-#: sha1-file.c:1137
+#: sha1-file.c:1195

 msgid "invalid object type"
 msgstr "tipo de objeto inválido"
 
 msgid "invalid object type"
 msgstr "tipo de objeto inválido"
 

-#: sha1-file.c:1219
+#: sha1-file.c:1279

 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "no es posible desempacar header %s con --allow-unknown-type"
 
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "no es posible desempacar header %s con --allow-unknown-type"
 

-#: sha1-file.c:1222
+#: sha1-file.c:1282

 #, c-format
 msgid "unable to unpack %s header"
 msgstr "incapaz de desempaquetar header %s"
 
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "incapaz de desempaquetar header %s"
 

-#: sha1-file.c:1228
+#: sha1-file.c:1288

 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "no es posible analizar header %s con --allow-unknown-type"
 
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "no es posible analizar header %s con --allow-unknown-type"
 

-#: sha1-file.c:1231
+#: sha1-file.c:1291

 #, c-format
 msgid "unable to parse %s header"
 msgstr "incapaz de analizar header %s"
 
 #, c-format
 msgid "unable to parse %s header"
 msgstr "incapaz de analizar header %s"
 

-#: sha1-file.c:1422
+#: sha1-file.c:1481

 #, c-format
 msgid "failed to read object %s"
 msgstr "falló al leer objeto %s"
 
 #, c-format
 msgid "failed to read object %s"
 msgstr "falló al leer objeto %s"
 

-#: sha1-file.c:1426
+#: sha1-file.c:1485

 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "reemplazo %s no encontrado para %s"
 
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "reemplazo %s no encontrado para %s"
 

-#: sha1-file.c:1430
+#: sha1-file.c:1489

 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "objeto perdido %s (guardado en %s) está corrompido"
 
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "objeto perdido %s (guardado en %s) está corrompido"
 

-#: sha1-file.c:1434
+#: sha1-file.c:1493

 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "paquete de objeto %s (guardado en %s) está corrompido"
 
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "paquete de objeto %s (guardado en %s) está corrompido"
 

-#: sha1-file.c:1536
+#: sha1-file.c:1595

 #, c-format
 #, c-format

-msgid "unable to write sha1 filename %s"
-msgstr "incapaz de escribir el nombre de archivo sha1 %s"
+msgid "unable to write file %s"
+msgstr "no es posible escribir archivo %s"

 
 

-#: sha1-file.c:1543
+#: sha1-file.c:1602

 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "no se pudo poner permisos a '%s'"
 
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "no se pudo poner permisos a '%s'"
 

-#: sha1-file.c:1550
+#: sha1-file.c:1609

 msgid "file write error"
 msgstr "falló de escritura"
 
 msgid "file write error"
 msgstr "falló de escritura"
 

-#: sha1-file.c:1569
-msgid "error when closing sha1 file"
-msgstr "error cerrando el archivo sha1"
+#: sha1-file.c:1628
+msgid "error when closing loose object file"
+msgstr "error cerrando el archivo de objeto suelto"

 
 

-#: sha1-file.c:1635
+#: sha1-file.c:1693

 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "permisos insuficientes para agregar un objeto a la base de datos del "
 "repositorio %s"
 
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "permisos insuficientes para agregar un objeto a la base de datos del "
 "repositorio %s"
 

-#: sha1-file.c:1637
+#: sha1-file.c:1695

 msgid "unable to create temporary file"
 msgstr "no es posible crear un archivo temporal"
 
 msgid "unable to create temporary file"
 msgstr "no es posible crear un archivo temporal"
 

-#: sha1-file.c:1661
-msgid "unable to write sha1 file"
-msgstr "incapaz de escribir archivo sha1"
+#: sha1-file.c:1719
+msgid "unable to write loose object file"
+msgstr "no es posible escribir el archivo de objeto suelto"

 
 

-#: sha1-file.c:1667
+#: sha1-file.c:1725

 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "no es posible desinflar el objeto nuevo %s (%d)"
 
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "no es posible desinflar el objeto nuevo %s (%d)"
 

-#: sha1-file.c:1671
+#: sha1-file.c:1729

 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd en objeto %s falló (%d)"
 
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd en objeto %s falló (%d)"
 

-#: sha1-file.c:1675
+#: sha1-file.c:1733

 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "confundido por fuente de data de objetos inestable para %s"
 
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "confundido por fuente de data de objetos inestable para %s"
 

-#: sha1-file.c:1685 builtin/pack-objects.c:918
+#: sha1-file.c:1743 builtin/pack-objects.c:919

 #, c-format
 msgid "failed utime() on %s"
 msgstr "falló utime() en %s"
 
 #, c-format
 msgid "failed utime() on %s"
 msgstr "falló utime() en %s"
 

-#: sha1-file.c:1760
+#: sha1-file.c:1818

 #, c-format
 #, c-format

-msgid "cannot read sha1_file for %s"
-msgstr "no se puede leer sha1_file para %s"
+msgid "cannot read object for %s"
+msgstr "no se pudo leer el objeto para %s"

 
 

-#: sha1-file.c:1805
+#: sha1-file.c:1858

 msgid "corrupt commit"
 msgstr "commit corrupto"
 
 msgid "corrupt commit"
 msgstr "commit corrupto"
 

-#: sha1-file.c:1813
+#: sha1-file.c:1866

 msgid "corrupt tag"
 msgstr "tag corrupto"
 
 msgid "corrupt tag"
 msgstr "tag corrupto"
 

-#: sha1-file.c:1912
+#: sha1-file.c:1965

 #, c-format
 msgid "read error while indexing %s"
 msgstr "error leyendo al indexar %s"
 
 #, c-format
 msgid "read error while indexing %s"
 msgstr "error leyendo al indexar %s"
 

-#: sha1-file.c:1915
+#: sha1-file.c:1968

 #, c-format
 msgid "short read while indexing %s"
 msgstr "lectura corta al indexar %s"
 
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lectura corta al indexar %s"
 

-#: sha1-file.c:1988 sha1-file.c:1997
+#: sha1-file.c:2041 sha1-file.c:2050

 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: falló al insertar en la base de datos"
 
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: falló al insertar en la base de datos"
 

-#: sha1-file.c:2003
+#: sha1-file.c:2056

 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipo de archivo no soportado"
 
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipo de archivo no soportado"
 

-#: sha1-file.c:2027
+#: sha1-file.c:2080

 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s no es objeto válido"
 
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s no es objeto válido"
 

-#: sha1-file.c:2029
+#: sha1-file.c:2082

 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s no es un objeto '%s' válido"
 
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s no es un objeto '%s' válido"
 

-#: sha1-file.c:2056 builtin/index-pack.c:154
+#: sha1-file.c:2109 builtin/index-pack.c:154

 #, c-format
 msgid "unable to open %s"
 msgstr "no es posible abrir %s"
 
 #, c-format
 msgid "unable to open %s"
 msgstr "no es posible abrir %s"
 

-#: sha1-file.c:2226 sha1-file.c:2278
+#: sha1-file.c:2299 sha1-file.c:2351

 #, c-format
 #, c-format

-msgid "sha1 mismatch for %s (expected %s)"
-msgstr "sha1 no concuerda para %s (se esperaba %s)"
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash no concuerda para %s (se esperaba %s)"

 
 

-#: sha1-file.c:2250
+#: sha1-file.c:2323

 #, c-format
 msgid "unable to mmap %s"
 msgstr "no es posible hacer mmap a %s"
 
 #, c-format
 msgid "unable to mmap %s"
 msgstr "no es posible hacer mmap a %s"
 

-#: sha1-file.c:2255
+#: sha1-file.c:2328

 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "incapaz de desempaquetar header de %s"
 
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "incapaz de desempaquetar header de %s"
 

-#: sha1-file.c:2261
+#: sha1-file.c:2334

 #, c-format
 msgid "unable to parse header of %s"
 msgstr "incapaz de analizar header de %s"
 
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "incapaz de analizar header de %s"
 

-#: sha1-file.c:2272
+#: sha1-file.c:2345

 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "no es posible desempaquetar contenidos de %s"
 
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "no es posible desempaquetar contenidos de %s"
 

-#: sha1-name.c:476
+#: sha1-name.c:448

 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "SHA1 %s corto es ambiguo"
 
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "SHA1 %s corto es ambiguo"
 

-#: sha1-name.c:487
+#: sha1-name.c:459

 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 
 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 

-#: sha1-name.c:770
+#: sha1-name.c:742

 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"
 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"


@@ -5896,70 +6315,80 @@ msgstr ""
 "examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
 "ejecutando \"git config advice.objectNameWarning false\""
 
 "examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
 "ejecutando \"git config advice.objectNameWarning false\""
 

-#: submodule.c:116 submodule.c:145
+#: submodule.c:114 submodule.c:143

 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
 
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
 

-#: submodule.c:120 submodule.c:149
+#: submodule.c:118 submodule.c:147

 #, 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"
 
 #, 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:156
+#: submodule.c:154

 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "No se pudo eliminar la entrada %s de .gitmodules"
 
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "No se pudo eliminar la entrada %s de .gitmodules"
 

-#: submodule.c:167
+#: submodule.c:165

 msgid "staging updated .gitmodules failed"
 msgstr "falló realizar stage a los .gitmodules actualizados"
 
 msgid "staging updated .gitmodules failed"
 msgstr "falló realizar stage a los .gitmodules actualizados"
 

-#: submodule.c:329
+#: submodule.c:327

 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "en el submódulo no poblado '%s'"
 
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "en el submódulo no poblado '%s'"
 

-#: submodule.c:360
+#: submodule.c:358

 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 

-#: submodule.c:857
+#: submodule.c:906

 #, 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"
 
 #, 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:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985
+#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989

 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falló al resolver HEAD como un ref valido."
 
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falló al resolver HEAD como un ref valido."
 

-#: submodule.c:1404
+#: submodule.c:1477
+#, c-format
+msgid "Could not access submodule '%s'"
+msgstr "no pudo acceder al submódulo '%s'"
+
+#: submodule.c:1639

 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' no reconocido como un repositorio git"
 
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' no reconocido como un repositorio git"
 

-#: submodule.c:1542
+#: submodule.c:1777

 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
 
 #, 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:1555
+#: submodule.c:1790

 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
 
 #, 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:1648
+#: submodule.c:1805
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
+
+#: submodule.c:1895

 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "submódulo '%s' tiene un índice corrupto"
 
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "submódulo '%s' tiene un índice corrupto"
 

-#: submodule.c:1700
+#: submodule.c:1947

 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submódulo '%s' no pudo ser actualizado."
 
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submódulo '%s' no pudo ser actualizado."
 

-#: submodule.c:1747
+#: submodule.c:1996

 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"


@@ -5967,12 +6396,12 @@ msgstr ""
 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
 "soportado"
 
 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
 "soportado"
 

-#: submodule.c:1759 submodule.c:1815
+#: submodule.c:2008 submodule.c:2064

 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no se pudo resolver el nombre para el submódulo '%s'"
 
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no se pudo resolver el nombre para el submódulo '%s'"
 

-#: submodule.c:1766
+#: submodule.c:2015

 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"


@@ -5983,16 +6412,16 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
 "'%s' hacia\n"
 "'%s'\n"
 

-#: submodule.c:1850
+#: submodule.c:2099

 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "no pudo recursar en el submódulo '%s'"
 
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "no pudo recursar en el submódulo '%s'"
 

-#: submodule.c:1894
+#: submodule.c:2143

 msgid "could not start ls-files in .."
 msgstr "no se pudo comenzar ls-files en .."
 
 msgid "could not start ls-files in .."
 msgstr "no se pudo comenzar ls-files en .."
 

-#: submodule.c:1933
+#: submodule.c:2182

 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree devolvió un código %d inesperado"
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree devolvió un código %d inesperado"


@@ -6053,7 +6482,7 @@ msgstr "no se pudo leer el archivo de entrada '%s'"
 msgid "could not read from stdin"
 msgstr "no se pudo leer desde stdin"
 
 msgid "could not read from stdin"
 msgstr "no se pudo leer desde stdin"
 

-#: trailer.c:1011 builtin/am.c:47
+#: trailer.c:1011 wrapper.c:701

 #, c-format
 msgid "could not stat %s"
 msgstr "no se pudo definir %s"
 #, c-format
 msgid "could not stat %s"
 msgstr "no se pudo definir %s"


@@ -6092,29 +6521,29 @@ msgstr "no se pudo leer el conjunto '%s'"
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opción inválida '%s'"
 
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opción inválida '%s'"
 

-#: transport.c:616
+#: transport.c:617

 msgid "could not parse transport.color.* config"
 msgstr "no se pudo analizar valor de configuración transport.color.*"
 
 msgid "could not parse transport.color.* config"
 msgstr "no se pudo analizar valor de configuración transport.color.*"
 

-#: transport.c:689
+#: transport.c:690

 msgid "support for protocol v2 not implemented yet"
 msgstr "soporte para protocolo v2 no implementado todavía"
 
 msgid "support for protocol v2 not implemented yet"
 msgstr "soporte para protocolo v2 no implementado todavía"
 

-#: transport.c:816
+#: transport.c:817

 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valor desconocido para configuración '%s': %s"
 
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valor desconocido para configuración '%s': %s"
 

-#: transport.c:882
+#: transport.c:883

 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transporte '%s' no permitido"
 
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transporte '%s' no permitido"
 

-#: transport.c:936
+#: transport.c:937

 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync ya no es soportado"
 
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync ya no es soportado"
 

-#: transport.c:1031
+#: transport.c:1032

 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"


@@ -6123,7 +6552,7 @@ msgstr ""
 "La siguiente ruta de submódulo contiene cambios que no\n"
 "pueden ser encontrados en ningún remoto:\n"
 
 "La siguiente ruta de submódulo contiene cambios que no\n"
 "pueden ser encontrados en ningún remoto:\n"
 

-#: transport.c:1035
+#: transport.c:1036

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -6150,19 +6579,19 @@ msgstr ""
 "para hacer un push al remoto.\n"
 "\n"
 
 "para hacer un push al remoto.\n"
 "\n"
 

-#: transport.c:1043
+#: transport.c:1044

 msgid "Aborting."
 msgstr "Abortando."
 
 msgid "Aborting."
 msgstr "Abortando."
 

-#: transport.c:1182
+#: transport.c:1184

 msgid "failed to push all needed submodules"
 msgstr "falló al hacer push a todos los submódulos necesarios"
 
 msgid "failed to push all needed submodules"
 msgstr "falló al hacer push a todos los submódulos necesarios"
 

-#: transport.c:1315 transport-helper.c:643
+#: transport.c:1317 transport-helper.c:643

 msgid "operation not supported by protocol"
 msgstr "operación no soportada por protocolo"
 
 msgid "operation not supported by protocol"
 msgstr "operación no soportada por protocolo"
 

-#: transport.c:1419
+#: transport.c:1421

 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "línea inválida mientras se analizaban refs alternas: %s"
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "línea inválida mientras se analizaban refs alternas: %s"


@@ -6211,7 +6640,7 @@ msgstr "no se pudo ejecutar fast-import"
 msgid "error while running fast-import"
 msgstr "error al ejecutar fast-import"
 
 msgid "error while running fast-import"
 msgstr "error al ejecutar fast-import"
 

-#: transport-helper.c:531 transport-helper.c:1091
+#: transport-helper.c:531 transport-helper.c:1097

 #, c-format
 msgid "could not read ref %s"
 msgstr "no se pudo leer la referencia %s"
 #, c-format
 msgid "could not read ref %s"
 msgstr "no se pudo leer la referencia %s"


@@ -6234,54 +6663,54 @@ msgstr "ruta de servicio remoto inválida"
 msgid "can't connect to subservice %s"
 msgstr "no se puede conectar al subservicio %s"
 
 msgid "can't connect to subservice %s"
 msgstr "no se puede conectar al subservicio %s"
 

-#: transport-helper.c:713
+#: transport-helper.c:718

 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "se esperaba ok/error, helper dijo '%s'"
 
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "se esperaba ok/error, helper dijo '%s'"
 

-#: transport-helper.c:766
+#: transport-helper.c:771

 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "helper reportó estado inesperado de %s"
 
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "helper reportó estado inesperado de %s"
 

-#: transport-helper.c:827
+#: transport-helper.c:832

 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s no soporta dry-run"
 
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s no soporta dry-run"
 

-#: transport-helper.c:830
+#: transport-helper.c:835

 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s no soporta --signed"
 
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s no soporta --signed"
 

-#: transport-helper.c:833
+#: transport-helper.c:838

 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s no soporta --signed=if-asked"
 
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s no soporta --signed=if-asked"
 

-#: transport-helper.c:840
+#: transport-helper.c:845

 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s no soporta 'push-option'"
 
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s no soporta 'push-option'"
 

-#: transport-helper.c:932
+#: transport-helper.c:937

 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper no soporta push; se necesita refspec"
 
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper no soporta push; se necesita refspec"
 

-#: transport-helper.c:937
+#: transport-helper.c:942

 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s no soporta 'force'"
 
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s no soporta 'force'"
 

-#: transport-helper.c:984
+#: transport-helper.c:989

 msgid "couldn't run fast-export"
 msgstr "no se pudo ejecutar fast-export"
 
 msgid "couldn't run fast-export"
 msgstr "no se pudo ejecutar fast-export"
 

-#: transport-helper.c:989
+#: transport-helper.c:994

 msgid "error while running fast-export"
 msgstr "error al ejecutar fast-export"
 
 msgid "error while running fast-export"
 msgstr "error al ejecutar fast-export"
 

-#: transport-helper.c:1014
+#: transport-helper.c:1019

 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"


@@ -6290,47 +6719,47 @@ msgstr ""
 "No hay refs comunes y ninguno especificado; no se hace nada.\n"
 "Tal vez deberías especificar un branch como 'master'.\n"
 
 "No hay refs comunes y ninguno especificado; no se hace nada.\n"
 "Tal vez deberías especificar un branch como 'master'.\n"
 

-#: transport-helper.c:1077
+#: transport-helper.c:1083

 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "respuesta malformada en lista de refs: %s"
 
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "respuesta malformada en lista de refs: %s"
 

-#: transport-helper.c:1231
+#: transport-helper.c:1236

 #, c-format
 msgid "read(%s) failed"
 msgstr "leer(%s) falló"
 
 #, c-format
 msgid "read(%s) failed"
 msgstr "leer(%s) falló"
 

-#: transport-helper.c:1258
+#: transport-helper.c:1263

 #, c-format
 msgid "write(%s) failed"
 msgstr "escribir(%s) falló"
 
 #, c-format
 msgid "write(%s) failed"
 msgstr "escribir(%s) falló"
 

-#: transport-helper.c:1307
+#: transport-helper.c:1312

 #, c-format
 msgid "%s thread failed"
 msgstr "hilo %s falló"
 
 #, c-format
 msgid "%s thread failed"
 msgstr "hilo %s falló"
 

-#: transport-helper.c:1311
+#: transport-helper.c:1316

 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "hilo %s falló al unirse: %s"
 
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "hilo %s falló al unirse: %s"
 

-#: transport-helper.c:1330 transport-helper.c:1334
+#: transport-helper.c:1335 transport-helper.c:1339

 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "no se puede iniciar el hilo para copiar data: %s"
 
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "no se puede iniciar el hilo para copiar data: %s"
 

-#: transport-helper.c:1371
+#: transport-helper.c:1376

 #, c-format
 msgid "%s process failed to wait"
 msgstr "proceso %s falló al esperar"
 
 #, c-format
 msgid "%s process failed to wait"
 msgstr "proceso %s falló al esperar"
 

-#: transport-helper.c:1375
+#: transport-helper.c:1380

 #, c-format
 msgid "%s process failed"
 msgstr "proceso %s falló"
 
 #, c-format
 msgid "%s process failed"
 msgstr "proceso %s falló"
 

-#: transport-helper.c:1393 transport-helper.c:1402
+#: transport-helper.c:1398 transport-helper.c:1407

 msgid "can't start thread for copying data"
 msgstr "no se puede iniciar hilo para copiar data"
 
 msgid "can't start thread for copying data"
 msgstr "no se puede iniciar hilo para copiar data"
 


@@ -6346,11 +6775,11 @@ msgstr "modo mal formado en la entrada de árbol"
 msgid "empty filename in tree entry"
 msgstr "nombre de archivo vacío en la entrada de árbol"
 
 msgid "empty filename in tree entry"
 msgstr "nombre de archivo vacío en la entrada de árbol"
 

-#: tree-walk.c:115
+#: tree-walk.c:116

 msgid "too-short tree file"
 msgstr "archivo de árbol muy corto"
 
 msgid "too-short tree file"
 msgstr "archivo de árbol muy corto"
 

-#: unpack-trees.c:112
+#: unpack-trees.c:111

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"


@@ -6361,7 +6790,7 @@ msgstr ""
 "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
 "ramas."
 
 "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
 "ramas."
 

-#: unpack-trees.c:114
+#: unpack-trees.c:113

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"


@@ -6371,7 +6800,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
 "checkout:\n"
 "%%s"
 

-#: unpack-trees.c:117
+#: unpack-trees.c:116

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"


@@ -6381,7 +6810,7 @@ msgstr ""
 "fusionar:\n"
 "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
 
 "fusionar:\n"
 "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
 

-#: unpack-trees.c:119
+#: unpack-trees.c:118

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"


@@ -6391,7 +6820,7 @@ msgstr ""
 "merge:\n"
 "%%s"
 
 "merge:\n"
 "%%s"
 

-#: unpack-trees.c:122
+#: unpack-trees.c:121

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"


@@ -6400,7 +6829,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
 "%%sPor favor, confirma tus cambios o guárdalos antes de %s."
 
 "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
 "%%sPor favor, confirma tus cambios o guárdalos antes de %s."
 

-#: unpack-trees.c:124
+#: unpack-trees.c:123

 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"


@@ -6409,7 +6838,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
 "%%s"
 
 "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
 "%%s"
 

-#: unpack-trees.c:129
+#: unpack-trees.c:128

 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"


@@ -6419,7 +6848,7 @@ msgstr ""
 "seguimiento en ellos:\n"
 "%s"
 
 "seguimiento en ellos:\n"
 "%s"
 

-#: unpack-trees.c:133
+#: unpack-trees.c:132

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"


@@ -6429,7 +6858,7 @@ msgstr ""
 "eliminados al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 
 "eliminados al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 

-#: unpack-trees.c:135
+#: unpack-trees.c:134

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"


@@ -6439,7 +6868,7 @@ msgstr ""
 "eliminadosal actualizar el árbol de trabajo:\n"
 "%%s"
 
 "eliminadosal actualizar el árbol de trabajo:\n"
 "%%s"
 

-#: unpack-trees.c:138
+#: unpack-trees.c:137

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"


@@ -6449,7 +6878,7 @@ msgstr ""
 "eliminados al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 
 "eliminados al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 

-#: unpack-trees.c:140
+#: unpack-trees.c:139

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"


@@ -6459,7 +6888,7 @@ msgstr ""
 "eliminadosal fusionar:\n"
 "%%s"
 
 "eliminadosal fusionar:\n"
 "%%s"
 

-#: unpack-trees.c:143
+#: unpack-trees.c:142

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"


@@ -6469,7 +6898,7 @@ msgstr ""
 "eliminados al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 
 "eliminados al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 

-#: unpack-trees.c:145
+#: unpack-trees.c:144

 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"


@@ -6479,7 +6908,7 @@ msgstr ""
 "eliminados al ejecutar %s:\n"
 "%%s"
 
 "eliminados al ejecutar %s:\n"
 "%%s"
 

-#: unpack-trees.c:151
+#: unpack-trees.c:150

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


@@ -6490,7 +6919,7 @@ msgstr ""
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
 

-#: unpack-trees.c:153
+#: unpack-trees.c:152

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "


@@ -6501,7 +6930,7 @@ msgstr ""
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 

-#: unpack-trees.c:156
+#: unpack-trees.c:155

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"


@@ -6511,7 +6940,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 
 "sobrescritos al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 

-#: unpack-trees.c:158
+#: unpack-trees.c:157

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"


@@ -6521,7 +6950,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%s"
 
 "sobrescritos al fusionar:\n"
 "%%s"
 

-#: unpack-trees.c:161
+#: unpack-trees.c:160

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"


@@ -6531,7 +6960,7 @@ msgstr ""
 "sobrescritos al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 
 "sobrescritos al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 

-#: unpack-trees.c:163
+#: unpack-trees.c:162

 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"


@@ -6541,12 +6970,12 @@ msgstr ""
 "eliminadospor %s:\n"
 "%%s"
 
 "eliminadospor %s:\n"
 "%%s"
 

-#: unpack-trees.c:171
+#: unpack-trees.c:170

 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Entrada '%s' se superpone con '%s'.  No se pueden unir."
 
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Entrada '%s' se superpone con '%s'.  No se pueden unir."
 

-#: unpack-trees.c:174
+#: unpack-trees.c:173

 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up to date:\n"


@@ -6556,7 +6985,7 @@ msgstr ""
 "actualizadas:\n"
 "%s"
 
 "actualizadas:\n"
 "%s"
 

-#: unpack-trees.c:176
+#: unpack-trees.c:175

 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "


@@ -6567,7 +6996,7 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
 "actualización sparse checkout:\n"
 "%s"
 

-#: unpack-trees.c:178
+#: unpack-trees.c:177

 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "


@@ -6578,7 +7007,7 @@ msgstr ""
 "actualización sparse checkout:\n"
 "%s"
 
 "actualización sparse checkout:\n"
 "%s"
 

-#: unpack-trees.c:180
+#: unpack-trees.c:179

 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 #, c-format
 msgid ""
 "Cannot update submodule:\n"


@@ -6587,16 +7016,16 @@ msgstr ""
 "No se puede actualizar le submódulo:\n"
 "%s"
 
 "No se puede actualizar le submódulo:\n"
 "%s"
 

-#: unpack-trees.c:254
+#: unpack-trees.c:253

 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 
 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 

-#: unpack-trees.c:336
+#: unpack-trees.c:335

 msgid "Checking out files"
 msgstr "Revisando archivos"
 
 msgid "Checking out files"
 msgstr "Revisando archivos"
 

-#: unpack-trees.c:368
+#: unpack-trees.c:367

 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"


@@ -6635,7 +7064,7 @@ msgstr "numero de puerto inválido"
 msgid "invalid '..' path segment"
 msgstr "segmento de ruta '..' inválido"
 
 msgid "invalid '..' path segment"
 msgstr "segmento de ruta '..' inválido"
 

-#: worktree.c:249 builtin/am.c:2100
+#: worktree.c:249 builtin/am.c:2094

 #, c-format
 msgid "failed to read '%s'"
 msgstr "falló al leer '%s'"
 #, c-format
 msgid "failed to read '%s'"
 msgstr "falló al leer '%s'"


@@ -6682,159 +7111,159 @@ msgstr "no es posible acceder '%s'"
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 

-#: wt-status.c:154
+#: wt-status.c:155

 msgid "Unmerged paths:"
 msgstr "Rutas no fusionadas:"
 
 msgid "Unmerged paths:"
 msgstr "Rutas no fusionadas:"
 

-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:182 wt-status.c:209

 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
 
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
 

-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:184 wt-status.c:211

 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
 
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
 

-#: wt-status.c:187
+#: wt-status.c:188

 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
 
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
 

-#: wt-status.c:189 wt-status.c:193
+#: wt-status.c:190 wt-status.c:194

 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
 "resolución)"
 
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
 "resolución)"
 

-#: wt-status.c:191
+#: wt-status.c:192

 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
 
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
 

-#: wt-status.c:202 wt-status.c:1042
+#: wt-status.c:203 wt-status.c:1046

 msgid "Changes to be committed:"
 msgstr "Cambios a ser confirmados:"
 
 msgid "Changes to be committed:"
 msgstr "Cambios a ser confirmados:"
 

-#: wt-status.c:220 wt-status.c:1051
+#: wt-status.c:221 wt-status.c:1055

 msgid "Changes not staged for commit:"
 msgstr "Cambios no rastreados para el commit:"
 
 msgid "Changes not staged for commit:"
 msgstr "Cambios no rastreados para el commit:"
 

-#: wt-status.c:224
+#: wt-status.c:225

 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
 
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
 

-#: wt-status.c:226
+#: wt-status.c:227

 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
 "commit)"
 
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
 "commit)"
 

-#: wt-status.c:227
+#: wt-status.c:228

 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
 "directorio de trabajo)"
 
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
 "directorio de trabajo)"
 

-#: wt-status.c:229
+#: wt-status.c:230

 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (confirmar o descartar el contenido sin seguimiento o modificado en los "
 "sub-módulos)"
 
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (confirmar o descartar el contenido sin seguimiento o modificado en los "
 "sub-módulos)"
 

-#: wt-status.c:241
+#: wt-status.c:242

 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
 
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
 

-#: wt-status.c:256
+#: wt-status.c:257

 msgid "both deleted:"
 msgstr "ambos borrados:"
 
 msgid "both deleted:"
 msgstr "ambos borrados:"
 

-#: wt-status.c:258
+#: wt-status.c:259

 msgid "added by us:"
 msgstr "agregado por nosotros:"
 
 msgid "added by us:"
 msgstr "agregado por nosotros:"
 

-#: wt-status.c:260
+#: wt-status.c:261

 msgid "deleted by them:"
 msgstr "borrados por ellos:"
 
 msgid "deleted by them:"
 msgstr "borrados por ellos:"
 

-#: wt-status.c:262
+#: wt-status.c:263

 msgid "added by them:"
 msgstr "agregado por ellos:"
 
 msgid "added by them:"
 msgstr "agregado por ellos:"
 

-#: wt-status.c:264
+#: wt-status.c:265

 msgid "deleted by us:"
 msgstr "borrado por nosotros:"
 
 msgid "deleted by us:"
 msgstr "borrado por nosotros:"
 

-#: wt-status.c:266
+#: wt-status.c:267

 msgid "both added:"
 msgstr "ambos agregados:"
 
 msgid "both added:"
 msgstr "ambos agregados:"
 

-#: wt-status.c:268
+#: wt-status.c:269

 msgid "both modified:"
 msgstr "ambos modificados:"
 
 msgid "both modified:"
 msgstr "ambos modificados:"
 

-#: wt-status.c:278
+#: wt-status.c:279

 msgid "new file:"
 msgstr "nuevo archivo:"
 
 msgid "new file:"
 msgstr "nuevo archivo:"
 

-#: wt-status.c:280
+#: wt-status.c:281

 msgid "copied:"
 msgstr "copiado:"
 
 msgid "copied:"
 msgstr "copiado:"
 

-#: wt-status.c:282
+#: wt-status.c:283

 msgid "deleted:"
 msgstr "borrado:"
 
 msgid "deleted:"
 msgstr "borrado:"
 

-#: wt-status.c:284
+#: wt-status.c:285

 msgid "modified:"
 msgstr "modificado:"
 
 msgid "modified:"
 msgstr "modificado:"
 

-#: wt-status.c:286
+#: wt-status.c:287

 msgid "renamed:"
 msgstr "renombrado:"
 
 msgid "renamed:"
 msgstr "renombrado:"
 

-#: wt-status.c:288
+#: wt-status.c:289

 msgid "typechange:"
 msgstr "cambio de tipo:"
 
 msgid "typechange:"
 msgstr "cambio de tipo:"
 

-#: wt-status.c:290
+#: wt-status.c:291

 msgid "unknown:"
 msgstr "desconocido:"
 
 msgid "unknown:"
 msgstr "desconocido:"
 

-#: wt-status.c:292
+#: wt-status.c:293

 msgid "unmerged:"
 msgstr "des-fusionado:"
 
 msgid "unmerged:"
 msgstr "des-fusionado:"
 

-#: wt-status.c:372
+#: wt-status.c:373

 msgid "new commits, "
 msgstr "nuevos commits, "
 
 msgid "new commits, "
 msgstr "nuevos commits, "
 

-#: wt-status.c:374
+#: wt-status.c:375

 msgid "modified content, "
 msgstr "contenido modificado, "
 
 msgid "modified content, "
 msgstr "contenido modificado, "
 

-#: wt-status.c:376
+#: wt-status.c:377

 msgid "untracked content, "
 msgstr "contenido no rastreado, "
 
 msgid "untracked content, "
 msgstr "contenido no rastreado, "
 

-#: wt-status.c:880
+#: wt-status.c:884

 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Tu stash actualmente tiene %d entrada"
 msgstr[1] "Tu stash actualmente tiene %d entradas"
 
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Tu stash actualmente tiene %d entrada"
 msgstr[1] "Tu stash actualmente tiene %d entradas"
 

-#: wt-status.c:912
+#: wt-status.c:916

 msgid "Submodules changed but not updated:"
 msgstr "Submodulos cambiados pero no actualizados:"
 
 msgid "Submodules changed but not updated:"
 msgstr "Submodulos cambiados pero no actualizados:"
 

-#: wt-status.c:914
+#: wt-status.c:918

 msgid "Submodule changes to be committed:"
 msgstr "Submodulos cambiados listos para realizar commit:"
 
 msgid "Submodule changes to be committed:"
 msgstr "Submodulos cambiados listos para realizar commit:"
 

-#: wt-status.c:996
+#: wt-status.c:1000

 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."


@@ -6842,107 +7271,107 @@ msgstr ""
 "No modifique o borre la línea de encima.\n"
 "Todo lo que este por abajo será eliminado."
 
 "No modifique o borre la línea de encima.\n"
 "Todo lo que este por abajo será eliminado."
 

-#: wt-status.c:1097
+#: wt-status.c:1101

 msgid "You have unmerged paths."
 msgstr "Tienes rutas no fusionadas."
 
 msgid "You have unmerged paths."
 msgstr "Tienes rutas no fusionadas."
 

-#: wt-status.c:1100
+#: wt-status.c:1104

 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregla los conflictos y corre \"git commit\""
 
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregla los conflictos y corre \"git commit\""
 

-#: wt-status.c:1102
+#: wt-status.c:1106

 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
 
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
 

-#: wt-status.c:1106
+#: wt-status.c:1110

 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos los conflictos resueltos pero sigues fusionando."
 
 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos los conflictos resueltos pero sigues fusionando."
 

-#: wt-status.c:1109
+#: wt-status.c:1113

 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" para concluir la fusión)"
 
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" para concluir la fusión)"
 

-#: wt-status.c:1118
+#: wt-status.c:1122

 msgid "You are in the middle of an am session."
 msgstr "Estás en medio de una sesión am."
 
 msgid "You are in the middle of an am session."
 msgstr "Estás en medio de una sesión am."
 

-#: wt-status.c:1121
+#: wt-status.c:1125

 msgid "The current patch is empty."
 msgstr "El parche actual está vacío."
 
 msgid "The current patch is empty."
 msgstr "El parche actual está vacío."
 

-#: wt-status.c:1125
+#: wt-status.c:1129

 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregla los conflictos y luego corre \"git am --continue\""
 
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregla los conflictos y luego corre \"git am --continue\""
 

-#: wt-status.c:1127
+#: wt-status.c:1131

 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (usa \"git am --skip\" para saltar este parche)"
 
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (usa \"git am --skip\" para saltar este parche)"
 

-#: wt-status.c:1129
+#: wt-status.c:1133

 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
 
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
 

-#: wt-status.c:1260
+#: wt-status.c:1264

 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo no está presente."
 
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo no está presente."
 

-#: wt-status.c:1262
+#: wt-status.c:1266

 msgid "No commands done."
 msgstr "No se realizaron los comandos."
 
 msgid "No commands done."
 msgstr "No se realizaron los comandos."
 

-#: wt-status.c:1265
+#: wt-status.c:1269

 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "El último comando realizado (%d comando realizado):"
 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
 
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "El último comando realizado (%d comando realizado):"
 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
 

-#: wt-status.c:1276
+#: wt-status.c:1280

 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ver mas en el archivo %s)"
 
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ver mas en el archivo %s)"
 

-#: wt-status.c:1281
+#: wt-status.c:1285

 msgid "No commands remaining."
 msgstr "No quedan mas comandos."
 
 msgid "No commands remaining."
 msgstr "No quedan mas comandos."
 

-#: wt-status.c:1284
+#: wt-status.c:1288

 #, 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):"
 
 #, 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:1292
+#: wt-status.c:1296

 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
 
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
 

-#: wt-status.c:1304
+#: wt-status.c:1308

 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
 
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
 

-#: wt-status.c:1309
+#: wt-status.c:1313

 msgid "You are currently rebasing."
 msgstr "Estás aplicando un rebase."
 
 msgid "You are currently rebasing."
 msgstr "Estás aplicando un rebase."
 

-#: wt-status.c:1322
+#: wt-status.c:1326

 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
 
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
 

-#: wt-status.c:1324
+#: wt-status.c:1328

 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
 
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
 

-#: wt-status.c:1326
+#: wt-status.c:1330

 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (usa \"git rebase --abort\" para volver a tu rama original)"
 
 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:1333
+#: wt-status.c:1337

 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
 
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
 

-#: wt-status.c:1337
+#: wt-status.c:1341

 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."


@@ -6950,128 +7379,128 @@ msgstr ""
 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
 "'%s'."
 
 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
 "'%s'."
 

-#: wt-status.c:1342
+#: wt-status.c:1346

 msgid "You are currently splitting a commit during a rebase."
 msgstr "Estás dividiendo un commit durante un rebase."
 
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Estás dividiendo un commit durante un rebase."
 

-#: wt-status.c:1345
+#: wt-status.c:1349

 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\")"
 
 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:1349
+#: wt-status.c:1353

 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
 "'%s'."
 
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
 "'%s'."
 

-#: wt-status.c:1354
+#: wt-status.c:1358

 msgid "You are currently editing a commit during a rebase."
 msgstr "Estás editando un commit durante un rebase."
 
 msgid "You are currently editing a commit during a rebase."
 msgstr "Estás editando un commit durante un rebase."
 

-#: wt-status.c:1357
+#: wt-status.c:1361

 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
 
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
 

-#: wt-status.c:1359
+#: wt-status.c:1363

 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)"
 
 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:1368
+#: wt-status.c:1372

 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Estás realizando un cherry-picking en el commit %s."
 
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Estás realizando un cherry-picking en el commit %s."
 

-#: wt-status.c:1373
+#: wt-status.c:1377

 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
 
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
 

-#: wt-status.c:1376
+#: wt-status.c:1380

 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
 
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
 

-#: wt-status.c:1378
+#: wt-status.c:1382

 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)"
 
 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:1386
+#: wt-status.c:1390

 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Estás revirtiendo el commit %s."
 
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Estás revirtiendo el commit %s."
 

-#: wt-status.c:1391
+#: wt-status.c:1395

 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 

-#: wt-status.c:1394
+#: wt-status.c:1398

 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 

-#: wt-status.c:1396
+#: wt-status.c:1400

 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" para cancelar la operación de revertir)"
 
 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:1406
+#: wt-status.c:1410

 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
 
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
 

-#: wt-status.c:1410
+#: wt-status.c:1414

 msgid "You are currently bisecting."
 msgstr "Estás aplicando un bisect."
 
 msgid "You are currently bisecting."
 msgstr "Estás aplicando un bisect."
 

-#: wt-status.c:1413
+#: wt-status.c:1417

 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
 
 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:1611
+#: wt-status.c:1617

 msgid "On branch "
 msgstr "En la rama "
 
 msgid "On branch "
 msgstr "En la rama "
 

-#: wt-status.c:1618
+#: wt-status.c:1624

 msgid "interactive rebase in progress; onto "
 msgstr "rebase interactivo en progreso; en "
 
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interactivo en progreso; en "
 

-#: wt-status.c:1620
+#: wt-status.c:1626

 msgid "rebase in progress; onto "
 msgstr "rebase en progreso; en "
 
 msgid "rebase in progress; onto "
 msgstr "rebase en progreso; en "
 

-#: wt-status.c:1625
+#: wt-status.c:1631

 msgid "HEAD detached at "
 msgstr "HEAD desacoplada en "
 
 msgid "HEAD detached at "
 msgstr "HEAD desacoplada en "
 

-#: wt-status.c:1627
+#: wt-status.c:1633

 msgid "HEAD detached from "
 msgstr "HEAD desacoplada de "
 
 msgid "HEAD detached from "
 msgstr "HEAD desacoplada de "
 

-#: wt-status.c:1630
+#: wt-status.c:1636

 msgid "Not currently on any branch."
 msgstr "Actualmente no estás en ninguna rama."
 
 msgid "Not currently on any branch."
 msgstr "Actualmente no estás en ninguna rama."
 

-#: wt-status.c:1647
+#: wt-status.c:1653

 msgid "Initial commit"
 msgstr "Confirmación inicial"
 
 msgid "Initial commit"
 msgstr "Confirmación inicial"
 

-#: wt-status.c:1648
+#: wt-status.c:1654

 msgid "No commits yet"
 msgstr "No hay commits todavía"
 
 msgid "No commits yet"
 msgstr "No hay commits todavía"
 

-#: wt-status.c:1662
+#: wt-status.c:1668

 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 
 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 

-#: wt-status.c:1664
+#: wt-status.c:1670

 msgid "Ignored files"
 msgstr "Archivos ignorados"
 
 msgid "Ignored files"
 msgstr "Archivos ignorados"
 

-#: wt-status.c:1668
+#: wt-status.c:1674

 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"


@@ -7082,31 +7511,31 @@ msgstr ""
 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
 "nuevos archivos usted mismo (vea 'git help status')."
 
 "puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
 "nuevos archivos usted mismo (vea 'git help status')."
 

-#: wt-status.c:1674
+#: wt-status.c:1680

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Archivos no rastreados no son mostrados %s"
 
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Archivos no rastreados no son mostrados %s"
 

-#: wt-status.c:1676
+#: wt-status.c:1682

 msgid " (use -u option to show untracked files)"
 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
 
 msgid " (use -u option to show untracked files)"
 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
 

-#: wt-status.c:1682
+#: wt-status.c:1688

 msgid "No changes"
 msgstr "Sin cambios"
 
 msgid "No changes"
 msgstr "Sin cambios"
 

-#: wt-status.c:1687
+#: wt-status.c:1693

 #, 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"
 
 #, 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"
 

-#: wt-status.c:1690
+#: wt-status.c:1696

 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 

-#: wt-status.c:1693
+#: wt-status.c:1699

 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "


@@ -7115,192 +7544,192 @@ 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:1696
+#: wt-status.c:1702

 #, 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"
 
 #, 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:1699
+#: wt-status.c:1705

 #, 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"
 
 #, 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:1702 wt-status.c:1707
+#: wt-status.c:1708 wt-status.c:1713

 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 

-#: wt-status.c:1705
+#: wt-status.c:1711

 #, 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"
 
 #, 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:1709
+#: wt-status.c:1715

 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
 
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
 

-#: wt-status.c:1822
+#: wt-status.c:1828

 msgid "No commits yet on "
 msgstr "No hay commits todavía en "
 
 msgid "No commits yet on "
 msgstr "No hay commits todavía en "
 

-#: wt-status.c:1826
+#: wt-status.c:1832

 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 
 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 

-#: wt-status.c:1857
+#: wt-status.c:1863

 msgid "different"
 msgstr "diferente"
 
 msgid "different"
 msgstr "diferente"
 

-#: wt-status.c:1859 wt-status.c:1867
+#: wt-status.c:1865 wt-status.c:1873

 msgid "behind "
 msgstr "detrás "
 
 msgid "behind "
 msgstr "detrás "
 

-#: wt-status.c:1862 wt-status.c:1865
+#: wt-status.c:1868 wt-status.c:1871

 msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
 msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"

-#: wt-status.c:2374
+#: wt-status.c:2386

 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no se puede %s: Tienes cambios sin marcar."
 
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no se puede %s: Tienes cambios sin marcar."
 

-#: wt-status.c:2380
+#: wt-status.c:2392

 msgid "additionally, your index contains uncommitted changes."
 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
 
 msgid "additionally, your index contains uncommitted changes."
 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
 

-#: wt-status.c:2382
+#: wt-status.c:2394

 #, 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."
 
 #, 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."
 

-#: builtin/add.c:24
+#: builtin/add.c:25

 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
 
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
 

-#: builtin/add.c:83
+#: builtin/add.c:84

 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 

-#: builtin/add.c:88 builtin/commit.c:284
+#: builtin/add.c:89 builtin/commit.c:285

 msgid "updating files failed"
 msgstr "falló la actualización de carpetas"
 
 msgid "updating files failed"
 msgstr "falló la actualización de carpetas"
 

-#: builtin/add.c:98
+#: builtin/add.c:99

 #, c-format
 msgid "remove '%s'\n"
 msgstr "eliminar '%s'\n"
 
 #, c-format
 msgid "remove '%s'\n"
 msgstr "eliminar '%s'\n"
 

-#: builtin/add.c:173
+#: builtin/add.c:174

 msgid "Unstaged changes after refreshing the index:"
 msgstr "Cambios fuera del área de stage tras refrescar el índice:"
 
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Cambios fuera del área de stage tras refrescar el índice:"
 

-#: builtin/add.c:233 builtin/rev-parse.c:895
+#: builtin/add.c:234 builtin/rev-parse.c:896

 msgid "Could not read the index"
 msgstr "No se pudo leer el índice"
 
 msgid "Could not read the index"
 msgstr "No se pudo leer el índice"
 

-#: builtin/add.c:244
+#: builtin/add.c:245

 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "No se pudo abrir '%s' para escritura."
 
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "No se pudo abrir '%s' para escritura."
 

-#: builtin/add.c:248
+#: builtin/add.c:249

 msgid "Could not write patch"
 msgstr "No se puede escribir el parche"
 
 msgid "Could not write patch"
 msgstr "No se puede escribir el parche"
 

-#: builtin/add.c:251
+#: builtin/add.c:252

 msgid "editing patch failed"
 msgstr "falló la edición del parche"
 
 msgid "editing patch failed"
 msgstr "falló la edición del parche"
 

-#: builtin/add.c:254
+#: builtin/add.c:255

 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No se pudo definir '%s'"
 
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No se pudo definir '%s'"
 

-#: builtin/add.c:256
+#: builtin/add.c:257

 msgid "Empty patch. Aborted."
 msgstr "Parche vacío. Abortado."
 
 msgid "Empty patch. Aborted."
 msgstr "Parche vacío. Abortado."
 

-#: builtin/add.c:261
+#: builtin/add.c:262

 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 

-#: builtin/add.c:269
+#: builtin/add.c:270

 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"
 
 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:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123
-#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557
-#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165
+#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
+#: builtin/prune-packed.c:56 builtin/pull.c:214 builtin/push.c:560
+#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165

 msgid "dry run"
 msgstr "dry run ( ejecución en seco)"
 
 msgid "dry run"
 msgstr "dry run ( ejecución en seco)"
 

-#: builtin/add.c:292
+#: builtin/add.c:293

 msgid "interactive picking"
 msgstr "selección interactiva"
 
 msgid "interactive picking"
 msgstr "selección interactiva"
 

-#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305
+#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306

 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 
 msgid "select hunks interactively"
 msgstr "elegir hunks de forma interactiva"
 

-#: builtin/add.c:294
+#: builtin/add.c:295

 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 
 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 

-#: builtin/add.c:295
+#: builtin/add.c:296

 msgid "allow adding otherwise ignored files"
 msgstr "permitir agregar caso contrario ignorar archivos"
 
 msgid "allow adding otherwise ignored files"
 msgstr "permitir agregar caso contrario ignorar archivos"
 

-#: builtin/add.c:296
+#: builtin/add.c:297

 msgid "update tracked files"
 msgstr "actualizado las carpetas rastreadas"
 
 msgid "update tracked files"
 msgstr "actualizado las carpetas rastreadas"
 

-#: builtin/add.c:297
+#: builtin/add.c:298

 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 

-#: builtin/add.c:298
+#: builtin/add.c:299

 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"
 
 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:299
+#: builtin/add.c:300

 msgid "add changes from all tracked and untracked files"
 msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
 
 msgid "add changes from all tracked and untracked files"
 msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
 

-#: builtin/add.c:302
+#: builtin/add.c:303

 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)"
 
 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:304
+#: builtin/add.c:305

 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el índice"
 
 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el índice"
 

-#: builtin/add.c:305
+#: builtin/add.c:306

 msgid "just skip files which cannot be added because of errors"
 msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
 
 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:306
+#: builtin/add.c:307

 msgid "check if - even missing - files are ignored in dry run"
 msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
 
 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:308 builtin/update-index.c:990
+#: builtin/add.c:309 builtin/update-index.c:991

 msgid "override the executable bit of the listed files"
 msgstr "sobrescribir el bit ejecutable de los archivos listados"
 
 msgid "override the executable bit of the listed files"
 msgstr "sobrescribir el bit ejecutable de los archivos listados"
 

-#: builtin/add.c:310
+#: builtin/add.c:311

 msgid "warn when adding an embedded repository"
 msgstr "avisar cuando se agrega un repositorio incrustado"
 
 msgid "warn when adding an embedded repository"
 msgstr "avisar cuando se agrega un repositorio incrustado"
 

-#: builtin/add.c:325
+#: builtin/add.c:326

 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"


@@ -7331,152 +7760,152 @@ msgstr ""
 "\n"
 "Vea \"git help submodule\" para mas información."
 
 "\n"
 "Vea \"git help submodule\" para mas información."
 

-#: builtin/add.c:353
+#: builtin/add.c:354

 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "agregando repositorio embebido: %s"
 
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "agregando repositorio embebido: %s"
 

-#: builtin/add.c:371
+#: 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"
 
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Use -f si realmente quiere agregarlos.\n"
 

-#: builtin/add.c:379
+#: builtin/add.c:380

 msgid "adding files failed"
 msgstr "falló al agregar archivos"
 
 msgid "adding files failed"
 msgstr "falló al agregar archivos"
 

-#: builtin/add.c:417
+#: builtin/add.c:418

 msgid "-A and -u are mutually incompatible"
 msgstr "-A y -u son mutuamente incompatibles"
 
 msgid "-A and -u are mutually incompatible"
 msgstr "-A y -u son mutuamente incompatibles"
 

-#: builtin/add.c:424
+#: builtin/add.c:425

 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"
 
 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:428
+#: builtin/add.c:429

 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
 
 #, 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:443
+#: builtin/add.c:444

 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 

-#: builtin/add.c:444
+#: builtin/add.c:445

 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Tal vez quiso decir 'git add .'?\n"
 
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Tal vez quiso decir 'git add .'?\n"
 

-#: builtin/am.c:363
+#: builtin/am.c:348

 msgid "could not parse author script"
 msgstr "no se pudo analizar el script del autor"
 
 msgid "could not parse author script"
 msgstr "no se pudo analizar el script del autor"
 

-#: builtin/am.c:447
+#: builtin/am.c:432

 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' fue borrado por el hook de applypatch-msg"
 
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' fue borrado por el hook de applypatch-msg"
 

-#: builtin/am.c:488
+#: builtin/am.c:473

 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Línea mal formada: '%s'."
 
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Línea mal formada: '%s'."
 

-#: builtin/am.c:525
+#: builtin/am.c:510

 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Falló al copiar notas de '%s' a '%s'"
 
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Falló al copiar notas de '%s' a '%s'"
 

-#: builtin/am.c:551
+#: builtin/am.c:536

 msgid "fseek failed"
 msgstr "fall de fseek"
 
 msgid "fseek failed"
 msgstr "fall de fseek"
 

-#: builtin/am.c:739
+#: builtin/am.c:724

 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no se pudo analizar el parche '%s'"
 
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no se pudo analizar el parche '%s'"
 

-#: builtin/am.c:804
+#: builtin/am.c:789

 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Solo un parche StGIT puede ser aplicado de una vez"
 
 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:852
+#: builtin/am.c:837

 msgid "invalid timestamp"
 msgstr "timestamp inválido"
 
 msgid "invalid timestamp"
 msgstr "timestamp inválido"
 

-#: builtin/am.c:857 builtin/am.c:869
+#: builtin/am.c:842 builtin/am.c:854

 msgid "invalid Date line"
 msgstr "línea Date inválida"
 
 msgid "invalid Date line"
 msgstr "línea Date inválida"
 

-#: builtin/am.c:864
+#: builtin/am.c:849

 msgid "invalid timezone offset"
 msgstr "offset de zona horaria inválido"
 
 msgid "invalid timezone offset"
 msgstr "offset de zona horaria inválido"
 

-#: builtin/am.c:957
+#: builtin/am.c:942

 msgid "Patch format detection failed."
 msgstr "Falló al detectar el formato del parche."
 
 msgid "Patch format detection failed."
 msgstr "Falló al detectar el formato del parche."
 

-#: builtin/am.c:962 builtin/clone.c:408
+#: builtin/am.c:947 builtin/clone.c:409

 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "falló al crear el directorio '%s'"
 
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "falló al crear el directorio '%s'"
 

-#: builtin/am.c:967
+#: builtin/am.c:952

 msgid "Failed to split patches."
 msgstr "Falló al dividir parches."
 
 msgid "Failed to split patches."
 msgstr "Falló al dividir parches."
 

-#: builtin/am.c:1097 builtin/commit.c:369
+#: builtin/am.c:1082 builtin/commit.c:371

 msgid "unable to write index file"
 msgstr "no es posible escribir en el archivo índice"
 
 msgid "unable to write index file"
 msgstr "no es posible escribir en el archivo índice"
 

-#: builtin/am.c:1111
+#: builtin/am.c:1096

 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
 
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
 

-#: builtin/am.c:1112
+#: builtin/am.c:1097

 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
 
 #, 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:1113
+#: builtin/am.c:1098

 #, 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"
 "\"."
 
 #, 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:1196
+#: builtin/am.c:1181

 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Parche mandado con formato=flowed; espacios al final de las líneas tal vez "
 "desaparezcan."
 
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Parche mandado con formato=flowed; espacios al final de las líneas tal vez "
 "desaparezcan."
 

-#: builtin/am.c:1224
+#: builtin/am.c:1209

 msgid "Patch is empty."
 msgstr "El parche está vacío."
 
 msgid "Patch is empty."
 msgstr "El parche está vacío."
 

-#: builtin/am.c:1290
+#: builtin/am.c:1275

 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "sangría no válida: %.*s"
 
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "sangría no válida: %.*s"
 

-#: builtin/am.c:1312
+#: builtin/am.c:1297

 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no es posible analizar el commit %s"
 
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no es posible analizar el commit %s"
 

-#: builtin/am.c:1508
+#: builtin/am.c:1493

 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."
 
 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:1510
+#: builtin/am.c:1495

 msgid "Using index info to reconstruct a base tree..."
 msgstr "Usando la información del índice para reconstruir un árbol base..."
 
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Usando la información del índice para reconstruir un árbol base..."
 

-#: builtin/am.c:1529
+#: builtin/am.c:1514

 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."


@@ -7484,28 +7913,28 @@ msgstr ""
 "Editaste el parche a mano?\n"
 "No aplica a blobs guardados en su índice."
 
 "Editaste el parche a mano?\n"
 "No aplica a blobs guardados en su índice."
 

-#: builtin/am.c:1535
+#: builtin/am.c:1520

 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retrocediendo para parchar base y fusión de 3-vías..."
 
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retrocediendo para parchar base y fusión de 3-vías..."
 

-#: builtin/am.c:1561
+#: builtin/am.c:1546

 msgid "Failed to merge in the changes."
 msgstr "Falló al fusionar en los cambios."
 
 msgid "Failed to merge in the changes."
 msgstr "Falló al fusionar en los cambios."
 

-#: builtin/am.c:1593
+#: builtin/am.c:1578

 msgid "applying to an empty history"
 msgstr "aplicando a un historial vacío"
 
 msgid "applying to an empty history"
 msgstr "aplicando a un historial vacío"
 

-#: builtin/am.c:1639 builtin/am.c:1643
+#: builtin/am.c:1624 builtin/am.c:1628

 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no se puede continuar: %s no existe."
 
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no se puede continuar: %s no existe."
 

-#: builtin/am.c:1659
+#: builtin/am.c:1644

 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
 
 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:1664
+#: builtin/am.c:1649

 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 
 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 


@@ -7513,34 +7942,34 @@ msgstr "Cuerpo de commit es:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
 #. in your translation. The program will only accept English
 #. input at this point.
 #.

-#: builtin/am.c:1674
+#: builtin/am.c:1659

 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: "
 
 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:1724
+#: builtin/am.c:1709

 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
 
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
 

-#: builtin/am.c:1764 builtin/am.c:1832
+#: builtin/am.c:1749 builtin/am.c:1817

 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 

-#: builtin/am.c:1781
+#: builtin/am.c:1766

 msgid "No changes -- Patch already applied."
 msgstr "Sin cambios -- parche ya aplicado."
 
 msgid "No changes -- Patch already applied."
 msgstr "Sin cambios -- parche ya aplicado."
 

-#: builtin/am.c:1787
+#: builtin/am.c:1772

 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El parche falló en %s %.*s"
 
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El parche falló en %s %.*s"
 

-#: builtin/am.c:1791
+#: builtin/am.c:1776

 msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr "Use 'git am --show-current-patch' para ver el parche fallido"
 
 msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr "Use 'git am --show-current-patch' para ver el parche fallido"
 

-#: builtin/am.c:1835
+#: builtin/am.c:1820

 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"


@@ -7550,7 +7979,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."
 
 "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:1842
+#: builtin/am.c:1827

 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "


@@ -7563,17 +7992,17 @@ msgstr ""
 "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
 "él."
 
 "Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
 "él."
 

-#: builtin/am.c:1949 builtin/am.c:1953 builtin/am.c:1965 builtin/reset.c:328
-#: builtin/reset.c:336
+#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329
+#: builtin/reset.c:337

 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No se pudo analizar el objeto '%s'."
 
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No se pudo analizar el objeto '%s'."
 

-#: builtin/am.c:2001
+#: builtin/am.c:1986

 msgid "failed to clean index"
 msgstr "falló al limpiar el índice"
 
 msgid "failed to clean index"
 msgstr "falló al limpiar el índice"
 

-#: builtin/am.c:2036
+#: builtin/am.c:2030

 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"


@@ -7581,144 +8010,144 @@ msgstr ""
 "Parece haber movido HEAD desde el último falló 'am'.\n"
 "No rebobinando a ORIG_HEAD"
 
 "Parece haber movido HEAD desde el último falló 'am'.\n"
 "No rebobinando a ORIG_HEAD"
 

-#: builtin/am.c:2129
+#: builtin/am.c:2123

 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor inválido para --patch-format: %s"
 
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor inválido para --patch-format: %s"
 

-#: builtin/am.c:2165
+#: builtin/am.c:2159

 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
 
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
 

-#: builtin/am.c:2166
+#: builtin/am.c:2160

 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
 
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
 

-#: builtin/am.c:2172
+#: builtin/am.c:2166

 msgid "run interactively"
 msgstr "ejecutar de manera interactiva"
 
 msgid "run interactively"
 msgstr "ejecutar de manera interactiva"
 

-#: builtin/am.c:2174
+#: builtin/am.c:2168

 msgid "historical option -- no-op"
 msgstr "opción histórica -- no-op"
 
 msgid "historical option -- no-op"
 msgstr "opción histórica -- no-op"
 

-#: builtin/am.c:2176
+#: builtin/am.c:2170

 msgid "allow fall back on 3way merging if needed"
 msgstr "permitir retroceso en fusión de 3-vías si es necesario"
 
 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:2177 builtin/init-db.c:486 builtin/prune-packed.c:58
+#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58

 #: builtin/repack.c:306
 msgid "be quiet"
 msgstr "ser silencioso"
 
 #: builtin/repack.c:306
 msgid "be quiet"
 msgstr "ser silencioso"
 

-#: builtin/am.c:2179
+#: builtin/am.c:2173

 msgid "add a Signed-off-by line to the commit message"
 msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
 
 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:2182
+#: builtin/am.c:2176

 msgid "recode into utf8 (default)"
 msgstr "recodificar en utf8 (default)"
 
 msgid "recode into utf8 (default)"
 msgstr "recodificar en utf8 (default)"
 

-#: builtin/am.c:2184
+#: builtin/am.c:2178

 msgid "pass -k flag to git-mailinfo"
 msgstr "pasar flag -k a git-mailinfo"
 
 msgid "pass -k flag to git-mailinfo"
 msgstr "pasar flag -k a git-mailinfo"
 

-#: builtin/am.c:2186
+#: builtin/am.c:2180

 msgid "pass -b flag to git-mailinfo"
 msgstr "pasar flag -b a git-mailinfo"
 
 msgid "pass -b flag to git-mailinfo"
 msgstr "pasar flag -b a git-mailinfo"
 

-#: builtin/am.c:2188
+#: builtin/am.c:2182

 msgid "pass -m flag to git-mailinfo"
 msgstr "pasar flag -m a git-mailinfo"
 
 msgid "pass -m flag to git-mailinfo"
 msgstr "pasar flag -m a git-mailinfo"
 

-#: builtin/am.c:2190
+#: builtin/am.c:2184

 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
 
 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:2193
+#: builtin/am.c:2187

 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"
 
 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:2196
+#: builtin/am.c:2190

 msgid "strip everything before a scissors line"
 msgstr "descubrir todo antes de una línea de tijeras"
 
 msgid "strip everything before a scissors line"
 msgstr "descubrir todo antes de una línea de tijeras"
 

-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2210 builtin/am.c:2213 builtin/am.c:2216 builtin/am.c:2219
-#: builtin/am.c:2225
+#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201
+#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213
+#: builtin/am.c:2219

 msgid "pass it through git-apply"
 msgstr "pasarlo a través de git-apply"
 
 msgid "pass it through git-apply"
 msgstr "pasarlo a través de git-apply"
 

-#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
-#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
+#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240
+#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062

 #: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
 #: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
 #: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
 #: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386

-#: parse-options.h:144 parse-options.h:146 parse-options.h:268
+#: parse-options.h:144 parse-options.h:146 parse-options.h:266

 msgid "n"
 msgstr "n"
 
 msgid "n"
 msgstr "n"
 

-#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
+#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38

 #: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
 msgid "format"
 msgstr "formato"
 
 #: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
 msgid "format"
 msgstr "formato"
 

-#: builtin/am.c:2222
+#: builtin/am.c:2216

 msgid "format the patch(es) are in"
 msgstr "formatear el parche(s)"
 
 msgid "format the patch(es) are in"
 msgstr "formatear el parche(s)"
 

-#: builtin/am.c:2228
+#: builtin/am.c:2222

 msgid "override error message when patch failure occurs"
 msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
 
 msgid "override error message when patch failure occurs"
 msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
 

-#: builtin/am.c:2230
+#: builtin/am.c:2224

 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar aplicando los parches tras resolver conflictos"
 
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar aplicando los parches tras resolver conflictos"
 

-#: builtin/am.c:2233
+#: builtin/am.c:2227

 msgid "synonyms for --continue"
 msgstr "sinónimos para --continue"
 
 msgid "synonyms for --continue"
 msgstr "sinónimos para --continue"
 

-#: builtin/am.c:2236
+#: builtin/am.c:2230

 msgid "skip the current patch"
 msgstr "saltar el parche actual"
 
 msgid "skip the current patch"
 msgstr "saltar el parche actual"
 

-#: builtin/am.c:2239
+#: builtin/am.c:2233

 msgid "restore the original branch and abort the patching operation."
 msgstr "restaurar la rama original y abortar la operación de parchado."
 
 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:2242
+#: builtin/am.c:2236

 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "abortar la operación de parchado pero mantener HEAD donde está."
 
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "abortar la operación de parchado pero mantener HEAD donde está."
 

-#: builtin/am.c:2245
+#: builtin/am.c:2239

 msgid "show the patch being applied."
 msgstr "muestra el parche siendo aplicado."
 
 msgid "show the patch being applied."
 msgstr "muestra el parche siendo aplicado."
 

-#: builtin/am.c:2249
+#: builtin/am.c:2243

 msgid "lie about committer date"
 msgstr "mentir sobre la fecha del committer"
 
 msgid "lie about committer date"
 msgstr "mentir sobre la fecha del committer"
 

-#: builtin/am.c:2251
+#: builtin/am.c:2245

 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 

-#: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
-#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
-#: builtin/revert.c:113 builtin/tag.c:402
+#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274
+#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185
+#: builtin/revert.c:114 builtin/tag.c:402

 msgid "key-id"
 msgstr "key-id"
 
 msgid "key-id"
 msgstr "key-id"
 

-#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
+#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186

 msgid "GPG-sign commits"
 msgstr "Commits con firma GPG"
 
 msgid "GPG-sign commits"
 msgstr "Commits con firma GPG"
 

-#: builtin/am.c:2257
+#: builtin/am.c:2251

 msgid "(internal use for git-rebase)"
 msgstr "(uso interno para git-rebase)"
 
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno para git-rebase)"
 

-#: builtin/am.c:2275
+#: builtin/am.c:2269

 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."
 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."


@@ -7726,16 +8155,16 @@ msgstr ""
 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
 "será removida. Por favor no la use más."
 
 "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:2282
+#: builtin/am.c:2276

 msgid "failed to read the index"
 msgstr "falló al leer el índice"
 
 msgid "failed to read the index"
 msgstr "falló al leer el índice"
 

-#: builtin/am.c:2297
+#: builtin/am.c:2291

 #, 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."
 
 #, 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:2321
+#: builtin/am.c:2315

 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 #, c-format
 msgid ""
 "Stray %s directory found.\n"


@@ -7744,7 +8173,7 @@ msgstr ""
 "Directorio extraviado %s encontrado.\n"
 "Use \"git am --abort\" para borrarlo."
 
 "Directorio extraviado %s encontrado.\n"
 "Use \"git am --abort\" para borrarlo."
 

-#: builtin/am.c:2327
+#: builtin/am.c:2321

 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operación de resolución no está en progreso, no vamos a continuar."
 
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operación de resolución no está en progreso, no vamos a continuar."
 


@@ -7765,86 +8194,295 @@ msgstr "no se pudo direccionar la salida"
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remote sin URL"
 
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remote sin URL"
 

-#: builtin/archive.c:58
+#: builtin/archive.c:61

 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"
 
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"
 

-#: builtin/archive.c:61
+#: builtin/archive.c:64

 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 

-#: builtin/archive.c:64
+#: builtin/archive.c:65

 msgid "git archive: protocol error"
 msgstr "git archive: error de protocolo"
 
 msgid "git archive: protocol error"
 msgstr "git archive: error de protocolo"
 

-#: builtin/archive.c:68
+#: builtin/archive.c:69

 msgid "git archive: expected a flush"
 msgstr "git archive: se esperaba un flush"
 
 msgid "git archive: expected a flush"
 msgstr "git archive: se esperaba un flush"
 

-#: builtin/bisect--helper.c:12
+#: builtin/bisect--helper.c:22

 msgid "git bisect--helper --next-all [--no-checkout]"
 msgstr "git bisect--helper --next-all [--no-checkout]"
 
 msgid "git bisect--helper --next-all [--no-checkout]"
 msgstr "git bisect--helper --next-all [--no-checkout]"
 

-#: builtin/bisect--helper.c:13
+#: builtin/bisect--helper.c:23

 msgid "git bisect--helper --write-terms <bad_term> <good_term>"
 msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"
 
 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
+#: builtin/bisect--helper.c:24

 msgid "git bisect--helper --bisect-clean-state"
 msgstr "git bisect--helper --bisect-clean-state"
 
 msgid "git bisect--helper --bisect-clean-state"
 msgstr "git bisect--helper --bisect-clean-state"
 

-#: builtin/bisect--helper.c:46
+#: builtin/bisect--helper.c:25
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<commit>]"
+
+#: builtin/bisect--helper.c:26
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-write [--no-log] <estado> <revision> <buen_term> "
+"<mal_term>"
+
+#: builtin/bisect--helper.c:27
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
+"git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> "
+"<mal_term>"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
+
+#: builtin/bisect--helper.c:29
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+
+#: builtin/bisect--helper.c:30
+msgid ""
+"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
+"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{old,good}=<término> --term-{new,"
+"bad}=<término>][--no-checkout] [<malo> [<bueno>...]] [--] [<rutas>...]"
+
+#: builtin/bisect--helper.c:86

 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' no es un término válido"
 
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' no es un término válido"
 

-#: builtin/bisect--helper.c:50
+#: builtin/bisect--helper.c:90

 #, 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"
 
 #, 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
+#: builtin/bisect--helper.c:100

 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "no se puede cambiar el significado del término '%s'"
 
 #, 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
+#: builtin/bisect--helper.c:111

 msgid "please use two different terms"
 msgstr "por favor use dos términos diferentes"
 
 msgid "please use two different terms"
 msgstr "por favor use dos términos diferentes"
 

-#: builtin/bisect--helper.c:78
+#: builtin/bisect--helper.c:118

 msgid "could not open the file BISECT_TERMS"
 msgstr "no se pudo abrir el archivo BISECT_TERMS"
 
 msgid "could not open the file BISECT_TERMS"
 msgstr "no se pudo abrir el archivo BISECT_TERMS"
 

-#: builtin/bisect--helper.c:120
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "No estamos bisecando.\n"
+
+#: builtin/bisect--helper.c:163
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' no es un commit válido"
+
+#: builtin/bisect--helper.c:174
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
+"<commit>'."
+
+#: builtin/bisect--helper.c:215
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Mal argumento bisect_write: %s"
+
+#: builtin/bisect--helper.c:220
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "no se puede obtener el oid de la rev '%s'"
+
+#: builtin/bisect--helper.c:232
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "no se pudo abrir el archivo '%s'"
+
+#: builtin/bisect--helper.c:258
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s"
+
+#: builtin/bisect--helper.c:285
+#, c-format
+msgid ""
+"You need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"Tiene que dar al menos un %s y un %s revision.\n"
+"Puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
+
+#: builtin/bisect--helper.c:289
+#, c-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one %s and %s revision.\n"
+"You can use \"git bisect %s\" and \"git bisect %s\" for that."
+msgstr ""
+"Tiene que comenzar por \"git bisect start\".\n"
+"Después tiene que entregar al menos un %s y una revision %s.\n"
+"Puede usar \"git bisect %s\" y \"git bisect %s\" para eso."
+
+#: builtin/bisect--helper.c:321
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "haciendo bisect solo con un commit %s"
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#.
+#: builtin/bisect--helper.c:329
+msgid "Are you sure [Y/n]? "
+msgstr "¿Estás seguro [Y/n]? "
+
+#: builtin/bisect--helper.c:376
+msgid "no terms defined"
+msgstr "no hay términos definidos"
+
+#: builtin/bisect--helper.c:379
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Tus términos actuales son %s para el estado viejo\n"
+"y %s para el estado nuevo.\n"
+
+#: builtin/bisect--helper.c:389
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argumento inválido %s para 'git bisect terms'.\n"
+"Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:475
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "opción desconocida: '%s'"
+
+#: builtin/bisect--helper.c:479
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' no parece ser una revisión válida"
+
+#: builtin/bisect--helper.c:511
+msgid "bad HEAD - I need a HEAD"
+msgstr "mal HEAD - Necesito un HEAD"
+
+#: builtin/bisect--helper.c:526
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"Error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
+
+#: builtin/bisect--helper.c:547
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "no se bisecará en un árbol con cg-seek"
+
+#: builtin/bisect--helper.c:550
+msgid "bad HEAD - strange symbolic ref"
+msgstr "mal HEAD - ref simbólico extraño"
+
+#: builtin/bisect--helper.c:627

 msgid "perform 'git bisect next'"
 msgstr "realiza 'git bisect next'"
 
 msgid "perform 'git bisect next'"
 msgstr "realiza 'git bisect next'"
 

-#: builtin/bisect--helper.c:122
+#: builtin/bisect--helper.c:629

 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "escribe los términos a .git/BISECT_TERMS"
 
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "escribe los términos a .git/BISECT_TERMS"
 

-#: builtin/bisect--helper.c:124
+#: builtin/bisect--helper.c:631

 msgid "cleanup the bisection state"
 msgstr "limpiar el estado de bisección"
 
 msgid "cleanup the bisection state"
 msgstr "limpiar el estado de bisección"
 

-#: builtin/bisect--helper.c:126
+#: builtin/bisect--helper.c:633

 msgid "check for expected revs"
 msgstr "revisar por revs esperados"
 
 msgid "check for expected revs"
 msgstr "revisar por revs esperados"
 

-#: builtin/bisect--helper.c:128
+#: builtin/bisect--helper.c:635
+msgid "reset the bisection state"
+msgstr "reiniciar el estado de bisect"
+
+#: builtin/bisect--helper.c:637
+msgid "write out the bisection state in BISECT_LOG"
+msgstr "escribir el estado de bisect en BISECT_LOG"
+
+#: builtin/bisect--helper.c:639
+msgid "check and set terms in a bisection state"
+msgstr "revisar y configurar los terms en el estado de bisect"
+
+#: builtin/bisect--helper.c:641
+msgid "check whether bad or good terms exist"
+msgstr "revisar si existen términos malos o buenos"
+
+#: builtin/bisect--helper.c:643
+msgid "print out the bisect terms"
+msgstr "imprimir los terms del bisect"
+
+#: builtin/bisect--helper.c:645
+msgid "start the bisect session"
+msgstr "comenzar la sesión de bisect"
+
+#: builtin/bisect--helper.c:647

 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
 
 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
+#: builtin/bisect--helper.c:649
+msgid "no log for BISECT_WRITE"
+msgstr "no hay log para BISECT_WRITE"
+
+#: builtin/bisect--helper.c:666

 msgid "--write-terms requires two arguments"
 msgstr "--write-terms requiere dos argumentos"
 
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms requiere dos argumentos"
 

-#: builtin/bisect--helper.c:147
+#: builtin/bisect--helper.c:670

 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state no requiere argumentos"
 
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state no requiere argumentos"
 

+#: builtin/bisect--helper.c:677
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset requiere un commit o ningún argumento"
+
+#: builtin/bisect--helper.c:681
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr "--bisect-write requiere entre 4 o 5 argumentos"
+
+#: builtin/bisect--helper.c:687
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr "--bisect-clean-state no requiere argumentos"
+
+#: builtin/bisect--helper.c:693
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check requiere 2 o 3 argumentos"
+
+#: builtin/bisect--helper.c:699
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms requiere 0 o 1 argumentos"
+

 #: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
 #: builtin/blame.c:31
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"


@@ -7979,7 +8617,7 @@ msgstr "n,m"
 msgid "Process only line range n,m, counting from 1"
 msgstr "Procesar solo el rango de líneas n,m, contando desde 1"
 
 msgid "Process only line range n,m, counting from 1"
 msgstr "Procesar solo el rango de líneas n,m, contando desde 1"
 

-#: builtin/blame.c:873
+#: builtin/blame.c:875

 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 


@@ -7991,18 +8629,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 #. your language may need more or fewer display
 #. columns.
 #.
 #. your language may need more or fewer display
 #. columns.
 #.

-#: builtin/blame.c:924
+#: builtin/blame.c:926

 msgid "4 years, 11 months ago"
 msgstr "hace 4 años, 11 meses"
 
 msgid "4 years, 11 months ago"
 msgstr "hace 4 años, 11 meses"
 

-#: builtin/blame.c:1011
+#: builtin/blame.c:1018

 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "archivo %s tiene solo %lu línea"
 msgstr[1] "archivo %s tiene solo %lu líneas"
 
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "archivo %s tiene solo %lu línea"
 msgstr[1] "archivo %s tiene solo %lu líneas"
 

-#: builtin/blame.c:1057
+#: builtin/blame.c:1064

 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 
 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 


@@ -8206,7 +8844,7 @@ msgstr "configurando modo tracking (mirar git-pull(1))"
 msgid "do not use"
 msgstr "no usar"
 
 msgid "do not use"
 msgstr "no usar"
 

-#: builtin/branch.c:602 builtin/rebase--interactive.c:180
+#: builtin/branch.c:602 builtin/rebase--interactive.c:182

 msgid "upstream"
 msgstr "upstream"
 
 msgid "upstream"
 msgstr "upstream"
 


@@ -8305,7 +8943,7 @@ msgid "field name to sort on"
 msgstr "nombre del campo por el cuál ordenar"
 
 #: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
 msgstr "nombre del campo por el cuál ordenar"
 
 #: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415

-#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581
+#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584

 #: builtin/tag.c:418
 msgid "object"
 msgstr "objeto"
 #: builtin/tag.c:418
 msgid "object"
 msgstr "objeto"


@@ -8323,7 +8961,7 @@ msgstr "ordenamiento y filtrado son case-insensitive"
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 

-#: builtin/branch.c:660 builtin/clone.c:739
+#: builtin/branch.c:660 builtin/clone.c:746

 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no encontrado abajo de refs/heads!"
 
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no encontrado abajo de refs/heads!"
 


@@ -8373,7 +9011,7 @@ msgstr ""
 "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
 "rama."
 
 "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
 "rama."
 

-#: builtin/branch.c:776 builtin/branch.c:798
+#: builtin/branch.c:776 builtin/branch.c:799

 #, c-format
 msgid "no such branch '%s'"
 msgstr "no hay tal rama '%s'"
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no hay tal rama '%s'"


@@ -8383,27 +9021,27 @@ msgstr "no hay tal rama '%s'"
 msgid "branch '%s' does not exist"
 msgstr "la rama '%s' no existe"
 
 msgid "branch '%s' does not exist"
 msgstr "la rama '%s' no existe"
 

-#: builtin/branch.c:792
+#: builtin/branch.c:793

 msgid "too many arguments to unset upstream"
 msgstr "demasiados argumentos para desconfigurar upstream"
 
 msgid "too many arguments to unset upstream"
 msgstr "demasiados argumentos para desconfigurar upstream"
 

-#: builtin/branch.c:796
+#: builtin/branch.c:797

 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."
 
 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:802
+#: builtin/branch.c:803

 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Rama '%s' no tiene información de upstream"
 
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Rama '%s' no tiene información de upstream"
 

-#: builtin/branch.c:812
+#: builtin/branch.c:813

 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"
 
 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:815
+#: builtin/branch.c:816

 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."


@@ -8424,7 +9062,7 @@ msgstr "Se necesita un repositorio para agrupar."
 msgid "Need a repository to unbundle."
 msgstr "Se necesita un repositorio para desagrupar."
 
 msgid "Need a repository to unbundle."
 msgstr "Se necesita un repositorio para desagrupar."
 

-#: builtin/cat-file.c:587
+#: builtin/cat-file.c:593

 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"


@@ -8432,7 +9070,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
 
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
 

-#: builtin/cat-file.c:588
+#: builtin/cat-file.c:594

 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"


@@ -8440,133 +9078,133 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 

-#: builtin/cat-file.c:609
+#: builtin/cat-file.c:615

 msgid "only one batch option may be specified"
 msgstr "solo se puede especificar una opción batch"
 
 msgid "only one batch option may be specified"
 msgstr "solo se puede especificar una opción batch"
 

-#: builtin/cat-file.c:627
+#: builtin/cat-file.c:633

 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> puede ser: blob, tree, commit, tag"
 
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> puede ser: blob, tree, commit, tag"
 

-#: builtin/cat-file.c:628
+#: builtin/cat-file.c:634

 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 
 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 

-#: builtin/cat-file.c:629
+#: builtin/cat-file.c:635

 msgid "show object size"
 msgstr "mostrar el tamaño del objeto"
 
 msgid "show object size"
 msgstr "mostrar el tamaño del objeto"
 

-#: builtin/cat-file.c:631
+#: builtin/cat-file.c:637

 msgid "exit with zero when there's no error"
 msgstr "salir con cero cuando no haya error"
 
 msgid "exit with zero when there's no error"
 msgstr "salir con cero cuando no haya error"
 

-#: builtin/cat-file.c:632
+#: builtin/cat-file.c:638

 msgid "pretty-print object's content"
 msgstr "realizar pretty-print del contenido del objeto"
 
 msgid "pretty-print object's content"
 msgstr "realizar pretty-print del contenido del objeto"
 

-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:640

 msgid "for blob objects, run textconv on object's content"
 msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
 
 msgid "for blob objects, run textconv on object's content"
 msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
 

-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:642

 msgid "for blob objects, run filters on object's content"
 msgstr "para objetos blob, ejecuta filters 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:637 git-submodule.sh:857
+#: builtin/cat-file.c:643 git-submodule.sh:860

 msgid "blob"
 msgstr "blob"
 
 msgid "blob"
 msgstr "blob"
 

-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:644

 msgid "use a specific path for --textconv/--filters"
 msgstr "use una ruta específica para --textconv/--filters"
 
 msgid "use a specific path for --textconv/--filters"
 msgstr "use una ruta específica para --textconv/--filters"
 

-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:646

 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
 
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
 

-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:647

 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 
 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 

-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:649

 msgid "show info and content of objects fed from the standard input"
 msgstr "mostrar info y content de los objetos alimentados por standard input"
 
 msgid "show info and content of objects fed from the standard input"
 msgstr "mostrar info y content de los objetos alimentados por standard input"
 

-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:653

 msgid "show info about objects fed from the standard input"
 msgstr "mostrar info de los objetos alimentados por standard input"
 
 msgid "show info about objects fed from the standard input"
 msgstr "mostrar info de los objetos alimentados por standard input"
 

-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:657

 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
 
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
 

-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:659

 msgid "show all objects with --batch or --batch-check"
 msgstr "mostrar todos los objetos con --batch o --batch-check"
 
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostrar todos los objetos con --batch o --batch-check"
 

-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:661

 msgid "do not order --batch-all-objects output"
 msgstr "no ordenar el output de --batch-all-objects"
 
 msgid "do not order --batch-all-objects output"
 msgstr "no ordenar el output de --batch-all-objects"
 

-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13

 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."
 
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."
 

-#: builtin/check-attr.c:13
+#: builtin/check-attr.c:14

 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 

-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21

 msgid "report all attributes set on file"
 msgstr "reportar todos los atributos configurados en el archivo"
 
 msgid "report all attributes set on file"
 msgstr "reportar todos los atributos configurados en el archivo"
 

-#: builtin/check-attr.c:21
+#: builtin/check-attr.c:22

 msgid "use .gitattributes only from the index"
 msgstr "use .gitattributes solo desde el índice"
 
 msgid "use .gitattributes only from the index"
 msgstr "use .gitattributes solo desde el índice"
 

-#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102

 msgid "read file names from stdin"
 msgstr "leer nombres de archivos de stdin"
 
 msgid "read file names from stdin"
 msgstr "leer nombres de archivos de stdin"
 

-#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27

 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registros de entrada y salida con un carácter NUL"
 
 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:1234 builtin/gc.c:517
-#: builtin/worktree.c:495
+#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517
+#: builtin/worktree.c:496

 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 
 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 

-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:29

 msgid "show non-matching input paths"
 msgstr "mostrar rutas de entrada que no concuerdan"
 
 msgid "show non-matching input paths"
 msgstr "mostrar rutas de entrada que no concuerdan"
 

-#: builtin/check-ignore.c:30
+#: builtin/check-ignore.c:31

 msgid "ignore index when checking"
 msgstr "ignorar el índice cuando se revise"
 
 msgid "ignore index when checking"
 msgstr "ignorar el índice cuando se revise"
 

-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:160

 msgid "cannot specify pathnames with --stdin"
 msgstr "no se puede especificar los nombres de rutas con --stdin"
 
 msgid "cannot specify pathnames with --stdin"
 msgstr "no se puede especificar los nombres de rutas con --stdin"
 

-#: builtin/check-ignore.c:162
+#: builtin/check-ignore.c:163

 msgid "-z only makes sense with --stdin"
 msgstr "-z sólo tiene sentido con --stdin"
 
 msgid "-z only makes sense with --stdin"
 msgstr "-z sólo tiene sentido con --stdin"
 

-#: builtin/check-ignore.c:164
+#: builtin/check-ignore.c:165

 msgid "no path specified"
 msgstr "ruta no especificada"
 
 msgid "no path specified"
 msgstr "ruta no especificada"
 

-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:169

 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet solo es válido con un nombre de ruta único"
 
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet solo es válido con un nombre de ruta único"
 

-#: builtin/check-ignore.c:170
+#: builtin/check-ignore.c:171

 msgid "cannot have both --quiet and --verbose"
 msgstr "no se puede tener ambos --quiet y --verbose"
 
 msgid "cannot have both --quiet and --verbose"
 msgstr "no se puede tener ambos --quiet y --verbose"
 

-#: builtin/check-ignore.c:173
+#: builtin/check-ignore.c:174

 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching sólo es válida con --verbose"
 
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching sólo es válida con --verbose"
 


@@ -8587,166 +9225,187 @@ msgstr "no es posible analizar el contacto: %s"
 msgid "no contacts specified"
 msgstr "contactos no especificados"
 
 msgid "no contacts specified"
 msgstr "contactos no especificados"
 

-#: builtin/checkout-index.c:128
+#: builtin/checkout-index.c:131

 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
 
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
 

-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:148

 msgid "stage should be between 1 and 3 or all"
 msgstr "stage tiene que estar entre 1 y 3 o all"
 
 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:164

 msgid "check out all files in the index"
 msgstr "revisar todos los archivos en el índice"
 
 msgid "check out all files in the index"
 msgstr "revisar todos los archivos en el índice"
 

-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:165

 msgid "force overwrite of existing files"
 msgstr "forzar sobreescritura de los archivos existentes"
 
 msgid "force overwrite of existing files"
 msgstr "forzar sobreescritura de los archivos existentes"
 

-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:167

 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"
 
 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:169

 msgid "don't checkout new files"
 msgstr "no revisar archivos nuevos"
 
 msgid "don't checkout new files"
 msgstr "no revisar archivos nuevos"
 

-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:171

 msgid "update stat information in the index file"
 msgstr "actualizar información de estado en el archivo índice"
 
 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:175

 msgid "read list of paths from the standard input"
 msgstr "leer lista de rutas desde standard input"
 
 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:177

 msgid "write the content to temporary files"
 msgstr "escribir el contenido en un archivo temporal"
 
 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:1368 builtin/submodule--helper.c:1371
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853
-#: builtin/worktree.c:668
+#: builtin/checkout-index.c:178 builtin/column.c:31
+#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
+#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1857
+#: builtin/worktree.c:669

 msgid "string"
 msgstr "string"
 
 msgid "string"
 msgstr "string"
 

-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:179

 msgid "when creating files, prepend <string>"
 msgstr "cuando cree archivos, anteponer <string>"
 
 msgid "when creating files, prepend <string>"
 msgstr "cuando cree archivos, anteponer <string>"
 

-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:181

 msgid "copy out the files from named stage"
 msgstr "copiar los archivos del stage nombrado"
 
 msgid "copy out the files from named stage"
 msgstr "copiar los archivos del stage nombrado"
 

-#: builtin/checkout.c:31
+#: builtin/checkout.c:32

 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opciones>]  <rama>"
 
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opciones>]  <rama>"
 

-#: builtin/checkout.c:32
+#: builtin/checkout.c:33

 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
 
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
 

-#: builtin/checkout.c:144 builtin/checkout.c:177
+#: builtin/checkout.c:147 builtin/checkout.c:181

 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ruta '%s' no tiene nuestra versión"
 
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ruta '%s' no tiene nuestra versión"
 

-#: builtin/checkout.c:146 builtin/checkout.c:179
+#: builtin/checkout.c:149 builtin/checkout.c:183

 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ruta '%s' no tiene su versión"
 
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ruta '%s' no tiene su versión"
 

-#: builtin/checkout.c:162
+#: builtin/checkout.c:165

 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ruta '%s' no tiene todas las versiones necesarias"
 
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ruta '%s' no tiene todas las versiones necesarias"
 

-#: builtin/checkout.c:206
+#: builtin/checkout.c:210

 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ruta '%s' no tiene versiones necesarias"
 
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ruta '%s' no tiene versiones necesarias"
 

-#: builtin/checkout.c:224
+#: builtin/checkout.c:228

 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ruta '%s': no se puede fusionar"
 
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ruta '%s': no se puede fusionar"
 

-#: builtin/checkout.c:240
+#: builtin/checkout.c:244

 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Incapaz de agregar resultados de fusión a '%s'"
 
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Incapaz de agregar resultados de fusión a '%s'"
 

-#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268
-#: builtin/checkout.c:271
+#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273
+#: builtin/checkout.c:276

 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' no puede ser usada con rutas actualizadas"
 
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' no puede ser usada con rutas actualizadas"
 

-#: builtin/checkout.c:274 builtin/checkout.c:277
+#: builtin/checkout.c:279 builtin/checkout.c:282

 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' no puede ser usado con %s"
 
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' no puede ser usado con %s"
 

-#: builtin/checkout.c:280
+#: builtin/checkout.c:285

 #, 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."
 
 #, 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:349 builtin/checkout.c:356
+#: builtin/checkout.c:354 builtin/checkout.c:361

 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ruta '%s' no esta fusionada"
 
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ruta '%s' no esta fusionada"
 

-#: builtin/checkout.c:608
+#: builtin/checkout.c:397
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Recreado %d conflicto de merge"
+msgstr[1] "Recreados %d conflictos de merge"
+
+#: builtin/checkout.c:402
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Actualizada %d ruta para %s"
+msgstr[1] "Actualizadas %d rutas para %s"
+
+#: builtin/checkout.c:409
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Actualizada %d ruta desde el index"
+msgstr[1] "Actualizadas %d rutas desde el index"
+
+#: builtin/checkout.c:645

 msgid "you need to resolve your current index first"
 msgstr "necesita resolver su índice actual primero"
 
 msgid "you need to resolve your current index first"
 msgstr "necesita resolver su índice actual primero"
 

-#: builtin/checkout.c:745
+#: builtin/checkout.c:782

 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No se puede hacer reflog para '%s': %s\n"
 
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No se puede hacer reflog para '%s': %s\n"
 

-#: builtin/checkout.c:786
+#: builtin/checkout.c:824

 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 
 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 

-#: builtin/checkout.c:790 builtin/clone.c:692
+#: builtin/checkout.c:828 builtin/clone.c:699

 msgid "unable to update HEAD"
 msgstr "no es posible actualizar  HEAD"
 
 msgid "unable to update HEAD"
 msgstr "no es posible actualizar  HEAD"
 

-#: builtin/checkout.c:794
+#: builtin/checkout.c:832

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Reiniciar rama '%s'\n"
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Reiniciar rama '%s'\n"
 

-#: builtin/checkout.c:797
+#: builtin/checkout.c:835

 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ya en '%s'\n"
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ya en '%s'\n"
 

-#: builtin/checkout.c:801
+#: builtin/checkout.c:839

 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Rama reiniciada y cambiada a '%s'\n"
 
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Rama reiniciada y cambiada a '%s'\n"
 

-#: builtin/checkout.c:803 builtin/checkout.c:1166
+#: builtin/checkout.c:841 builtin/checkout.c:1212

 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Cambiado a nueva rama '%s'\n"
 
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Cambiado a nueva rama '%s'\n"
 

-#: builtin/checkout.c:805
+#: builtin/checkout.c:843

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Cambiado a rama '%s'\n"
 
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Cambiado a rama '%s'\n"
 

-#: builtin/checkout.c:856
+#: builtin/checkout.c:894

 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... y %d más.\n"
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... y %d más.\n"
 

-#: builtin/checkout.c:862
+#: builtin/checkout.c:900

 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"


@@ -8769,7 +9428,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: builtin/checkout.c:881
+#: builtin/checkout.c:919

 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"


@@ -8796,160 +9455,169 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
 " git branch <nombre-de-rama> %s\n"
 "\n"
 

-#: builtin/checkout.c:913
+#: builtin/checkout.c:951

 msgid "internal error in revision walk"
 msgstr "error interno en camino de revisión"
 
 msgid "internal error in revision walk"
 msgstr "error interno en camino de revisión"
 

-#: builtin/checkout.c:917
+#: builtin/checkout.c:955

 msgid "Previous HEAD position was"
 msgstr "La posición previa de HEAD era"
 
 msgid "Previous HEAD position was"
 msgstr "La posición previa de HEAD era"
 

-#: builtin/checkout.c:945 builtin/checkout.c:1161
+#: builtin/checkout.c:983 builtin/checkout.c:1207

 msgid "You are on a branch yet to be born"
 msgstr "Estás en una rama por nacer"
 
 msgid "You are on a branch yet to be born"
 msgstr "Estás en una rama por nacer"
 

-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1104

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "solo una referencia esperada, %d entregadas."
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "solo una referencia esperada, %d entregadas."
 

-#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444
+#: builtin/checkout.c:1140
+#, c-format
+msgid ""
+"'%s' could be both a local file and a tracking branch.\n"
+"Please use -- (and optionally --no-guess) to disambiguate"
+msgstr ""
+"'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
+"Por favor use -- (y opcionalmente --no-guess) para desambiguar"
+
+#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445

 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia inválida: %s"
 
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia inválida: %s"
 

-#: builtin/checkout.c:1136
+#: builtin/checkout.c:1182

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referencia no es n árbol: %s"
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referencia no es n árbol: %s"
 

-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1221

 msgid "paths cannot be used with switching branches"
 msgstr "rutas no pueden ser usadas con cambios de rama"
 
 msgid "paths cannot be used with switching branches"
 msgstr "rutas no pueden ser usadas con cambios de rama"
 

-#: builtin/checkout.c:1178 builtin/checkout.c:1182
+#: builtin/checkout.c:1224 builtin/checkout.c:1228

 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' no puede ser usado con cambios de ramas"
 
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' no puede ser usado con cambios de ramas"
 

-#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240
+#: builtin/checkout.c:1243

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' no puede ser usado con '%s'"
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' no puede ser usado con '%s'"
 

-#: builtin/checkout.c:1202
+#: builtin/checkout.c:1248

 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No se puede cambiar rama a un '%s' sin commits"
 
 #, 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:1235 builtin/checkout.c:1237 builtin/clone.c:119
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488
-#: builtin/worktree.c:490
+#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120
+#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489
+#: builtin/worktree.c:491

 msgid "branch"
 msgstr "rama"
 
 msgid "branch"
 msgstr "rama"
 

-#: builtin/checkout.c:1236
+#: builtin/checkout.c:1282

 msgid "create and checkout a new branch"
 msgstr "crear y hacer checkout a una nueva rama"
 
 msgid "create and checkout a new branch"
 msgstr "crear y hacer checkout a una nueva rama"
 

-#: builtin/checkout.c:1238
+#: builtin/checkout.c:1284

 msgid "create/reset and checkout a branch"
 msgstr "crear/reiniciar y hacer checkout a una rama"
 
 msgid "create/reset and checkout a branch"
 msgstr "crear/reiniciar y hacer checkout a una rama"
 

-#: builtin/checkout.c:1239
+#: builtin/checkout.c:1285

 msgid "create reflog for new branch"
 msgstr "crear un reflog para una nueva rama"
 
 msgid "create reflog for new branch"
 msgstr "crear un reflog para una nueva rama"
 

-#: builtin/checkout.c:1240 builtin/worktree.c:492
+#: builtin/checkout.c:1286 builtin/worktree.c:493

 msgid "detach HEAD at named commit"
 msgstr "desacoplar HEAD en el commit nombrado"
 
 msgid "detach HEAD at named commit"
 msgstr "desacoplar HEAD en el commit nombrado"
 

-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1287

 msgid "set upstream info for new branch"
 msgstr "configurar info de upstream para una rama nueva"
 
 msgid "set upstream info for new branch"
 msgstr "configurar info de upstream para una rama nueva"
 

-#: builtin/checkout.c:1243
+#: builtin/checkout.c:1289

 msgid "new-branch"
 msgstr "nueva-rama"
 
 msgid "new-branch"
 msgstr "nueva-rama"
 

-#: builtin/checkout.c:1243
+#: builtin/checkout.c:1289

 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 

-#: builtin/checkout.c:1245
+#: builtin/checkout.c:1291

 msgid "checkout our version for unmerged files"
 msgstr "hacer checkout a  nuestra versión para archivos sin fusionar"
 
 msgid "checkout our version for unmerged files"
 msgstr "hacer checkout a  nuestra versión para archivos sin fusionar"
 

-#: builtin/checkout.c:1248
+#: builtin/checkout.c:1294

 msgid "checkout their version for unmerged files"
 msgstr "hacer checkout a su versión para los archivos sin fusionar"
 
 msgid "checkout their version for unmerged files"
 msgstr "hacer checkout a su versión para los archivos sin fusionar"
 

-#: builtin/checkout.c:1250
+#: builtin/checkout.c:1296

 msgid "force checkout (throw away local modifications)"
 msgstr "forzar el checkout (descartar modificaciones locales)"
 
 msgid "force checkout (throw away local modifications)"
 msgstr "forzar el checkout (descartar modificaciones locales)"
 

-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1298

 msgid "perform a 3-way merge with the new branch"
 msgstr "realizar una fusión de tres vías con la rama nueva"
 
 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:1254 builtin/merge.c:275
+#: builtin/checkout.c:1300 builtin/merge.c:276

 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 

-#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274
+#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272

 msgid "style"
 msgstr "estilo"
 
 msgid "style"
 msgstr "estilo"
 

-#: builtin/checkout.c:1257
+#: builtin/checkout.c:1303

 msgid "conflict style (merge or diff3)"
 msgstr "conflicto de estilos (merge o diff3)"
 
 msgid "conflict style (merge or diff3)"
 msgstr "conflicto de estilos (merge o diff3)"
 

-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1306

 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitar pathspecs a dispersar entradas solamente"
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitar pathspecs a dispersar entradas solamente"
 

-#: builtin/checkout.c:1262
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
+#: builtin/checkout.c:1308
+msgid "do not second guess 'git checkout <no-such-branch>'"
+msgstr "no adivinar segunda opción 'git checkout <no-hay-tal-rama>'"

 
 

-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1310

 msgid "do not check if another worktree is holding the given ref"
 msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
 
 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:1268 builtin/clone.c:86 builtin/fetch.c:141
-#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572
+#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141
+#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575

 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 
 #: builtin/send-pack.c:174
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 

-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1345

 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B y --orphan son mutuamente exclusivas"
 
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B y --orphan son mutuamente exclusivas"
 

-#: builtin/checkout.c:1315
+#: builtin/checkout.c:1362

 msgid "--track needs a branch name"
 msgstr "--track necesita el nombre de una rama"
 
 msgid "--track needs a branch name"
 msgstr "--track necesita el nombre de una rama"
 

-#: builtin/checkout.c:1320
+#: builtin/checkout.c:1367

 msgid "missing branch name; try -b"
 msgstr "falta nombre de rama; prueba -b"
 
 msgid "missing branch name; try -b"
 msgstr "falta nombre de rama; prueba -b"
 

-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1404

 msgid "invalid path specification"
 msgstr "especificación de ruta inválida"
 
 msgid "invalid path specification"
 msgstr "especificación de ruta inválida"
 

-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1411

 #, 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"
 
 #, 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:1368
+#: builtin/checkout.c:1415

 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
 
 #, 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:1372
+#: builtin/checkout.c:1419

 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."


@@ -8957,7 +9625,7 @@ msgstr ""
 "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
 "se revisa fuera del índice."
 
 "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
 "se revisa fuera del índice."
 

-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1439

 #, c-format
 msgid ""
 "'%s' matched more than one remote tracking branch.\n"
 #, c-format
 msgid ""
 "'%s' matched more than one remote tracking branch.\n"


@@ -8987,38 +9655,38 @@ msgstr ""
 "de nombre <nombre> remota, como 'origin', considera configurar\n"
 "checkout.defaultRemote=origin en tu configuración."
 
 "de nombre <nombre> remota, como 'origin', considera configurar\n"
 "checkout.defaultRemote=origin en tu configuración."
 

-#: builtin/clean.c:27
+#: builtin/clean.c:28

 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
 
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
 

-#: builtin/clean.c:31
+#: builtin/clean.c:32

 #, c-format
 msgid "Removing %s\n"
 msgstr "Borrando %s\n"
 
 #, c-format
 msgid "Removing %s\n"
 msgstr "Borrando %s\n"
 

-#: builtin/clean.c:32
+#: builtin/clean.c:33

 #, c-format
 msgid "Would remove %s\n"
 msgstr "Sera borrado %s\n"
 
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Sera borrado %s\n"
 

-#: builtin/clean.c:33
+#: builtin/clean.c:34

 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Saltando repositorio %s\n"
 
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Saltando repositorio %s\n"
 

-#: builtin/clean.c:34
+#: builtin/clean.c:35

 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Se saltara repositorio %s\n"
 
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Se saltara repositorio %s\n"
 

-#: builtin/clean.c:35
+#: builtin/clean.c:36

 #, c-format
 msgid "failed to remove %s"
 msgstr "falló al borrar %s"
 
 #, c-format
 msgid "failed to remove %s"
 msgstr "falló al borrar %s"
 

-#: builtin/clean.c:298 git-add--interactive.perl:579
+#: builtin/clean.c:299 git-add--interactive.perl:579

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -9031,7 +9699,7 @@ msgstr ""
 "foo        - selecciona un objeto basado en un prefijo único\n"
 "           - (vacío) no elegir nada\n"
 
 "foo        - selecciona un objeto basado en un prefijo único\n"
 "           - (vacío) no elegir nada\n"
 

-#: builtin/clean.c:302 git-add--interactive.perl:588
+#: builtin/clean.c:303 git-add--interactive.perl:588

 #, c-format
 msgid ""
 "Prompt help:\n"
 #, c-format
 msgid ""
 "Prompt help:\n"


@@ -9052,38 +9720,38 @@ msgstr ""
 "*          - escoger todos los objetos\n"
 "           - (vacío) terminar selección\n"
 
 "*          - escoger todos los objetos\n"
 "           - (vacío) terminar selección\n"
 

-#: builtin/clean.c:518 git-add--interactive.perl:554
+#: builtin/clean.c:519 git-add--interactive.perl:554

 #: git-add--interactive.perl:559
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Ahh (%s)?\n"
 
 #: git-add--interactive.perl:559
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Ahh (%s)?\n"
 

-#: builtin/clean.c:660
+#: builtin/clean.c:661

 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Input ignora los patrones >> "
 
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Input ignora los patrones >> "
 

-#: builtin/clean.c:697
+#: builtin/clean.c:698

 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
 
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
 

-#: builtin/clean.c:718
+#: builtin/clean.c:719

 msgid "Select items to delete"
 msgstr "Seleccionar objetos para borrar"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
 msgid "Select items to delete"
 msgstr "Seleccionar objetos para borrar"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is

-#: builtin/clean.c:759
+#: builtin/clean.c:760

 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Borrar %s [y/N]? "
 
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Borrar %s [y/N]? "
 

-#: builtin/clean.c:784 git-add--interactive.perl:1717
+#: builtin/clean.c:785 git-add--interactive.perl:1717

 #, c-format
 msgid "Bye.\n"
 msgstr "Adiós.\n"
 
 #, c-format
 msgid "Bye.\n"
 msgstr "Adiós.\n"
 

-#: builtin/clean.c:792
+#: builtin/clean.c:793

 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"


@@ -9101,64 +9769,64 @@ msgstr ""
 "help                - esta ventana\n"
 "?                   - ayuda para selección de opciones"
 
 "help                - esta ventana\n"
 "?                   - ayuda para selección de opciones"
 

-#: builtin/clean.c:819 git-add--interactive.perl:1793
+#: builtin/clean.c:820 git-add--interactive.perl:1793

 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 
 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 

-#: builtin/clean.c:820 git-add--interactive.perl:1790
+#: builtin/clean.c:821 git-add--interactive.perl:1790

 msgid "What now"
 msgstr "Ahora que"
 
 msgid "What now"
 msgstr "Ahora que"
 

-#: builtin/clean.c:828
+#: builtin/clean.c:829

 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Se eliminará el siguiente objeto:"
 msgstr[1] "Se eliminarán los siguientes objetos:"
 
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Se eliminará el siguiente objeto:"
 msgstr[1] "Se eliminarán los siguientes objetos:"
 

-#: builtin/clean.c:844
+#: builtin/clean.c:845

 msgid "No more files to clean, exiting."
 msgstr "No hay mas archivos para limpiar, saliendo."
 
 msgid "No more files to clean, exiting."
 msgstr "No hay mas archivos para limpiar, saliendo."
 

-#: builtin/clean.c:906
+#: builtin/clean.c:907

 msgid "do not print names of files removed"
 msgstr "no imprimir nombres de archivos borrados"
 
 msgid "do not print names of files removed"
 msgstr "no imprimir nombres de archivos borrados"
 

-#: builtin/clean.c:908
+#: builtin/clean.c:909

 msgid "force"
 msgstr "forzar"
 
 msgid "force"
 msgstr "forzar"
 

-#: builtin/clean.c:909
+#: builtin/clean.c:910

 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 
 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 

-#: builtin/clean.c:911
+#: builtin/clean.c:912

 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 
 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 

-#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547
-#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168
-#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417
+#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
+#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169
+#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417

 #: builtin/show-ref.c:178
 msgid "pattern"
 msgstr "patrón"
 
 #: builtin/show-ref.c:178
 msgid "pattern"
 msgstr "patrón"
 

-#: builtin/clean.c:913
+#: builtin/clean.c:914

 msgid "add <pattern> to ignore rules"
 msgstr "agregar <patrón> para ignorar reglas"
 
 msgid "add <pattern> to ignore rules"
 msgstr "agregar <patrón> para ignorar reglas"
 

-#: builtin/clean.c:914
+#: builtin/clean.c:915

 msgid "remove ignored files, too"
 msgstr "borrar archivos ignorados, también"
 
 msgid "remove ignored files, too"
 msgstr "borrar archivos ignorados, también"
 

-#: builtin/clean.c:916
+#: builtin/clean.c:917

 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 
 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 

-#: builtin/clean.c:934
+#: builtin/clean.c:935

 msgid "-x and -X cannot be used together"
 msgstr "-x y -X no pueden ser usadas juntas"
 
 msgid "-x and -X cannot be used together"
 msgstr "-x y -X no pueden ser usadas juntas"
 

-#: builtin/clean.c:938
+#: builtin/clean.c:939

 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"


@@ -9166,7 +9834,7 @@ msgstr ""
 "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
 "rehusando el clean"
 
 "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
 "rehusando el clean"
 

-#: builtin/clean.c:941
+#: builtin/clean.c:942

 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"


@@ -9174,146 +9842,146 @@ msgstr ""
 "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
 "rehusando el clean"
 
 "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
 "rehusando el clean"
 

-#: builtin/clone.c:43
+#: builtin/clone.c:44

 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
 
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
 

-#: builtin/clone.c:88
+#: builtin/clone.c:89

 msgid "don't create a checkout"
 msgstr "no crear checkout"
 
 msgid "don't create a checkout"
 msgstr "no crear checkout"
 

-#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481
+#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481

 msgid "create a bare repository"
 msgstr "crear un repositorio vacío"
 
 msgid "create a bare repository"
 msgstr "crear un repositorio vacío"
 

-#: builtin/clone.c:93
+#: builtin/clone.c:94

 msgid "create a mirror repository (implies bare)"
 msgstr "crear un repositorio espejo (implica vacío)"
 
 msgid "create a mirror repository (implies bare)"
 msgstr "crear un repositorio espejo (implica vacío)"
 

-#: builtin/clone.c:95
+#: builtin/clone.c:96

 msgid "to clone from a local repository"
 msgstr "clonar de un repositorio local"
 
 msgid "to clone from a local repository"
 msgstr "clonar de un repositorio local"
 

-#: builtin/clone.c:97
+#: builtin/clone.c:98

 msgid "don't use local hardlinks, always copy"
 msgstr "no usar hardlinks, siempre copiar"
 
 msgid "don't use local hardlinks, always copy"
 msgstr "no usar hardlinks, siempre copiar"
 

-#: builtin/clone.c:99
+#: builtin/clone.c:100

 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 
 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 

-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:102 builtin/clone.c:106

 msgid "pathspec"
 msgstr "pathspec"
 
 msgid "pathspec"
 msgstr "pathspec"
 

-#: builtin/clone.c:101 builtin/clone.c:105
+#: builtin/clone.c:102 builtin/clone.c:106

 msgid "initialize submodules in the clone"
 msgstr "inicializar submódulos en el clonado"
 
 msgid "initialize submodules in the clone"
 msgstr "inicializar submódulos en el clonado"
 

-#: builtin/clone.c:108
+#: builtin/clone.c:109

 msgid "number of submodules cloned in parallel"
 msgstr "numero de submódulos clonados en paralelo"
 
 msgid "number of submodules cloned in parallel"
 msgstr "numero de submódulos clonados en paralelo"
 

-#: builtin/clone.c:109 builtin/init-db.c:478
+#: builtin/clone.c:110 builtin/init-db.c:478

 msgid "template-directory"
 msgstr "directorio-template"
 
 msgid "template-directory"
 msgstr "directorio-template"
 

-#: builtin/clone.c:110 builtin/init-db.c:479
+#: builtin/clone.c:111 builtin/init-db.c:479

 msgid "directory from which templates will be used"
 msgstr "directorio del cual los templates serán usados"
 
 msgid "directory from which templates will be used"
 msgstr "directorio del cual los templates serán usados"
 

-#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1856
+#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1860

 msgid "reference repository"
 msgstr "repositorio de referencia"
 
 msgid "reference repository"
 msgstr "repositorio de referencia"
 

-#: builtin/clone.c:116 builtin/submodule--helper.c:1377
-#: builtin/submodule--helper.c:1858
+#: builtin/clone.c:117 builtin/submodule--helper.c:1381
+#: builtin/submodule--helper.c:1862

 msgid "use --reference only while cloning"
 msgstr "usa--reference  solamente si estás clonado"
 
 msgid "use --reference only while cloning"
 msgstr "usa--reference  solamente si estás clonado"
 

-#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3301 builtin/repack.c:329
+#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3303 builtin/repack.c:329

 msgid "name"
 msgstr "nombre"
 
 msgid "name"
 msgstr "nombre"
 

-#: builtin/clone.c:118
+#: builtin/clone.c:119

 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
 
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
 

-#: builtin/clone.c:120
+#: builtin/clone.c:121

 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checkout <rama> en lugar de HEAD remota"
 
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checkout <rama> en lugar de HEAD remota"
 

-#: builtin/clone.c:122
+#: builtin/clone.c:123

 msgid "path to git-upload-pack on the remote"
 msgstr "ruta para git-upload-pack en el remoto"
 
 msgid "path to git-upload-pack on the remote"
 msgstr "ruta para git-upload-pack en el remoto"
 

-#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825
-#: builtin/pull.c:217
+#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836
+#: builtin/pull.c:218

 msgid "depth"
 msgstr "profundidad"
 
 msgid "depth"
 msgstr "profundidad"
 

-#: builtin/clone.c:124
+#: builtin/clone.c:125

 msgid "create a shallow clone of that depth"
 msgstr "crear un clon superficial para esa profundidad"
 
 msgid "create a shallow clone of that depth"
 msgstr "crear un clon superficial para esa profundidad"
 

-#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
+#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292

 msgid "time"
 msgstr "tiempo"
 
 msgid "time"
 msgstr "tiempo"
 

-#: builtin/clone.c:126
+#: builtin/clone.c:127

 msgid "create a shallow clone since a specific time"
 msgstr "crear un clon superficial desde el tiempo específico"
 
 msgid "create a shallow clone since a specific time"
 msgstr "crear un clon superficial desde el tiempo específico"
 

-#: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:831
+#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169
+#: builtin/rebase.c:1039

 msgid "revision"
 msgstr "revision"
 
 msgid "revision"
 msgstr "revision"
 

-#: builtin/clone.c:128 builtin/fetch.c:147
+#: builtin/clone.c:129 builtin/fetch.c:147

 msgid "deepen history of shallow clone, excluding rev"
 msgstr "ahondando historia de clon superficial, excluyendo rev"
 
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "ahondando historia de clon superficial, excluyendo rev"
 

-#: builtin/clone.c:130
+#: builtin/clone.c:131

 msgid "clone only one branch, HEAD or --branch"
 msgstr "clonar solo una rama,HEAD o --branch"
 
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clonar solo una rama,HEAD o --branch"
 

-#: builtin/clone.c:132
+#: builtin/clone.c:133

 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
 
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
 

-#: builtin/clone.c:134
+#: builtin/clone.c:135

 msgid "any cloned submodules will be shallow"
 msgstr "cualquier submódulo clonado será superficial"
 
 msgid "any cloned submodules will be shallow"
 msgstr "cualquier submódulo clonado será superficial"
 

-#: builtin/clone.c:135 builtin/init-db.c:487
+#: builtin/clone.c:136 builtin/init-db.c:487

 msgid "gitdir"
 msgstr "gitdir"
 
 msgid "gitdir"
 msgstr "gitdir"
 

-#: builtin/clone.c:136 builtin/init-db.c:488
+#: builtin/clone.c:137 builtin/init-db.c:488

 msgid "separate git dir from working tree"
 msgstr "separa git dir del árbol de trabajo"
 
 msgid "separate git dir from working tree"
 msgstr "separa git dir del árbol de trabajo"
 

-#: builtin/clone.c:137
+#: builtin/clone.c:138

 msgid "key=value"
 msgstr "llave=valor"
 
 msgid "key=value"
 msgstr "llave=valor"
 

-#: builtin/clone.c:138
+#: builtin/clone.c:139

 msgid "set config inside the new repository"
 msgstr "configurar config dentro del nuevo repositorio"
 
 msgid "set config inside the new repository"
 msgstr "configurar config dentro del nuevo repositorio"
 

-#: builtin/clone.c:139 builtin/fetch.c:165 builtin/pull.c:230
-#: builtin/push.c:583
+#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231
+#: builtin/push.c:586

 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 

-#: builtin/clone.c:141 builtin/fetch.c:167 builtin/pull.c:233
-#: builtin/push.c:585
+#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234
+#: builtin/push.c:588

 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 

-#: builtin/clone.c:279
+#: builtin/clone.c:280

 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"


@@ -9321,47 +9989,47 @@ msgstr ""
 "No se pudo adivinar ningún nombre de directorio.\n"
 "Por favor especifique un directorio en la línea de comando"
 
 "No se pudo adivinar ningún nombre de directorio.\n"
 "Por favor especifique un directorio en la línea de comando"
 

-#: builtin/clone.c:332
+#: builtin/clone.c:333

 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
 
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
 

-#: builtin/clone.c:404
+#: builtin/clone.c:405

 #, c-format
 msgid "failed to open '%s'"
 msgstr "falló al abrir '%s'"
 
 #, c-format
 msgid "failed to open '%s'"
 msgstr "falló al abrir '%s'"
 

-#: builtin/clone.c:412
+#: builtin/clone.c:413

 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe pero no es un directorio"
 
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe pero no es un directorio"
 

-#: builtin/clone.c:426
+#: builtin/clone.c:427

 #, c-format
 msgid "failed to stat %s\n"
 msgstr "falló al analizar %s\n"
 
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "falló al analizar %s\n"
 

-#: builtin/clone.c:443
+#: builtin/clone.c:444

 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "falló al desvincular '%s'"
 
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "falló al desvincular '%s'"
 

-#: builtin/clone.c:448
+#: builtin/clone.c:449

 #, c-format
 msgid "failed to create link '%s'"
 msgstr "falló al crear link '%s'"
 
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "falló al crear link '%s'"
 

-#: builtin/clone.c:452
+#: builtin/clone.c:453

 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falló al copiar archivo a '%s'"
 
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falló al copiar archivo a '%s'"
 

-#: builtin/clone.c:478
+#: builtin/clone.c:479

 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 
 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 

-#: builtin/clone.c:492
+#: builtin/clone.c:493

 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"


@@ -9371,96 +10039,96 @@ msgstr ""
 "Puede inspeccionar a qué se hizo checkout con 'git status'\n"
 "y volver a intentarlo con 'git checkout -f HEAD'\n"
 
 "Puede inspeccionar a qué se hizo checkout con 'git status'\n"
 "y volver a intentarlo con 'git checkout -f HEAD'\n"
 

-#: builtin/clone.c:569
+#: builtin/clone.c:570

 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "No se pudo encontrar la rama remota %s para clonar."
 
 #, 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:680
+#: builtin/clone.c:687

 #, c-format
 msgid "unable to update %s"
 msgstr "incapaz de actualizar %s"
 
 #, c-format
 msgid "unable to update %s"
 msgstr "incapaz de actualizar %s"
 

-#: builtin/clone.c:730
+#: builtin/clone.c:737

 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
 
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
 

-#: builtin/clone.c:761
+#: builtin/clone.c:768

 msgid "unable to checkout working tree"
 msgstr "no es posible realizar checkout en el árbol de trabajo"
 
 msgid "unable to checkout working tree"
 msgstr "no es posible realizar checkout en el árbol de trabajo"
 

-#: builtin/clone.c:806
+#: builtin/clone.c:813

 msgid "unable to write parameters to config file"
 msgstr "no es posible escribir parámetros al archivo config"
 
 msgid "unable to write parameters to config file"
 msgstr "no es posible escribir parámetros al archivo config"
 

-#: builtin/clone.c:869
+#: builtin/clone.c:876

 msgid "cannot repack to clean up"
 msgstr "no se puede reempaquetar para limpiar"
 
 msgid "cannot repack to clean up"
 msgstr "no se puede reempaquetar para limpiar"
 

-#: builtin/clone.c:871
+#: builtin/clone.c:878

 msgid "cannot unlink temporary alternates file"
 msgstr "no se puede desvincular archivos alternos temporales"
 
 msgid "cannot unlink temporary alternates file"
 msgstr "no se puede desvincular archivos alternos temporales"
 

-#: builtin/clone.c:911 builtin/receive-pack.c:1941
+#: builtin/clone.c:918 builtin/receive-pack.c:1941

 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 
 msgid "Too many arguments."
 msgstr "Muchos argumentos."
 

-#: builtin/clone.c:915
+#: builtin/clone.c:922

 msgid "You must specify a repository to clone."
 msgstr "Tienes que especificar un repositorio para clonar."
 
 msgid "You must specify a repository to clone."
 msgstr "Tienes que especificar un repositorio para clonar."
 

-#: builtin/clone.c:928
+#: builtin/clone.c:935

 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Las opciones --bare y --origin %s son incompatibles."
 
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Las opciones --bare y --origin %s son incompatibles."
 

-#: builtin/clone.c:931
+#: builtin/clone.c:938

 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare y --separate-git-dir son incompatibles."
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare y --separate-git-dir son incompatibles."
 

-#: builtin/clone.c:944
+#: builtin/clone.c:951

 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositorio '%s' no existe"
 
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositorio '%s' no existe"
 

-#: builtin/clone.c:950 builtin/fetch.c:1606
+#: builtin/clone.c:957 builtin/fetch.c:1608

 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "profundidad %s no es un numero positivo"
 
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "profundidad %s no es un numero positivo"
 

-#: builtin/clone.c:960
+#: builtin/clone.c:967

 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
 
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
 

-#: builtin/clone.c:970
+#: builtin/clone.c:977

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "directorio de trabajo '%s' ya existe."
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "directorio de trabajo '%s' ya existe."
 

-#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271
-#: builtin/worktree.c:295 builtin/worktree.c:325
+#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272
+#: builtin/worktree.c:296 builtin/worktree.c:326

 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no se pudo crear directorios principales de '%s'"
 
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no se pudo crear directorios principales de '%s'"
 

-#: builtin/clone.c:990
+#: builtin/clone.c:997

 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no se pudo crear un árbol de trabajo '%s'"
 
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no se pudo crear un árbol de trabajo '%s'"
 

-#: builtin/clone.c:1010
+#: builtin/clone.c:1017

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonando en un repositorio vacío '%s'...\n"
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonando en un repositorio vacío '%s'...\n"
 

-#: builtin/clone.c:1012
+#: builtin/clone.c:1019

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando en '%s'...\n"
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando en '%s'...\n"
 

-#: builtin/clone.c:1036
+#: builtin/clone.c:1043

 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"


@@ -9468,36 +10136,36 @@ msgstr ""
 "clone --recursive no es compatible con --reference y --reference-if-able al "
 "mismo tiempo"
 
 "clone --recursive no es compatible con --reference y --reference-if-able al "
 "mismo tiempo"
 

-#: builtin/clone.c:1097
+#: builtin/clone.c:1104

 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
 
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
 

-#: builtin/clone.c:1099
+#: builtin/clone.c:1106

 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since es ignorado en el clon local; use file:// ."
 
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since es ignorado en el clon local; use file:// ."
 

-#: builtin/clone.c:1101
+#: builtin/clone.c:1108

 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude es ignorado en clones locales; use file://."
 
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude es ignorado en clones locales; use file://."
 

-#: builtin/clone.c:1103
+#: builtin/clone.c:1110

 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
 
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
 

-#: builtin/clone.c:1106
+#: builtin/clone.c:1113

 msgid "source repository is shallow, ignoring --local"
 msgstr "repositorio fuente es superficial, ignorando --local"
 
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositorio fuente es superficial, ignorando --local"
 

-#: builtin/clone.c:1111
+#: builtin/clone.c:1118

 msgid "--local is ignored"
 msgstr "--local es ignorado"
 
 msgid "--local is ignored"
 msgstr "--local es ignorado"
 

-#: builtin/clone.c:1181 builtin/clone.c:1189
+#: builtin/clone.c:1192 builtin/clone.c:1200

 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Rama remota %s no encontrada en upstream %s"
 
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Rama remota %s no encontrada en upstream %s"
 

-#: builtin/clone.c:1192
+#: builtin/clone.c:1203

 msgid "You appear to have cloned an empty repository."
 msgstr "Pareces haber clonado un repositorio sin contenido."
 
 msgid "You appear to have cloned an empty repository."
 msgstr "Pareces haber clonado un repositorio sin contenido."
 


@@ -9533,15 +10201,15 @@ msgstr "Realizando padding entre columnas"
 msgid "--command must be the first argument"
 msgstr "--command debe ser el primer argumento"
 
 msgid "--command must be the first argument"
 msgstr "--command debe ser el primer argumento"
 

-#: builtin/commit.c:40
+#: builtin/commit.c:41

 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
 
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
 

-#: builtin/commit.c:45
+#: builtin/commit.c:46

 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
 
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
 

-#: builtin/commit.c:50
+#: builtin/commit.c:51

 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"


@@ -9551,7 +10219,7 @@ msgstr ""
 "vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n"
 "el commit completamente con \"git reset HEAD^\".\n"
 
 "vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n"
 "el commit completamente con \"git reset HEAD^\".\n"
 

-#: builtin/commit.c:55
+#: builtin/commit.c:56

 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"


@@ -9566,11 +10234,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
 "    git commit --allow-empty\n"
 "\n"
 

-#: builtin/commit.c:62
+#: builtin/commit.c:63

 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Caso contrario, por favor usa 'git reset'\n"
 
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Caso contrario, por favor usa 'git reset'\n"
 

-#: builtin/commit.c:65
+#: builtin/commit.c:66

 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"


@@ -9586,61 +10254,61 @@ msgstr ""
 "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
 "para los commits restantes.\n"
 
 "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
 "para los commits restantes.\n"
 

-#: builtin/commit.c:311
+#: builtin/commit.c:312

 msgid "failed to unpack HEAD tree object"
 msgstr "falló al desempaquetar objeto del árbol HEAD"
 
 msgid "failed to unpack HEAD tree object"
 msgstr "falló al desempaquetar objeto del árbol HEAD"
 

-#: builtin/commit.c:352
+#: builtin/commit.c:353

 msgid "unable to create temporary index"
 msgstr "no es posible crear un índice temporal"
 
 msgid "unable to create temporary index"
 msgstr "no es posible crear un índice temporal"
 

-#: builtin/commit.c:358
+#: builtin/commit.c:359

 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 
 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 

-#: builtin/commit.c:371
+#: builtin/commit.c:373

 msgid "unable to update temporary index"
 msgstr "no es posible actualizar el índice temporal"
 
 msgid "unable to update temporary index"
 msgstr "no es posible actualizar el índice temporal"
 

-#: builtin/commit.c:373
+#: builtin/commit.c:375

 msgid "Failed to update main cache tree"
 msgstr "Falló al actualizar el cache principal del árbol"
 
 msgid "Failed to update main cache tree"
 msgstr "Falló al actualizar el cache principal del árbol"
 

-#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467
+#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469

 msgid "unable to write new_index file"
 msgstr "no es posible escribir archivo new_index"
 
 msgid "unable to write new_index file"
 msgstr "no es posible escribir archivo new_index"
 

-#: builtin/commit.c:450
+#: builtin/commit.c:452

 msgid "cannot do a partial commit during a merge."
 msgstr "no se puede realizar un commit parcial durante una fusión."
 
 msgid "cannot do a partial commit during a merge."
 msgstr "no se puede realizar un commit parcial durante una fusión."
 

-#: builtin/commit.c:452
+#: builtin/commit.c:454

 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no se puede realizar un commit parcial durante un cherry-pick."
 
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no se puede realizar un commit parcial durante un cherry-pick."
 

-#: builtin/commit.c:460
+#: builtin/commit.c:462

 msgid "cannot read the index"
 msgstr "no se puede leer el índice"
 
 msgid "cannot read the index"
 msgstr "no se puede leer el índice"
 

-#: builtin/commit.c:479
+#: builtin/commit.c:481

 msgid "unable to write temporary index file"
 msgstr "no es posible escribir el índice temporal"
 
 msgid "unable to write temporary index file"
 msgstr "no es posible escribir el índice temporal"
 

-#: builtin/commit.c:577
+#: builtin/commit.c:579

 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "commit '%s' requiere cabecera de autor"
 
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "commit '%s' requiere cabecera de autor"
 

-#: builtin/commit.c:579
+#: builtin/commit.c:581

 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "el commit '%s' tiene una línea de autor mal formada"
 
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "el commit '%s' tiene una línea de autor mal formada"
 

-#: builtin/commit.c:598
+#: builtin/commit.c:600

 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 
 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 

-#: builtin/commit.c:650
+#: builtin/commit.c:652

 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"


@@ -9648,38 +10316,38 @@ msgstr ""
 "no es posible seleccionar un carácter de comentario que no es usado\n"
 "en el mensaje de commit actual"
 
 "no es posible seleccionar un carácter de comentario que no es usado\n"
 "en el mensaje de commit actual"
 

-#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052

 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no se pudo revisar el commit %s"
 
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no se pudo revisar el commit %s"
 

-#: builtin/commit.c:699 builtin/shortlog.c:317
+#: builtin/commit.c:701 builtin/shortlog.c:319

 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(leyendo mensajes de logs desde standard input)\n"
 
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(leyendo mensajes de logs desde standard input)\n"
 

-#: builtin/commit.c:701
+#: builtin/commit.c:703

 msgid "could not read log from standard input"
 msgstr "no se pudo leer log desde standard input"
 
 msgid "could not read log from standard input"
 msgstr "no se pudo leer log desde standard input"
 

-#: builtin/commit.c:705
+#: builtin/commit.c:707

 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no se pudo leer el log '%s'"
 
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no se pudo leer el log '%s'"
 

-#: builtin/commit.c:734 builtin/commit.c:742
+#: builtin/commit.c:736 builtin/commit.c:744

 msgid "could not read SQUASH_MSG"
 msgstr "no se pudo leer SQUASH_MSG"
 
 msgid "could not read SQUASH_MSG"
 msgstr "no se pudo leer SQUASH_MSG"
 

-#: builtin/commit.c:739
+#: builtin/commit.c:741

 msgid "could not read MERGE_MSG"
 msgstr "no se pudo leer MERGE_MSG"
 
 msgid "could not read MERGE_MSG"
 msgstr "no se pudo leer MERGE_MSG"
 

-#: builtin/commit.c:793
+#: builtin/commit.c:795

 msgid "could not write commit template"
 msgstr "no se pudo escribir el template del commit"
 
 msgid "could not write commit template"
 msgstr "no se pudo escribir el template del commit"
 

-#: builtin/commit.c:811
+#: builtin/commit.c:813

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -9694,7 +10362,7 @@ msgstr ""
 "\t%s\n"
 "y vuelve a intentar.\n"
 
 "\t%s\n"
 "y vuelve a intentar.\n"
 

-#: builtin/commit.c:816
+#: builtin/commit.c:818

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -9709,7 +10377,7 @@ msgstr ""
 "\t%s\n"
 "y vuelva a intentar.\n"
 
 "\t%s\n"
 "y vuelva a intentar.\n"
 

-#: builtin/commit.c:829
+#: builtin/commit.c:831

 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"


@@ -9719,7 +10387,7 @@ msgstr ""
 "comiencen\n"
 "con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
 
 "comiencen\n"
 "con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
 

-#: builtin/commit.c:837
+#: builtin/commit.c:839

 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"


@@ -9731,151 +10399,151 @@ msgstr ""
 "con '%c' serán guardadas; puede eliminarlas usted mismo si desea.\n"
 "Un mensaje vacío aborta el commit.\n"
 
 "con '%c' serán guardadas; puede eliminarlas usted mismo si desea.\n"
 "Un mensaje vacío aborta el commit.\n"
 

-#: builtin/commit.c:854
+#: builtin/commit.c:856

 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 

-#: builtin/commit.c:862
+#: builtin/commit.c:864

 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sFecha:     %s"
 
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sFecha:     %s"
 

-#: builtin/commit.c:869
+#: builtin/commit.c:871

 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 

-#: builtin/commit.c:887
+#: builtin/commit.c:889

 msgid "Cannot read index"
 msgstr "No se puede leer el índice"
 
 msgid "Cannot read index"
 msgstr "No se puede leer el índice"
 

-#: builtin/commit.c:953
+#: builtin/commit.c:956

 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 
 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 

-#: builtin/commit.c:967 builtin/tag.c:258
+#: builtin/commit.c:970 builtin/tag.c:258

 #, 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"
 
 #, 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:1011
+#: builtin/commit.c:1014

 #, 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"
 
 #, 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:1025
+#: builtin/commit.c:1028

 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Modo ignorado inválido '%s'"
 
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Modo ignorado inválido '%s'"
 

-#: builtin/commit.c:1039 builtin/commit.c:1276
+#: builtin/commit.c:1042 builtin/commit.c:1279

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Modo inválido de los archivos no rastreados '%s'"
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Modo inválido de los archivos no rastreados '%s'"
 

-#: builtin/commit.c:1077
+#: builtin/commit.c:1080

 msgid "--long and -z are incompatible"
 msgstr "--long y -z son incompatibles"
 
 msgid "--long and -z are incompatible"
 msgstr "--long y -z son incompatibles"
 

-#: builtin/commit.c:1110
+#: builtin/commit.c:1113

 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambos --reset-author y --author no tiene sentido"
 
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambos --reset-author y --author no tiene sentido"
 

-#: builtin/commit.c:1119
+#: builtin/commit.c:1122

 msgid "You have nothing to amend."
 msgstr "No tienes nada que enmendar."
 
 msgid "You have nothing to amend."
 msgstr "No tienes nada que enmendar."
 

-#: builtin/commit.c:1122
+#: builtin/commit.c:1125

 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Estás en medio de una fusión -- no puedes enmendar."
 
 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:1124
+#: builtin/commit.c:1127

 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
 
 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:1127
+#: builtin/commit.c:1130

 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 

-#: builtin/commit.c:1137
+#: builtin/commit.c:1140

 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
 
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
 

-#: builtin/commit.c:1139
+#: builtin/commit.c:1142

 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "La opción -m no puede ser combinada con -c/-C/-F."
 
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "La opción -m no puede ser combinada con -c/-C/-F."
 

-#: builtin/commit.c:1147
+#: builtin/commit.c:1150

 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."
 
 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:1164
+#: builtin/commit.c:1167

 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
 
 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:1166
+#: builtin/commit.c:1169

 msgid "No paths with --include/--only does not make sense."
 msgstr "No hay rutas con --include/--only no tiene sentido."
 
 msgid "No paths with --include/--only does not make sense."
 msgstr "No hay rutas con --include/--only no tiene sentido."
 

-#: builtin/commit.c:1180 builtin/tag.c:546
+#: builtin/commit.c:1183 builtin/tag.c:546

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup inválido %s"
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup inválido %s"
 

-#: builtin/commit.c:1185
+#: builtin/commit.c:1188

 msgid "Paths with -a does not make sense."
 msgstr "Rutas con -a no tiene sentido."
 
 msgid "Paths with -a does not make sense."
 msgstr "Rutas con -a no tiene sentido."
 

-#: builtin/commit.c:1311 builtin/commit.c:1495
+#: builtin/commit.c:1314 builtin/commit.c:1498

 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 
 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 

-#: builtin/commit.c:1313 builtin/commit.c:1497
+#: builtin/commit.c:1316 builtin/commit.c:1500

 msgid "show branch information"
 msgstr "mostrar información de la rama"
 
 msgid "show branch information"
 msgstr "mostrar información de la rama"
 

-#: builtin/commit.c:1315
+#: builtin/commit.c:1318

 msgid "show stash information"
 msgstr "mostrar información del stash"
 
 msgid "show stash information"
 msgstr "mostrar información del stash"
 

-#: builtin/commit.c:1317 builtin/commit.c:1499
+#: builtin/commit.c:1320 builtin/commit.c:1502

 msgid "compute full ahead/behind values"
 msgstr "calcular todos los valores delante/atrás"
 
 msgid "compute full ahead/behind values"
 msgstr "calcular todos los valores delante/atrás"
 

-#: builtin/commit.c:1319
+#: builtin/commit.c:1322

 msgid "version"
 msgstr "version"
 
 msgid "version"
 msgstr "version"
 

-#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558
-#: builtin/worktree.c:639
+#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561
+#: builtin/worktree.c:640

 msgid "machine-readable output"
 msgstr "output formato-maquina"
 
 msgid "machine-readable output"
 msgstr "output formato-maquina"
 

-#: builtin/commit.c:1322 builtin/commit.c:1503
+#: builtin/commit.c:1325 builtin/commit.c:1506

 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 
 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 

-#: builtin/commit.c:1325 builtin/commit.c:1506
+#: builtin/commit.c:1328 builtin/commit.c:1509

 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 

-#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
-#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
+#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512
+#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118

 #: builtin/tag.c:400
 msgid "mode"
 msgstr "modo"
 
 #: builtin/tag.c:400
 msgid "mode"
 msgstr "modo"
 

-#: builtin/commit.c:1328 builtin/commit.c:1509
+#: builtin/commit.c:1331 builtin/commit.c:1512

 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
 "(Predeterminado: all)"
 
 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:1332
+#: builtin/commit.c:1335

 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"


@@ -9883,11 +10551,11 @@ msgstr ""
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 

-#: builtin/commit.c:1334 parse-options.h:164
+#: builtin/commit.c:1337 parse-options.h:164

 msgid "when"
 msgstr "cuando"
 
 msgid "when"
 msgstr "cuando"
 

-#: builtin/commit.c:1335
+#: builtin/commit.c:1338

 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"


@@ -9895,195 +10563,195 @@ msgstr ""
 "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
 "(Default: all)"
 
 "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
 "(Default: all)"
 

-#: builtin/commit.c:1337
+#: builtin/commit.c:1340

 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 
 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 

-#: builtin/commit.c:1338
+#: builtin/commit.c:1341

 msgid "do not detect renames"
 msgstr "no detectar renombrados"
 
 msgid "do not detect renames"
 msgstr "no detectar renombrados"
 

-#: builtin/commit.c:1340
+#: builtin/commit.c:1343

 msgid "detect renames, optionally set similarity index"
 msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
 
 msgid "detect renames, optionally set similarity index"
 msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
 

-#: builtin/commit.c:1360
+#: builtin/commit.c:1363

 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinación de argumentos de archivos ignorados y no rastreados no soportada"
 
 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:1465
+#: builtin/commit.c:1468

 msgid "suppress summary after successful commit"
 msgstr "suprime summary tras un commit exitoso"
 
 msgid "suppress summary after successful commit"
 msgstr "suprime summary tras un commit exitoso"
 

-#: builtin/commit.c:1466
+#: builtin/commit.c:1469

 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 
 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 

-#: builtin/commit.c:1468
+#: builtin/commit.c:1471

 msgid "Commit message options"
 msgstr "Opciones para el mensaje del commit"
 
 msgid "Commit message options"
 msgstr "Opciones para el mensaje del commit"
 

-#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397
+#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397

 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 
 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 

-#: builtin/commit.c:1470
+#: builtin/commit.c:1473

 msgid "author"
 msgstr "autor"
 
 msgid "author"
 msgstr "autor"
 

-#: builtin/commit.c:1470
+#: builtin/commit.c:1473

 msgid "override author for commit"
 msgstr "sobrescribe el autor del commit"
 
 msgid "override author for commit"
 msgstr "sobrescribe el autor del commit"
 

-#: builtin/commit.c:1471 builtin/gc.c:518
+#: builtin/commit.c:1474 builtin/gc.c:518

 msgid "date"
 msgstr "fecha"
 
 msgid "date"
 msgstr "fecha"
 

-#: builtin/commit.c:1471
+#: builtin/commit.c:1474

 msgid "override date for commit"
 msgstr "sobrescribe la fecha del commit"
 
 msgid "override date for commit"
 msgstr "sobrescribe la fecha del commit"
 

-#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409
-#: builtin/notes.c:572 builtin/tag.c:395
+#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409
+#: builtin/notes.c:575 builtin/tag.c:395

 msgid "message"
 msgstr "mensaje"
 
 msgid "message"
 msgstr "mensaje"
 

-#: builtin/commit.c:1472
+#: builtin/commit.c:1475

 msgid "commit message"
 msgstr "mensaje del commit"
 
 msgid "commit message"
 msgstr "mensaje del commit"
 

-#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475
-#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280
+#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478
+#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92

 msgid "commit"
 msgstr "confirmar"
 
 msgid "commit"
 msgstr "confirmar"
 

-#: builtin/commit.c:1473
+#: builtin/commit.c:1476

 msgid "reuse and edit message from specified commit"
 msgstr "reusar y editar el mensaje de un commit especifico"
 
 msgid "reuse and edit message from specified commit"
 msgstr "reusar y editar el mensaje de un commit especifico"
 

-#: builtin/commit.c:1474
+#: builtin/commit.c:1477

 msgid "reuse message from specified commit"
 msgstr "reusar el mensaje de un commit especifico"
 
 msgid "reuse message from specified commit"
 msgstr "reusar el mensaje de un commit especifico"
 

-#: builtin/commit.c:1475
+#: builtin/commit.c:1478

 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usar mensaje de formato autosquash para arreglar el commit especificado"
 
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usar mensaje de formato autosquash para arreglar el commit especificado"
 

-#: builtin/commit.c:1476
+#: builtin/commit.c:1479

 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usar el mensaje de formato autosquash para realizar squash  al commit "
 "especificado"
 
 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:1477
+#: builtin/commit.c:1480

 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)"
 
 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:1478 builtin/log.c:1520 builtin/merge.c:276
-#: builtin/pull.c:155 builtin/revert.c:106
+#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277
+#: builtin/pull.c:156 builtin/revert.c:107

 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 
 msgid "add Signed-off-by:"
 msgstr "agregar Signed-off-by: (firmado por)"
 

-#: builtin/commit.c:1479
+#: builtin/commit.c:1482

 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 
 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 

-#: builtin/commit.c:1480
+#: builtin/commit.c:1483

 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 
 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 

-#: builtin/commit.c:1481
+#: builtin/commit.c:1484

 msgid "default"
 msgstr "default"
 
 msgid "default"
 msgstr "default"
 

-#: builtin/commit.c:1481 builtin/tag.c:401
+#: builtin/commit.c:1484 builtin/tag.c:401

 msgid "how to strip spaces and #comments from message"
 msgstr "cómo quitar espacios y #comentarios de mensajes"
 
 msgid "how to strip spaces and #comments from message"
 msgstr "cómo quitar espacios y #comentarios de mensajes"
 

-#: builtin/commit.c:1482
+#: builtin/commit.c:1485

 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 

-#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185
-#: builtin/revert.c:114
+#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186
+#: builtin/revert.c:115

 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 
 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 

-#: builtin/commit.c:1487
+#: builtin/commit.c:1490

 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 
 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 

-#: builtin/commit.c:1488
+#: builtin/commit.c:1491

 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 
 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 

-#: builtin/commit.c:1489
+#: builtin/commit.c:1492

 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 
 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 

-#: builtin/commit.c:1490
+#: builtin/commit.c:1493

 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 
 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 

-#: builtin/commit.c:1491
+#: builtin/commit.c:1494

 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 
 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 

-#: builtin/commit.c:1492
+#: builtin/commit.c:1495

 msgid "commit only specified files"
 msgstr "sólo confirmar archivos específicos"
 
 msgid "commit only specified files"
 msgstr "sólo confirmar archivos específicos"
 

-#: builtin/commit.c:1493
+#: builtin/commit.c:1496

 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 

-#: builtin/commit.c:1494
+#: builtin/commit.c:1497

 msgid "show what would be committed"
 msgstr "mostrar lo que sería incluido en el commit"
 
 msgid "show what would be committed"
 msgstr "mostrar lo que sería incluido en el commit"
 

-#: builtin/commit.c:1507
+#: builtin/commit.c:1510

 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 
 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 

-#: builtin/commit.c:1508
+#: builtin/commit.c:1511

 msgid "bypass post-rewrite hook"
 msgstr "gancho bypass post reescritura"
 
 msgid "bypass post-rewrite hook"
 msgstr "gancho bypass post reescritura"
 

-#: builtin/commit.c:1513
+#: builtin/commit.c:1516

 msgid "ok to record an empty change"
 msgstr "ok al grabar un cambio vacío"
 
 msgid "ok to record an empty change"
 msgstr "ok al grabar un cambio vacío"
 

-#: builtin/commit.c:1515
+#: builtin/commit.c:1518

 msgid "ok to record a change with an empty message"
 msgstr "ok al grabar un cambio con un mensaje vacío"
 
 msgid "ok to record a change with an empty message"
 msgstr "ok al grabar un cambio con un mensaje vacío"
 

-#: builtin/commit.c:1588
+#: builtin/commit.c:1591

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 

-#: builtin/commit.c:1595
+#: builtin/commit.c:1598

 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 
 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 

-#: builtin/commit.c:1614
+#: builtin/commit.c:1617

 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 

-#: builtin/commit.c:1625
+#: builtin/commit.c:1628

 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abortando commit debido que el mensaje está en blanco.\n"
 
 #, 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:1630
+#: builtin/commit.c:1633

 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abortando commit; no se ha editado el mensaje\n"
 
 #, 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:1665
+#: builtin/commit.c:1668

 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"


@@ -10115,7 +10783,7 @@ msgstr ""
 
 #: builtin/commit-graph.c:48 builtin/commit-graph.c:78
 #: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
 
 #: builtin/commit-graph.c:48 builtin/commit-graph.c:78
 #: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153

-#: builtin/log.c:1540
+#: builtin/log.c:1553

 msgid "dir"
 msgstr "dir"
 
 msgid "dir"
 msgstr "dir"
 


@@ -10306,48 +10974,48 @@ msgstr "valor"
 msgid "with --get, use default value when missing entry"
 msgstr "con --get, usa el valor por defecto cuando falta una entrada"
 
 msgid "with --get, use default value when missing entry"
 msgstr "con --get, usa el valor por defecto cuando falta una entrada"
 

-#: builtin/config.c:171
+#: builtin/config.c:172

 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "número de argumentos inválidos, deberían ser %d"
 
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "número de argumentos inválidos, deberían ser %d"
 

-#: builtin/config.c:173
+#: builtin/config.c:174

 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "número de argumentos inválidos, deberían ser de %d a %d"
 
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "número de argumentos inválidos, deberían ser de %d a %d"
 

-#: builtin/config.c:307
+#: builtin/config.c:308

 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "patrón de llave inválido: %s"
 
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "patrón de llave inválido: %s"
 

-#: builtin/config.c:343
+#: builtin/config.c:344

 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "falló al formatear el valor por defecto de configuración: %s"
 
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "falló al formatear el valor por defecto de configuración: %s"
 

-#: builtin/config.c:400
+#: builtin/config.c:401

 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "no se analizar color '%s'"
 
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "no se analizar color '%s'"
 

-#: builtin/config.c:442
+#: builtin/config.c:443

 msgid "unable to parse default color value"
 msgstr "no es posible analizar el valor por defecto de color"
 
 msgid "unable to parse default color value"
 msgstr "no es posible analizar el valor por defecto de color"
 

-#: builtin/config.c:495 builtin/config.c:741
+#: builtin/config.c:496 builtin/config.c:742

 msgid "not in a git directory"
 msgstr "no en un directorio git"
 
 msgid "not in a git directory"
 msgstr "no en un directorio git"
 

-#: builtin/config.c:498
+#: builtin/config.c:499

 msgid "writing to stdin is not supported"
 msgstr "escribir en stdin no está soportado"
 
 msgid "writing to stdin is not supported"
 msgstr "escribir en stdin no está soportado"
 

-#: builtin/config.c:501
+#: builtin/config.c:502

 msgid "writing config blobs is not supported"
 msgstr "escribir blobs de configuración no está soportado"
 
 msgid "writing config blobs is not supported"
 msgstr "escribir blobs de configuración no está soportado"
 

-#: builtin/config.c:586
+#: builtin/config.c:587

 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"


@@ -10362,23 +11030,23 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
 "#\tname = %s\n"
 "#\temail = %s\n"
 

-#: builtin/config.c:610
+#: builtin/config.c:611

 msgid "only one config file at a time"
 msgstr "solo un archivo de configuración a la vez"
 
 msgid "only one config file at a time"
 msgstr "solo un archivo de configuración a la vez"
 

-#: builtin/config.c:615
+#: builtin/config.c:616

 msgid "--local can only be used inside a git repository"
 msgstr "--local solo puedo ser usado dentro de un repositorio"
 
 msgid "--local can only be used inside a git repository"
 msgstr "--local solo puedo ser usado dentro de un repositorio"
 

-#: builtin/config.c:618
+#: builtin/config.c:619

 msgid "--blob can only be used inside a git repository"
 msgstr "--blob solo puede ser usado dentro de un repositorio"
 
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob solo puede ser usado dentro de un repositorio"
 

-#: builtin/config.c:637
+#: builtin/config.c:638

 msgid "$HOME not set"
 msgstr "$HOME no está configurado"
 
 msgid "$HOME not set"
 msgstr "$HOME no está configurado"
 

-#: builtin/config.c:657
+#: builtin/config.c:658

 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"


@@ -10390,52 +11058,52 @@ msgstr ""
 "\"\n"
 "en \"git help worktree\" para más detalles"
 
 "\"\n"
 "en \"git help worktree\" para más detalles"
 

-#: builtin/config.c:687
+#: builtin/config.c:688

 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color y tipo de variable incoherente"
 
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color y tipo de variable incoherente"
 

-#: builtin/config.c:692
+#: builtin/config.c:693

 msgid "only one action at a time"
 msgstr "solo una acción a la vez"
 
 msgid "only one action at a time"
 msgstr "solo una acción a la vez"
 

-#: builtin/config.c:705
+#: builtin/config.c:706

 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only solo es aplicable para --list o --get-regexp"
 
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only solo es aplicable para --list o --get-regexp"
 

-#: builtin/config.c:711
+#: builtin/config.c:712

 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list"
 
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list"
 

-#: builtin/config.c:717
+#: builtin/config.c:718

 msgid "--default is only applicable to --get"
 msgstr "--default solo es aplicable para --get"
 
 msgid "--default is only applicable to --get"
 msgstr "--default solo es aplicable para --get"
 

-#: builtin/config.c:730
+#: builtin/config.c:731

 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "no se puede leer el archivo de configuración '%s'"
 
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "no se puede leer el archivo de configuración '%s'"
 

-#: builtin/config.c:733
+#: builtin/config.c:734

 msgid "error processing config file(s)"
 msgstr "error al procesar archivo(s) de configuración"
 
 msgid "error processing config file(s)"
 msgstr "error al procesar archivo(s) de configuración"
 

-#: builtin/config.c:743
+#: builtin/config.c:744

 msgid "editing stdin is not supported"
 msgstr "editar stdin no está soportado"
 
 msgid "editing stdin is not supported"
 msgstr "editar stdin no está soportado"
 

-#: builtin/config.c:745
+#: builtin/config.c:746

 msgid "editing blobs is not supported"
 msgstr "editar blobs no está soportado"
 
 msgid "editing blobs is not supported"
 msgstr "editar blobs no está soportado"
 

-#: builtin/config.c:759
+#: builtin/config.c:760

 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no se puede crear el archivo de configuración %s"
 
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no se puede crear el archivo de configuración %s"
 

-#: builtin/config.c:772
+#: builtin/config.c:773

 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"


@@ -10444,7 +11112,7 @@ msgstr ""
 "no se puede sobrescribir múltiples valores con un único valor\n"
 "\tUse una regexp, --add o --replace-all para cambiar %s."
 
 "no se puede sobrescribir múltiples valores con un único valor\n"
 "\tUse una regexp, --add o --replace-all para cambiar %s."
 

-#: builtin/config.c:846 builtin/config.c:857
+#: builtin/config.c:847 builtin/config.c:858

 #, c-format
 msgid "no such section: %s"
 msgstr "no existe la sección: %s"
 #, c-format
 msgid "no such section: %s"
 msgstr "no existe la sección: %s"


@@ -10457,57 +11125,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"
 
 msgid "print sizes in human readable format"
 msgstr "mostrar tamaños en formato legible para humano"
 

-#: builtin/describe.c:26
+#: builtin/describe.c:27

 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opciones>] [<commit-ish>...]"
 
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opciones>] [<commit-ish>...]"
 

-#: builtin/describe.c:27
+#: builtin/describe.c:28

 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opciones>] --dirty"
 
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opciones>] --dirty"
 

-#: builtin/describe.c:62
+#: builtin/describe.c:63

 msgid "head"
 msgstr "head"
 
 msgid "head"
 msgstr "head"
 

-#: builtin/describe.c:62
+#: builtin/describe.c:63

 msgid "lightweight"
 msgstr "ligero"
 
 msgid "lightweight"
 msgstr "ligero"
 

-#: builtin/describe.c:62
+#: builtin/describe.c:63

 msgid "annotated"
 msgstr "anotado"
 
 msgid "annotated"
 msgstr "anotado"
 

-#: builtin/describe.c:272
+#: builtin/describe.c:273

 #, c-format
 msgid "annotated tag %s not available"
 msgstr "tag anotado %s no disponible"
 
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "tag anotado %s no disponible"
 

-#: builtin/describe.c:276
+#: builtin/describe.c:277

 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "tag anotado %s no tiene nombre embebido"
 
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "tag anotado %s no tiene nombre embebido"
 

-#: builtin/describe.c:278
+#: builtin/describe.c:279

 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "tag '%s' es realmente '%s' aquí"
 
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "tag '%s' es realmente '%s' aquí"
 

-#: builtin/describe.c:322
+#: builtin/describe.c:323

 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "no hay tag que concuerde exactamente con '%s'"
 
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "no hay tag que concuerde exactamente con '%s'"
 

-#: builtin/describe.c:324
+#: builtin/describe.c:325

 #, c-format
 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"
 
 #, c-format
 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:378
+#: builtin/describe.c:379

 #, c-format
 msgid "finished search at %s\n"
 msgstr "búsqueda finalizada a las %s\n"
 
 #, c-format
 msgid "finished search at %s\n"
 msgstr "búsqueda finalizada a las %s\n"
 

-#: builtin/describe.c:404
+#: builtin/describe.c:405

 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"


@@ -10516,7 +11184,7 @@ msgstr ""
 "No hay tags anotados que puedan describir '%s'.\n"
 "Sin embargo, hubieron tags no anotados: intente --tags."
 
 "No hay tags anotados que puedan describir '%s'.\n"
 "Sin embargo, hubieron tags no anotados: intente --tags."
 

-#: builtin/describe.c:408
+#: builtin/describe.c:409

 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"


@@ -10525,12 +11193,12 @@ msgstr ""
 "Ningún tag puede describit '%s'.\n"
 "Intente --always, o cree algunos tags."
 
 "Ningún tag puede describit '%s'.\n"
 "Intente --always, o cree algunos tags."
 

-#: builtin/describe.c:438
+#: builtin/describe.c:439

 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits cruzados\n"
 
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits cruzados\n"
 

-#: builtin/describe.c:441
+#: builtin/describe.c:442

 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"


@@ -10539,147 +11207,147 @@ msgstr ""
 "se encontró más de %i tags; se mostró %i más reciente\n"
 "fin de la búsqueda en %s\n"
 
 "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:509
+#: builtin/describe.c:510

 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 
 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 

-#: builtin/describe.c:512 builtin/log.c:513
+#: builtin/describe.c:513 builtin/log.c:516

 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Nombre de objeto %s no válido"
 
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Nombre de objeto %s no válido"
 

-#: builtin/describe.c:520
+#: builtin/describe.c:521

 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no es un commit ni un blob"
 
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no es un commit ni un blob"
 

-#: builtin/describe.c:534
+#: builtin/describe.c:535

 msgid "find the tag that comes after the commit"
 msgstr "encontrar el tag que viene después del commit"
 
 msgid "find the tag that comes after the commit"
 msgstr "encontrar el tag que viene después del commit"
 

-#: builtin/describe.c:535
+#: builtin/describe.c:536

 msgid "debug search strategy on stderr"
 msgstr "hacer debug a la estrategia de búsqueda en stderr"
 
 msgid "debug search strategy on stderr"
 msgstr "hacer debug a la estrategia de búsqueda en stderr"
 

-#: builtin/describe.c:536
+#: builtin/describe.c:537

 msgid "use any ref"
 msgstr "use cualquier ref"
 
 msgid "use any ref"
 msgstr "use cualquier ref"
 

-#: builtin/describe.c:537
+#: builtin/describe.c:538

 msgid "use any tag, even unannotated"
 msgstr "use cualquier tag, incluso los no anotados"
 
 msgid "use any tag, even unannotated"
 msgstr "use cualquier tag, incluso los no anotados"
 

-#: builtin/describe.c:538
+#: builtin/describe.c:539

 msgid "always use long format"
 msgstr "siempre usar formato largo"
 
 msgid "always use long format"
 msgstr "siempre usar formato largo"
 

-#: builtin/describe.c:539
+#: builtin/describe.c:540

 msgid "only follow first parent"
 msgstr "solo seguir el primer patrón"
 
 msgid "only follow first parent"
 msgstr "solo seguir el primer patrón"
 

-#: builtin/describe.c:542
+#: builtin/describe.c:543

 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 
 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 

-#: builtin/describe.c:544
+#: builtin/describe.c:545

 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considerar <n> tags más recientes (default:10)"
 
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considerar <n> tags más recientes (default:10)"
 

-#: builtin/describe.c:546
+#: builtin/describe.c:547

 msgid "only consider tags matching <pattern>"
 msgstr "solo considerar tags que concuerden con <patrón>"
 
 msgid "only consider tags matching <pattern>"
 msgstr "solo considerar tags que concuerden con <patrón>"
 

-#: builtin/describe.c:548
+#: builtin/describe.c:549

 msgid "do not consider tags matching <pattern>"
 msgstr "no considerar tags que concuerden con <patrón>"
 
 msgid "do not consider tags matching <pattern>"
 msgstr "no considerar tags que concuerden con <patrón>"
 

-#: builtin/describe.c:550 builtin/name-rev.c:424
+#: builtin/describe.c:551 builtin/name-rev.c:424

 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar el objeto commit abreviado como fallback"
 
 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar el objeto commit abreviado como fallback"
 

-#: builtin/describe.c:551 builtin/describe.c:554
+#: builtin/describe.c:552 builtin/describe.c:555

 msgid "mark"
 msgstr "marca"
 
 msgid "mark"
 msgstr "marca"
 

-#: builtin/describe.c:552
+#: builtin/describe.c:553

 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
 
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
 

-#: builtin/describe.c:555
+#: builtin/describe.c:556

 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")"
 
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")"
 

-#: builtin/describe.c:573
+#: builtin/describe.c:574

 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long es incompatible con --abbrev=0"
 
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long es incompatible con --abbrev=0"
 

-#: builtin/describe.c:602
+#: builtin/describe.c:603

 msgid "No names found, cannot describe anything."
 msgstr "No se encontraron nombres, no se puede describir nada."
 
 msgid "No names found, cannot describe anything."
 msgstr "No se encontraron nombres, no se puede describir nada."
 

-#: builtin/describe.c:652
+#: builtin/describe.c:654

 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty es incompatible con commit-ismos"
 
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty es incompatible con commit-ismos"
 

-#: builtin/describe.c:654
+#: builtin/describe.c:656

 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken es incompatible con commit-ismos"
 
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken es incompatible con commit-ismos"
 

-#: builtin/diff.c:83
+#: builtin/diff.c:84

 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': no es un archivo regular o un enlace simbólico"
 
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': no es un archivo regular o un enlace simbólico"
 

-#: builtin/diff.c:234
+#: builtin/diff.c:235

 #, c-format
 msgid "invalid option: %s"
 msgstr "opción inválida: %s"
 
 #, c-format
 msgid "invalid option: %s"
 msgstr "opción inválida: %s"
 

-#: builtin/diff.c:363
+#: builtin/diff.c:364

 msgid "Not a git repository"
 msgstr "No es un repositorio git"
 
 msgid "Not a git repository"
 msgstr "No es un repositorio git"
 

-#: builtin/diff.c:407
+#: builtin/diff.c:408

 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto '%s' entregado no es válido."
 
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto '%s' entregado no es válido."
 

-#: builtin/diff.c:416
+#: builtin/diff.c:417

 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "más de dos blobs entregados: '%s'"
 
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "más de dos blobs entregados: '%s'"
 

-#: builtin/diff.c:421
+#: builtin/diff.c:422

 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objeto no manejado '%s' entregado."
 
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objeto no manejado '%s' entregado."
 

-#: builtin/difftool.c:30
+#: builtin/difftool.c:31

 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 

-#: builtin/difftool.c:260
+#: builtin/difftool.c:261

 #, c-format
 msgid "failed: %d"
 msgstr "falló: %d"
 
 #, c-format
 msgid "failed: %d"
 msgstr "falló: %d"
 

-#: builtin/difftool.c:302
+#: builtin/difftool.c:303

 #, c-format
 msgid "could not read symlink %s"
 msgstr "no se pudo leer el symlink %s"
 
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no se pudo leer el symlink %s"
 

-#: builtin/difftool.c:304
+#: builtin/difftool.c:305

 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no se pudo leer el archivo symlink %s"
 
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no se pudo leer el archivo symlink %s"
 

-#: builtin/difftool.c:312
+#: builtin/difftool.c:313

 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "no se pudo leer el objeto %s para el symlink %s"
 
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "no se pudo leer el objeto %s para el symlink %s"
 

-#: builtin/difftool.c:413
+#: builtin/difftool.c:414

 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."


@@ -10687,54 +11355,54 @@ msgstr ""
 "formatos combinados de diff ('-c' y '--cc') no soportados en\n"
 "modo diff para directorio('-d' y '--dir-diff')."
 
 "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:634

 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos archivos modificados: '%s' y '%s'."
 
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos archivos modificados: '%s' y '%s'."
 

-#: builtin/difftool.c:635
+#: builtin/difftool.c:636

 msgid "working tree file has been left."
 msgstr "archivo del árbol de trabajo ha sido dejado."
 
 msgid "working tree file has been left."
 msgstr "archivo del árbol de trabajo ha sido dejado."
 

-#: builtin/difftool.c:646
+#: builtin/difftool.c:647

 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "archivo temporal existe en '%s'."
 
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "archivo temporal existe en '%s'."
 

-#: builtin/difftool.c:647
+#: builtin/difftool.c:648

 msgid "you may want to cleanup or recover these."
 msgstr "tal vez desee limpiar o recuperar estos."
 
 msgid "you may want to cleanup or recover these."
 msgstr "tal vez desee limpiar o recuperar estos."
 

-#: builtin/difftool.c:696
+#: builtin/difftool.c:697

 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "use `diff.guitool` en lugar de `diff.tool`"
 
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "use `diff.guitool` en lugar de `diff.tool`"
 

-#: builtin/difftool.c:698
+#: builtin/difftool.c:699

 msgid "perform a full-directory diff"
 msgstr "realizar un diff de todo el directorio"
 
 msgid "perform a full-directory diff"
 msgstr "realizar un diff de todo el directorio"
 

-#: builtin/difftool.c:700
+#: builtin/difftool.c:701

 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 
 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 

-#: builtin/difftool.c:705
+#: builtin/difftool.c:706

 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbólicos en modo dir-diff"
 
 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbólicos en modo dir-diff"
 

-#: builtin/difftool.c:706
+#: builtin/difftool.c:707

 msgid "tool"
 msgstr "herramienta"
 
 msgid "tool"
 msgstr "herramienta"
 

-#: builtin/difftool.c:707
+#: builtin/difftool.c:708

 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 
 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 

-#: builtin/difftool.c:709
+#: builtin/difftool.c:710

 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`"
 
 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:712
+#: builtin/difftool.c:713

 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"


@@ -10742,15 +11410,15 @@ msgstr ""
 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
 "código de salida distinto de cero"
 
 "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:716

 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 

-#: builtin/difftool.c:739
+#: builtin/difftool.c:740

 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 

-#: builtin/difftool.c:746
+#: builtin/difftool.c:747

 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 


@@ -10758,54 +11426,63 @@ msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 

-#: builtin/fast-export.c:1006
+#: builtin/fast-export.c:1084

 msgid "show progress after <n> objects"
 msgstr "mostrar progreso después de <n> objetos"
 
 msgid "show progress after <n> objects"
 msgstr "mostrar progreso después de <n> objetos"
 

-#: builtin/fast-export.c:1008
+#: builtin/fast-export.c:1086

 msgid "select handling of signed tags"
 msgstr "seleccionar el manejo de tags firmados"
 
 msgid "select handling of signed tags"
 msgstr "seleccionar el manejo de tags firmados"
 

-#: builtin/fast-export.c:1011
+#: builtin/fast-export.c:1089

 msgid "select handling of tags that tag filtered objects"
 msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
 
 msgid "select handling of tags that tag filtered objects"
 msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
 

-#: builtin/fast-export.c:1014
+#: builtin/fast-export.c:1092

 msgid "Dump marks to this file"
 msgstr "Volcar marcas a este archivo"
 
 msgid "Dump marks to this file"
 msgstr "Volcar marcas a este archivo"
 

-#: builtin/fast-export.c:1016
+#: builtin/fast-export.c:1094

 msgid "Import marks from this file"
 msgstr "Importar marcas de este archivo"
 
 msgid "Import marks from this file"
 msgstr "Importar marcas de este archivo"
 

-#: builtin/fast-export.c:1018
+#: builtin/fast-export.c:1096

 msgid "Fake a tagger when tags lack one"
 msgstr "Falsificar un tagger cuando les falta uno"
 
 msgid "Fake a tagger when tags lack one"
 msgstr "Falsificar un tagger cuando les falta uno"
 

-#: builtin/fast-export.c:1020
+#: builtin/fast-export.c:1098

 msgid "Output full tree for each commit"
 msgstr "Mostrar todo el árbol para cada commit"
 
 msgid "Output full tree for each commit"
 msgstr "Mostrar todo el árbol para cada commit"
 

-#: builtin/fast-export.c:1022
+#: builtin/fast-export.c:1100

 msgid "Use the done feature to terminate the stream"
 msgstr "Use el feature done para terminar el stream"
 
 msgid "Use the done feature to terminate the stream"
 msgstr "Use el feature done para terminar el stream"
 

-#: builtin/fast-export.c:1023
+#: builtin/fast-export.c:1101

 msgid "Skip output of blob data"
 msgstr "Saltar el output de data blob"
 
 msgid "Skip output of blob data"
 msgstr "Saltar el output de data blob"
 

-#: builtin/fast-export.c:1024 builtin/log.c:1588
+#: builtin/fast-export.c:1102 builtin/log.c:1601

 msgid "refspec"
 msgstr "refspec"
 
 msgid "refspec"
 msgstr "refspec"
 

-#: builtin/fast-export.c:1025
+#: builtin/fast-export.c:1103

 msgid "Apply refspec to exported refs"
 msgstr "Aplicar refspec para los refs exportados"
 
 msgid "Apply refspec to exported refs"
 msgstr "Aplicar refspec para los refs exportados"
 

-#: builtin/fast-export.c:1026
+#: builtin/fast-export.c:1104

 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 

+#: builtin/fast-export.c:1106
+msgid "Reference parents which are not in fast-export stream by object id"
+msgstr ""
+"Padres de la referencia que no estan en fast-export stream por id de objeto"
+
+#: builtin/fast-export.c:1108
+msgid "Show original object ids of blobs/commits"
+msgstr "Mostrar ids de objetos originales para blobs/commits"
+

 #: builtin/fetch.c:28
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
 #: builtin/fetch.c:28
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"


@@ -10822,15 +11499,15 @@ msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 

-#: builtin/fetch.c:115 builtin/pull.c:194
+#: builtin/fetch.c:115 builtin/pull.c:195

 msgid "fetch from all remotes"
 msgstr "extraer de todos los remotos"
 
 msgid "fetch from all remotes"
 msgstr "extraer de todos los remotos"
 

-#: builtin/fetch.c:117 builtin/pull.c:197
+#: builtin/fetch.c:117 builtin/pull.c:198

 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
 
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
 

-#: builtin/fetch.c:119 builtin/pull.c:200
+#: builtin/fetch.c:119 builtin/pull.c:201

 msgid "path to upload pack on remote end"
 msgstr "ruta para cargar el paquete al final del remoto"
 
 msgid "path to upload pack on remote end"
 msgstr "ruta para cargar el paquete al final del remoto"
 


@@ -10842,7 +11519,7 @@ msgstr "forzar sobrescritura de referencia local"
 msgid "fetch from multiple remotes"
 msgstr "extraer de múltiples remotos"
 
 msgid "fetch from multiple remotes"
 msgstr "extraer de múltiples remotos"
 

-#: builtin/fetch.c:124 builtin/pull.c:204
+#: builtin/fetch.c:124 builtin/pull.c:205

 msgid "fetch all tags and associated objects"
 msgstr "extraer todos los tags y objetos asociados"
 
 msgid "fetch all tags and associated objects"
 msgstr "extraer todos los tags y objetos asociados"
 


@@ -10854,7 +11531,7 @@ msgstr "no extraer todos los tags (--no-tags)"
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos extraídos en paralelo"
 
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos extraídos en paralelo"
 

-#: builtin/fetch.c:130 builtin/pull.c:207
+#: builtin/fetch.c:130 builtin/pull.c:208

 msgid "prune remote-tracking branches no longer on remote"
 msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
 
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
 


@@ -10864,7 +11541,7 @@ msgstr ""
 "limpiar tags locales que no se encuentran en el remoto y eliminar tags "
 "cambiados"
 
 "limpiar tags locales que no se encuentran en el remoto y eliminar tags "
 "cambiados"
 

-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132
+#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133

 msgid "on-demand"
 msgstr "en demanda"
 
 msgid "on-demand"
 msgstr "en demanda"
 


@@ -10872,7 +11549,7 @@ msgstr "en demanda"
 msgid "control recursive fetching of submodules"
 msgstr "controlar extracción recursiva de submódulos"
 
 msgid "control recursive fetching of submodules"
 msgstr "controlar extracción recursiva de submódulos"
 

-#: builtin/fetch.c:138 builtin/pull.c:215
+#: builtin/fetch.c:138 builtin/pull.c:216

 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 
 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 


@@ -10880,7 +11557,7 @@ msgstr "mantener el paquete descargado"
 msgid "allow updating of HEAD ref"
 msgstr "permitir actualizar la ref HEAD"
 
 msgid "allow updating of HEAD ref"
 msgstr "permitir actualizar la ref HEAD"
 

-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218
+#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219

 msgid "deepen history of shallow clone"
 msgstr "historia profunda de un clon superficial"
 
 msgid "deepen history of shallow clone"
 msgstr "historia profunda de un clon superficial"
 


@@ -10888,7 +11565,7 @@ msgstr "historia profunda de un clon superficial"
 msgid "deepen history of shallow repository based on time"
 msgstr "historia profunda de un repositorio superficial basado en tiempo"
 
 msgid "deepen history of shallow repository based on time"
 msgstr "historia profunda de un repositorio superficial basado en tiempo"
 

-#: builtin/fetch.c:151 builtin/pull.c:221
+#: builtin/fetch.c:151 builtin/pull.c:222

 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 
 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 


@@ -10904,24 +11581,24 @@ msgstr ""
 "default para extracción recursiva de submódulos (menor prioridad que "
 "archivos de configuración)"
 
 "default para extracción recursiva de submódulos (menor prioridad que "
 "archivos de configuración)"
 

-#: builtin/fetch.c:161 builtin/pull.c:224
+#: builtin/fetch.c:161 builtin/pull.c:225

 msgid "accept refs that update .git/shallow"
 msgstr "aceptar refs que actualicen .git/shallow"
 
 msgid "accept refs that update .git/shallow"
 msgstr "aceptar refs que actualicen .git/shallow"
 

-#: builtin/fetch.c:162 builtin/pull.c:226
+#: builtin/fetch.c:162 builtin/pull.c:227

 msgid "refmap"
 msgstr "refmap"
 
 msgid "refmap"
 msgstr "refmap"
 

-#: builtin/fetch.c:163 builtin/pull.c:227
+#: builtin/fetch.c:163 builtin/pull.c:228

 msgid "specify fetch refmap"
 msgstr "especificar extracción de refmap"
 
 msgid "specify fetch refmap"
 msgstr "especificar extracción de refmap"
 

-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585

 #: builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "especifico-de-servidor"
 
 #: builtin/send-pack.c:172
 msgid "server-specific"
 msgstr "especifico-de-servidor"
 

-#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:582
+#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585

 #: builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "opción para trasmitir"
 #: builtin/send-pack.c:173
 msgid "option to transmit"
 msgstr "opción para trasmitir"


@@ -10930,81 +11607,81 @@ msgstr "opción para trasmitir"
 msgid "report that we have only objects reachable from this object"
 msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
 
 msgid "report that we have only objects reachable from this object"
 msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
 

-#: builtin/fetch.c:470
+#: builtin/fetch.c:469

 msgid "Couldn't find remote ref HEAD"
 msgstr "No se puedo encontrar ref remota HEAD"
 
 msgid "Couldn't find remote ref HEAD"
 msgstr "No se puedo encontrar ref remota HEAD"
 

-#: builtin/fetch.c:609
+#: builtin/fetch.c:608

 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "la configuración fetch.output contiene el valor inválido %s"
 
 #, 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:702
+#: builtin/fetch.c:705

 #, c-format
 msgid "object %s not found"
 msgstr "objeto %s no encontrado"
 
 #, c-format
 msgid "object %s not found"
 msgstr "objeto %s no encontrado"
 

-#: builtin/fetch.c:706
+#: builtin/fetch.c:709

 msgid "[up to date]"
 msgstr "[actualizado]"
 
 msgid "[up to date]"
 msgstr "[actualizado]"
 

-#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807
+#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801

 msgid "[rejected]"
 msgstr "[rechazado]"
 
 msgid "[rejected]"
 msgstr "[rechazado]"
 

-#: builtin/fetch.c:720
+#: builtin/fetch.c:723

 msgid "can't fetch in current branch"
 msgstr "no se puede traer en la rama actual"
 
 msgid "can't fetch in current branch"
 msgstr "no se puede traer en la rama actual"
 

-#: builtin/fetch.c:730
+#: builtin/fetch.c:733

 msgid "[tag update]"
 msgstr "[actualización de tag]"
 
 msgid "[tag update]"
 msgstr "[actualización de tag]"
 

-#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787
-#: builtin/fetch.c:802
+#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
+#: builtin/fetch.c:796

 msgid "unable to update local ref"
 msgstr "no se posible actualizar el ref local"
 
 msgid "unable to update local ref"
 msgstr "no se posible actualizar el ref local"
 

-#: builtin/fetch.c:735
+#: builtin/fetch.c:738

 msgid "would clobber existing tag"
 msgstr "podría golpear tag existente"
 
 msgid "would clobber existing tag"
 msgstr "podría golpear tag existente"
 

-#: builtin/fetch.c:757
+#: builtin/fetch.c:760

 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 

-#: builtin/fetch.c:760
+#: builtin/fetch.c:763

 msgid "[new branch]"
 msgstr "[nueva rama]"
 
 msgid "[new branch]"
 msgstr "[nueva rama]"
 

-#: builtin/fetch.c:763
+#: builtin/fetch.c:766

 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 

-#: builtin/fetch.c:802
+#: builtin/fetch.c:796

 msgid "forced update"
 msgstr "actualización forzada"
 
 msgid "forced update"
 msgstr "actualización forzada"
 

-#: builtin/fetch.c:807
+#: builtin/fetch.c:801

 msgid "non-fast-forward"
 msgstr "avance lento"
 
 msgid "non-fast-forward"
 msgstr "avance lento"
 

-#: builtin/fetch.c:853
+#: builtin/fetch.c:847

 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no envió todos los objetos necesarios\n"
 
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no envió todos los objetos necesarios\n"
 

-#: builtin/fetch.c:874
+#: builtin/fetch.c:868

 #, 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"
 
 #, 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:963 builtin/fetch.c:1085
+#: builtin/fetch.c:959 builtin/fetch.c:1081

 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 

-#: builtin/fetch.c:974
+#: builtin/fetch.c:970

 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"


@@ -11013,56 +11690,58 @@ msgstr ""
 "algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
 " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
 
 "algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
 " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
 

-#: builtin/fetch.c:1055
+#: builtin/fetch.c:1051

 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s se pondrá colgado)"
 
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s se pondrá colgado)"
 

-#: builtin/fetch.c:1056
+#: builtin/fetch.c:1052

 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s se ha colgado)"
 
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s se ha colgado)"
 

-#: builtin/fetch.c:1088
+#: builtin/fetch.c:1084

 msgid "[deleted]"
 msgstr "[eliminado]"
 
 msgid "[deleted]"
 msgstr "[eliminado]"
 

-#: builtin/fetch.c:1089 builtin/remote.c:1036
+#: builtin/fetch.c:1085 builtin/remote.c:1036

 msgid "(none)"
 msgstr "(nada)"
 
 msgid "(none)"
 msgstr "(nada)"
 

-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1108

 #, 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"
 
 #, 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:1131
+#: builtin/fetch.c:1127

 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
 
 #, 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:1134
+#: builtin/fetch.c:1130

 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opción \"%s\" es ignorada por %s\n"
 
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opción \"%s\" es ignorada por %s\n"
 

-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1434

 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 

-#: builtin/fetch.c:1435 builtin/remote.c:100
+#: builtin/fetch.c:1436 builtin/remote.c:100

 #, c-format
 msgid "Could not fetch %s"
 msgstr "No se pudo extraer %s"
 
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No se pudo extraer %s"
 

-#: builtin/fetch.c:1481 builtin/fetch.c:1649
+#: builtin/fetch.c:1482

 msgid ""
 msgid ""

-"--filter can only be used with the remote configured in core.partialClone"
+"--filter can only be used with the remote configured in extensions."
+"partialClone"

 msgstr ""
 msgstr ""

-"--filter solo puede ser usado con el remoto configurado en core.partialClone"
+"--filter solo puede ser usado con el remoto configurado en extensions."
+"partialClone"

 
 

-#: builtin/fetch.c:1504
+#: builtin/fetch.c:1506

 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."


@@ -11070,43 +11749,51 @@ 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."
 
 "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:1541
+#: builtin/fetch.c:1543

 msgid "You need to specify a tag name."
 msgstr "Tiene que especificar un nombre de tag."
 
 msgid "You need to specify a tag name."
 msgstr "Tiene que especificar un nombre de tag."
 

-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1592

 msgid "Negative depth in --deepen is not supported"
 msgstr "Profundidad negativa en --deepen no soportada"
 
 msgid "Negative depth in --deepen is not supported"
 msgstr "Profundidad negativa en --deepen no soportada"
 

-#: builtin/fetch.c:1592
+#: builtin/fetch.c:1594

 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen y --depth son mutuamente exclusivas"
 
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen y --depth son mutuamente exclusivas"
 

-#: builtin/fetch.c:1597
+#: builtin/fetch.c:1599

 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth y --unshallow no pueden ser usadas juntas"
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth y --unshallow no pueden ser usadas juntas"
 

-#: builtin/fetch.c:1599
+#: builtin/fetch.c:1601

 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow no tiene sentido en un repositorio completo"
 
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow no tiene sentido en un repositorio completo"
 

-#: builtin/fetch.c:1615
+#: builtin/fetch.c:1617

 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no toma un argumento de repositorio"
 
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no toma un argumento de repositorio"
 

-#: builtin/fetch.c:1617
+#: builtin/fetch.c:1619

 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tiene sentido con refspecs"
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tiene sentido con refspecs"
 

-#: builtin/fetch.c:1626
+#: builtin/fetch.c:1628

 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existe el remoto o grupo remoto: %s"
 
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existe el remoto o grupo remoto: %s"
 

-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1635

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
 

+#: builtin/fetch.c:1651
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter solo puede ser usado con el remoto configurado en extensions."
+"partialClone"
+

 #: builtin/fmt-merge-msg.c:18
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 #: builtin/fmt-merge-msg.c:18
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"


@@ -11193,66 +11880,249 @@ msgstr "mostrar solo refs que contienen el commit"
 msgid "print only refs which don't contain the commit"
 msgstr "mostrar solo refs que no contienen el commit"
 
 msgid "print only refs which don't contain the commit"
 msgstr "mostrar solo refs que no contienen el commit"
 

-#: builtin/fsck.c:598
+#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+msgid "unknown"
+msgstr "desconocido"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:120 builtin/fsck.c:136
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "error en %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:131
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "peligro en %s %s: %s"
+
+#: builtin/fsck.c:157 builtin/fsck.c:159
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "link roto de %7s %s"
+
+#: builtin/fsck.c:168
+msgid "wrong object type in link"
+msgstr "tipo de objeto equivocado en link"
+
+#: builtin/fsck.c:184
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"link roto de %7s %s\n"
+"              a %7s %s"
+
+#: builtin/fsck.c:253
+#, c-format
+msgid "missing %s %s"
+msgstr "faltan %s %s"
+
+#: builtin/fsck.c:279
+#, c-format
+msgid "unreachable %s %s"
+msgstr "inalcanzable %s %s"
+
+#: builtin/fsck.c:298
+#, c-format
+msgid "dangling %s %s"
+msgstr "actualizando %s %s"
+
+#: builtin/fsck.c:307
+msgid "could not create lost-found"
+msgstr "no se pudo crear lost-found"
+
+#: builtin/fsck.c:318
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no se pudo finalizar '%s'"
+
+#: builtin/fsck.c:335
+#, c-format
+msgid "Checking %s"
+msgstr "Revisando %s"
+
+#: builtin/fsck.c:353
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Verificando conectividad (%d objetos)"
+
+#: builtin/fsck.c:372
+#, c-format
+msgid "Checking %s %s"
+msgstr "Revisando %s %s"
+
+#: builtin/fsck.c:376
+msgid "broken links"
+msgstr "links rotos"
+
+#: builtin/fsck.c:385
+#, c-format
+msgid "root %s"
+msgstr "raíz %s"
+
+#: builtin/fsck.c:393
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "tag %s %s (%s) en %s"
+
+#: builtin/fsck.c:422
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: objecto corrupto o faltante"
+
+#: builtin/fsck.c:447
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: referencia inválida %s"
+
+#: builtin/fsck.c:461
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Revisando reflog %s->%s"
+
+#: builtin/fsck.c:495
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: puntero sha1 inválido %s"
+
+#: builtin/fsck.c:502
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: no es un commit"
+
+#: builtin/fsck.c:557
+msgid "notice: No default references"
+msgstr "aviso: No hay referencias por defecto"
+
+#: builtin/fsck.c:572
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objeto corrupto o no encontrado: %s"
+
+#: builtin/fsck.c:585
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: no se puede analizar objeto: %s"
+
+#: builtin/fsck.c:605
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "mal sha1 de archivo: %s"
+
+#: builtin/fsck.c:620
+msgid "Checking object directory"
+msgstr "Revisando directorio de objetos"
+
+#: builtin/fsck.c:623

 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 

-#: builtin/fsck.c:693
+#: builtin/fsck.c:638
+#, c-format
+msgid "Checking %s link"
+msgstr "Revisando link %s"
+
+#: builtin/fsck.c:643 builtin/index-pack.c:833
+#, c-format
+msgid "invalid %s"
+msgstr "%s inválido"
+
+#: builtin/fsck.c:650
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s apunta a algo extraño (%s)"
+
+#: builtin/fsck.c:656
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: HEAD desacoplado apunta a nada"
+
+#: builtin/fsck.c:660
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "aviso: %s apunta a un branch no nacido (%s)"
+
+#: builtin/fsck.c:672
+msgid "Checking cache tree"
+msgstr "Revisando el cache tree"
+
+#: builtin/fsck.c:677
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: puntero inválido sha1 en cache-tree"
+
+#: builtin/fsck.c:688
+msgid "non-tree in cache-tree"
+msgstr "non-tree en cache-tree"
+
+#: builtin/fsck.c:719

 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 

-#: builtin/fsck.c:699
+#: builtin/fsck.c:725

 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 
 msgid "show unreachable objects"
 msgstr "mostrar objetos ilegibles"
 

-#: builtin/fsck.c:700
+#: builtin/fsck.c:726

 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 
 msgid "show dangling objects"
 msgstr "mostrar objetos colgados"
 

-#: builtin/fsck.c:701
+#: builtin/fsck.c:727

 msgid "report tags"
 msgstr "reportar tags"
 
 msgid "report tags"
 msgstr "reportar tags"
 

-#: builtin/fsck.c:702
+#: builtin/fsck.c:728

 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 
 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 

-#: builtin/fsck.c:703
+#: builtin/fsck.c:729

 msgid "make index objects head nodes"
 msgstr "hacer objetos índices cabezas de nodos"
 
 msgid "make index objects head nodes"
 msgstr "hacer objetos índices cabezas de nodos"
 

-#: builtin/fsck.c:704
+#: builtin/fsck.c:730

 msgid "make reflogs head nodes (default)"
 msgstr "hacer reflogs cabeza de nodos (default)"
 
 msgid "make reflogs head nodes (default)"
 msgstr "hacer reflogs cabeza de nodos (default)"
 

-#: builtin/fsck.c:705
+#: builtin/fsck.c:731

 msgid "also consider packs and alternate objects"
 msgstr "también considerar paquetes y objetos alternos"
 
 msgid "also consider packs and alternate objects"
 msgstr "también considerar paquetes y objetos alternos"
 

-#: builtin/fsck.c:706
+#: builtin/fsck.c:732

 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 
 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 

-#: builtin/fsck.c:707
+#: builtin/fsck.c:733

 msgid "enable more strict checking"
 msgstr "habilitar revisión más estricta"
 
 msgid "enable more strict checking"
 msgstr "habilitar revisión más estricta"
 

-#: builtin/fsck.c:709
+#: builtin/fsck.c:735

 msgid "write dangling objects in .git/lost-found"
 msgstr "escribir objetos colgados en .git/lost-found"
 
 msgid "write dangling objects in .git/lost-found"
 msgstr "escribir objetos colgados en .git/lost-found"
 

-#: builtin/fsck.c:710 builtin/prune.c:110
+#: builtin/fsck.c:736 builtin/prune.c:110

 msgid "show progress"
 msgstr "mostrar progreso"
 
 msgid "show progress"
 msgstr "mostrar progreso"
 

-#: builtin/fsck.c:711
+#: builtin/fsck.c:737

 msgid "show verbose names for reachable objects"
 msgstr "mostrar nombres verboso para objetos alcanzables"
 
 msgid "show verbose names for reachable objects"
 msgstr "mostrar nombres verboso para objetos alcanzables"
 

-#: builtin/fsck.c:776
+#: builtin/fsck.c:797

 msgid "Checking objects"
 msgstr "Revisando objetos"
 
 msgid "Checking objects"
 msgstr "Revisando objetos"
 

+#: builtin/fsck.c:825
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: objeto faltante"
+
+#: builtin/fsck.c:837
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
+

 #: builtin/gc.c:34
 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 #: builtin/gc.c:34
 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"


@@ -11342,23 +12212,23 @@ msgstr ""
 "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
 "es así)"
 
 "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
 "es así)"
 

-#: builtin/gc.c:670
+#: builtin/gc.c:672

 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
 "eliminarlos."
 
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
 "eliminarlos."
 

-#: builtin/grep.c:28
+#: builtin/grep.c:29

 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 

-#: builtin/grep.c:224
+#: builtin/grep.c:225

 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 

-#: builtin/grep.c:278
+#: builtin/grep.c:279

 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "número inválido de hilos especificado (%d) para %s"
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "número inválido de hilos especificado (%d) para %s"


@@ -11367,266 +12237,266 @@ msgstr "número inválido de hilos especificado (%d) para %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
 #. variable for tweaking threads, currently
 #. grep.threads
 #.

-#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697
-#: builtin/pack-objects.c:2719
+#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697
+#: builtin/pack-objects.c:2717

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hay soporte para hilos, ignorando %s"
 
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hay soporte para hilos, ignorando %s"
 

-#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620
+#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631

 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no es posible leer el  árbol (%s)"
 
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no es posible leer el  árbol (%s)"
 

-#: builtin/grep.c:635
+#: builtin/grep.c:646

 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"
 
 #, 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:701
+#: builtin/grep.c:712

 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch `%c' espera un valor numérico"
 
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch `%c' espera un valor numérico"
 

-#: builtin/grep.c:800
+#: builtin/grep.c:811

 msgid "search in index instead of in the work tree"
 msgstr "buscar en el índice en lugar del árbol de trabajo"
 
 msgid "search in index instead of in the work tree"
 msgstr "buscar en el índice en lugar del árbol de trabajo"
 

-#: builtin/grep.c:802
+#: builtin/grep.c:813

 msgid "find in contents not managed by git"
 msgstr "encontrar en contenidos no manejados por git"
 
 msgid "find in contents not managed by git"
 msgstr "encontrar en contenidos no manejados por git"
 

-#: builtin/grep.c:804
+#: builtin/grep.c:815

 msgid "search in both tracked and untracked files"
 msgstr "buscar en archivos rastreados y no rastreados"
 
 msgid "search in both tracked and untracked files"
 msgstr "buscar en archivos rastreados y no rastreados"
 

-#: builtin/grep.c:806
+#: builtin/grep.c:817

 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar archivos especificados via '.gitignore'"
 
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar archivos especificados via '.gitignore'"
 

-#: builtin/grep.c:808
+#: builtin/grep.c:819

 msgid "recursively search in each submodule"
 msgstr "búsqueda recursiva en cada submódulo"
 
 msgid "recursively search in each submodule"
 msgstr "búsqueda recursiva en cada submódulo"
 

-#: builtin/grep.c:811
+#: builtin/grep.c:822

 msgid "show non-matching lines"
 msgstr "mostrar líneas que no concuerdan"
 
 msgid "show non-matching lines"
 msgstr "mostrar líneas que no concuerdan"
 

-#: builtin/grep.c:813
+#: builtin/grep.c:824

 msgid "case insensitive matching"
 msgstr "búsqueda insensible a mayúsculas"
 
 msgid "case insensitive matching"
 msgstr "búsqueda insensible a mayúsculas"
 

-#: builtin/grep.c:815
+#: builtin/grep.c:826

 msgid "match patterns only at word boundaries"
 msgstr "concordar patrón solo a los límites de las palabras"
 
 msgid "match patterns only at word boundaries"
 msgstr "concordar patrón solo a los límites de las palabras"
 

-#: builtin/grep.c:817
+#: builtin/grep.c:828

 msgid "process binary files as text"
 msgstr "procesar archivos binarios como texto"
 
 msgid "process binary files as text"
 msgstr "procesar archivos binarios como texto"
 

-#: builtin/grep.c:819
+#: builtin/grep.c:830

 msgid "don't match patterns in binary files"
 msgstr "no concordar patrones en archivos binarios"
 
 msgid "don't match patterns in binary files"
 msgstr "no concordar patrones en archivos binarios"
 

-#: builtin/grep.c:822
+#: builtin/grep.c:833

 msgid "process binary files with textconv filters"
 msgstr "procesar archivos binarios con filtros textconv"
 
 msgid "process binary files with textconv filters"
 msgstr "procesar archivos binarios con filtros textconv"
 

-#: builtin/grep.c:824
+#: builtin/grep.c:835

 msgid "search in subdirectories (default)"
 msgstr "buscar en subdirectorios (default)"
 
 msgid "search in subdirectories (default)"
 msgstr "buscar en subdirectorios (default)"
 

-#: builtin/grep.c:826
+#: builtin/grep.c:837

 msgid "descend at most <depth> levels"
 msgstr "descender como máximo <valor-de-profundiad>  niveles"
 
 msgid "descend at most <depth> levels"
 msgstr "descender como máximo <valor-de-profundiad>  niveles"
 

-#: builtin/grep.c:830
+#: builtin/grep.c:841

 msgid "use extended POSIX regular expressions"
 msgstr "usar expresiones regulares POSIX extendidas"
 
 msgid "use extended POSIX regular expressions"
 msgstr "usar expresiones regulares POSIX extendidas"
 

-#: builtin/grep.c:833
+#: builtin/grep.c:844

 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expresiones regulares POSIX (default)"
 
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expresiones regulares POSIX (default)"
 

-#: builtin/grep.c:836
+#: builtin/grep.c:847

 msgid "interpret patterns as fixed strings"
 msgstr "interpretar patrones como strings arreglados"
 
 msgid "interpret patterns as fixed strings"
 msgstr "interpretar patrones como strings arreglados"
 

-#: builtin/grep.c:839
+#: builtin/grep.c:850

 msgid "use Perl-compatible regular expressions"
 msgstr "usar expresiones regulares compatibles con Perl"
 
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expresiones regulares compatibles con Perl"
 

-#: builtin/grep.c:842
+#: builtin/grep.c:853

 msgid "show line numbers"
 msgstr "mostrar números de línea"
 
 msgid "show line numbers"
 msgstr "mostrar números de línea"
 

-#: builtin/grep.c:843
+#: builtin/grep.c:854

 msgid "show column number of first match"
 msgstr "mostrar el número de columna de la primer coincidencia"
 
 msgid "show column number of first match"
 msgstr "mostrar el número de columna de la primer coincidencia"
 

-#: builtin/grep.c:844
+#: builtin/grep.c:855

 msgid "don't show filenames"
 msgstr "no mostrar nombres de archivo"
 
 msgid "don't show filenames"
 msgstr "no mostrar nombres de archivo"
 

-#: builtin/grep.c:845
+#: builtin/grep.c:856

 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 
 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 

-#: builtin/grep.c:847
+#: builtin/grep.c:858

 msgid "show filenames relative to top directory"
 msgstr "mostrar nombres de archivo relativos al directorio superior"
 
 msgid "show filenames relative to top directory"
 msgstr "mostrar nombres de archivo relativos al directorio superior"
 

-#: builtin/grep.c:849
+#: builtin/grep.c:860

 msgid "show only filenames instead of matching lines"
 msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
 
 msgid "show only filenames instead of matching lines"
 msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
 

-#: builtin/grep.c:851
+#: builtin/grep.c:862

 msgid "synonym for --files-with-matches"
 msgstr "sinónimo para --files-with-matches"
 
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo para --files-with-matches"
 

-#: builtin/grep.c:854
+#: builtin/grep.c:865

 msgid "show only the names of files without match"
 msgstr "mostrar solo los nombres de archivos sin coincidencias"
 
 msgid "show only the names of files without match"
 msgstr "mostrar solo los nombres de archivos sin coincidencias"
 

-#: builtin/grep.c:856
+#: builtin/grep.c:867

 msgid "print NUL after filenames"
 msgstr "imprimir NUL después del nombre de archivo"
 
 msgid "print NUL after filenames"
 msgstr "imprimir NUL después del nombre de archivo"
 

-#: builtin/grep.c:859
+#: builtin/grep.c:870

 msgid "show only matching parts of a line"
 msgstr "mostrar solo partes que concuerdan de una línea"
 
 msgid "show only matching parts of a line"
 msgstr "mostrar solo partes que concuerdan de una línea"
 

-#: builtin/grep.c:861
+#: builtin/grep.c:872

 msgid "show the number of matches instead of matching lines"
 msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
 
 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:862
+#: builtin/grep.c:873

 msgid "highlight matches"
 msgstr "resaltar concordancias"
 
 msgid "highlight matches"
 msgstr "resaltar concordancias"
 

-#: builtin/grep.c:864
+#: builtin/grep.c:875

 msgid "print empty line between matches from different files"
 msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
 
 msgid "print empty line between matches from different files"
 msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
 

-#: builtin/grep.c:866
+#: builtin/grep.c:877

 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"
 
 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:869
+#: builtin/grep.c:880

 msgid "show <n> context lines before and after matches"
 msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
 
 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:872
+#: builtin/grep.c:883

 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> líneas de contexto antes de las concordancias"
 
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> líneas de contexto antes de las concordancias"
 

-#: builtin/grep.c:874
+#: builtin/grep.c:885

 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> líneas de context después de las concordancias"
 
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> líneas de context después de las concordancias"
 

-#: builtin/grep.c:876
+#: builtin/grep.c:887

 msgid "use <n> worker threads"
 msgstr "usar <n> hilos de trabajo"
 
 msgid "use <n> worker threads"
 msgstr "usar <n> hilos de trabajo"
 

-#: builtin/grep.c:877
+#: builtin/grep.c:888

 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 
 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 

-#: builtin/grep.c:880
+#: builtin/grep.c:891

 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"
 
 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:882
+#: builtin/grep.c:893

 msgid "show the surrounding function"
 msgstr "mostrar la función circundante"
 
 msgid "show the surrounding function"
 msgstr "mostrar la función circundante"
 

-#: builtin/grep.c:885
+#: builtin/grep.c:896

 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 
 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 

-#: builtin/grep.c:887
+#: builtin/grep.c:898

 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 
 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 

-#: builtin/grep.c:889
+#: builtin/grep.c:900

 msgid "combine patterns specified with -e"
 msgstr "combinar patrones especificados con -e"
 
 msgid "combine patterns specified with -e"
 msgstr "combinar patrones especificados con -e"
 

-#: builtin/grep.c:901
+#: builtin/grep.c:912

 msgid "indicate hit with exit status without output"
 msgstr "indicar concordancia con exit status sin output"
 
 msgid "indicate hit with exit status without output"
 msgstr "indicar concordancia con exit status sin output"
 

-#: builtin/grep.c:903
+#: builtin/grep.c:914

 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostrar solo concordancias con archivos que concuerdan todos los patrones"
 
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostrar solo concordancias con archivos que concuerdan todos los patrones"
 

-#: builtin/grep.c:905
+#: builtin/grep.c:916

 msgid "show parse tree for grep expression"
 msgstr "mostrar árbol analizado para la expresión grep"
 
 msgid "show parse tree for grep expression"
 msgstr "mostrar árbol analizado para la expresión grep"
 

-#: builtin/grep.c:909
+#: builtin/grep.c:920

 msgid "pager"
 msgstr "paginador"
 
 msgid "pager"
 msgstr "paginador"
 

-#: builtin/grep.c:909
+#: builtin/grep.c:920

 msgid "show matching files in the pager"
 msgstr "mostrar archivos concordantes en el paginador"
 
 msgid "show matching files in the pager"
 msgstr "mostrar archivos concordantes en el paginador"
 

-#: builtin/grep.c:913
+#: builtin/grep.c:924

 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
 
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
 

-#: builtin/grep.c:977
+#: builtin/grep.c:988

 msgid "no pattern given"
 msgstr "no se ha entregado patrón"
 
 msgid "no pattern given"
 msgstr "no se ha entregado patrón"
 

-#: builtin/grep.c:1013
+#: builtin/grep.c:1024

 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no se puede usar con revs"
 
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no se puede usar con revs"
 

-#: builtin/grep.c:1020
+#: builtin/grep.c:1032

 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no se posible resolver revisión: %s"
 
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no se posible resolver revisión: %s"
 

-#: builtin/grep.c:1051
+#: builtin/grep.c:1063

 msgid "invalid option combination, ignoring --threads"
 msgstr "combinación de opciones inválida, ignorando --threads"
 
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinación de opciones inválida, ignorando --threads"
 

-#: builtin/grep.c:1054 builtin/pack-objects.c:3397
+#: builtin/grep.c:1066 builtin/pack-objects.c:3400

 msgid "no threads support, ignoring --threads"
 msgstr "no se soportan hilos, ignorando --threads"
 
 msgid "no threads support, ignoring --threads"
 msgstr "no se soportan hilos, ignorando --threads"
 

-#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716
+#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "número inválido de hilos especificado (%d)"
 
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "número inválido de hilos especificado (%d)"
 

-#: builtin/grep.c:1080
+#: builtin/grep.c:1092

 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
 
 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:1103
+#: builtin/grep.c:1115

 msgid "option not supported with --recurse-submodules"
 msgstr "opción no soportada con --recurse-submodules"
 
 msgid "option not supported with --recurse-submodules"
 msgstr "opción no soportada con --recurse-submodules"
 

-#: builtin/grep.c:1109
+#: builtin/grep.c:1121

 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked no pueden ser usadas con --no-index"
 
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked no pueden ser usadas con --no-index"
 

-#: builtin/grep.c:1115
+#: builtin/grep.c:1127

 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
 
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
 

-#: builtin/grep.c:1123
+#: builtin/grep.c:1135

 msgid "both --cached and trees are given"
 msgstr "--cached y árboles han sido entregados"
 
 msgid "both --cached and trees are given"
 msgstr "--cached y árboles han sido entregados"
 

-#: builtin/hash-object.c:84
+#: builtin/hash-object.c:85

 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."


@@ -11634,38 +12504,38 @@ msgstr ""
 "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
 "[--] <archivo>..."
 
 "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
 "[--] <archivo>..."
 

-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:86

 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 

-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98

 msgid "type"
 msgstr "tipo"
 
 msgid "type"
 msgstr "tipo"
 

-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98

 msgid "object type"
 msgstr "tipo de objeto"
 
 msgid "object type"
 msgstr "tipo de objeto"
 

-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:99

 msgid "write the object into the object database"
 msgstr "escribir el objeto en la base de datos de objetos"
 
 msgid "write the object into the object database"
 msgstr "escribir el objeto en la base de datos de objetos"
 

-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101

 msgid "read the object from stdin"
 msgstr "leer el objeto de stdin"
 
 msgid "read the object from stdin"
 msgstr "leer el objeto de stdin"
 

-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103

 msgid "store file as is without filters"
 msgstr "guardar el archivo como es sin filtros"
 
 msgid "store file as is without filters"
 msgstr "guardar el archivo como es sin filtros"
 

-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104

 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "solo realizar un hash a cualquier basura random para crear un objeto "
 "corrupto para hacer debugging de Gti"
 
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "solo realizar un hash a cualquier basura random para crear un objeto "
 "corrupto para hacer debugging de Gti"
 

-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:105

 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 
 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 


@@ -11759,12 +12629,12 @@ msgstr "ningún visualizador de manual proceso la petición"
 msgid "no info viewer handled the request"
 msgstr "ningún visor de info manejo la petición"
 
 msgid "no info viewer handled the request"
 msgstr "ningún visor de info manejo la petición"
 

-#: builtin/help.c:430 builtin/help.c:441 git.c:322
+#: builtin/help.c:430 builtin/help.c:441 git.c:323

 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' tiene el alias '%s'"
 
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' tiene el alias '%s'"
 

-#: builtin/help.c:444
+#: builtin/help.c:444 git.c:347

 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "mal alias.%s string: %s"
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "mal alias.%s string: %s"


@@ -11812,7 +12682,7 @@ msgstr "leer error en input"
 msgid "used more bytes than were available"
 msgstr "se usaron más bytes de los disponibles"
 
 msgid "used more bytes than were available"
 msgstr "se usaron más bytes de los disponibles"
 

-#: builtin/index-pack.c:279 builtin/pack-objects.c:598
+#: builtin/index-pack.c:279 builtin/pack-objects.c:599

 msgid "pack too large for current definition of off_t"
 msgstr "paquete muy grande para la definición actual de off_t"
 
 msgid "pack too large for current definition of off_t"
 msgstr "paquete muy grande para la definición actual de off_t"
 


@@ -11820,7 +12690,7 @@ msgstr "paquete muy grande para la definición actual de off_t"
 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el máximo tamaño permitido"
 
 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el máximo tamaño permitido"
 

-#: builtin/index-pack.c:297
+#: builtin/index-pack.c:297 builtin/repack.c:250

 #, c-format
 msgid "unable to create '%s'"
 msgstr "no se puede crear '%s'"
 #, c-format
 msgid "unable to create '%s'"
 msgstr "no se puede crear '%s'"


@@ -11883,8 +12753,8 @@ msgstr "inconsistencia seria en inflate"
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
 
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
 

-#: builtin/index-pack.c:729 builtin/pack-objects.c:151
-#: builtin/pack-objects.c:211 builtin/pack-objects.c:305
+#: builtin/index-pack.c:729 builtin/pack-objects.c:152
+#: builtin/pack-objects.c:212 builtin/pack-objects.c:306

 #, c-format
 msgid "unable to read %s"
 msgstr "no se posible leer %s"
 #, c-format
 msgid "unable to read %s"
 msgstr "no se posible leer %s"


@@ -11908,11 +12778,6 @@ msgstr "objeto blob %s inválido"
 msgid "fsck error in packed object"
 msgstr "error de fsck en el objeto empaquetado"
 
 msgid "fsck error in packed object"
 msgstr "error de fsck en el objeto empaquetado"
 

-#: builtin/index-pack.c:833
-#, c-format
-msgid "invalid %s"
-msgstr "%s inválido"
-

 #: builtin/index-pack.c:838
 #, c-format
 msgid "Not all child objects of %s are reachable"
 #: builtin/index-pack.c:838
 #, c-format
 msgid "Not all child objects of %s are reachable"


@@ -11950,7 +12815,7 @@ msgstr "confusión más allá de la locura en parse_pack_objects()"
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 

-#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492
+#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486

 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no es posible crear hilo: %s"
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no es posible crear hilo: %s"


@@ -12015,7 +12880,7 @@ msgstr "no se puede guardar el archivo paquete"
 msgid "cannot store index file"
 msgstr "no se puede guardar el archivo índice"
 
 msgid "cannot store index file"
 msgstr "no se puede guardar el archivo índice"
 

-#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727
+#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"


@@ -12250,120 +13115,120 @@ msgstr "--trailer con --only-input no tiene sentido"
 msgid "no input file given for in-place editing"
 msgstr "no se entregó archivo de entrada para edición en lugar"
 
 msgid "no input file given for in-place editing"
 msgstr "no se entregó archivo de entrada para edición en lugar"
 

-#: builtin/log.c:54
+#: builtin/log.c:55

 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
 
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
 

-#: builtin/log.c:55
+#: builtin/log.c:56

 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 

-#: builtin/log.c:99
+#: builtin/log.c:100

 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opción --decorate inválida: %s"
 
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opción --decorate inválida: %s"
 

-#: builtin/log.c:162
+#: builtin/log.c:163

 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 
 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 

-#: builtin/log.c:163
+#: builtin/log.c:164

 msgid "show source"
 msgstr "mostrar fuente"
 
 msgid "show source"
 msgstr "mostrar fuente"
 

-#: builtin/log.c:164
+#: builtin/log.c:165

 msgid "Use mail map file"
 msgstr "Usar archivo de mapa de mail"
 
 msgid "Use mail map file"
 msgstr "Usar archivo de mapa de mail"
 

-#: builtin/log.c:166
+#: builtin/log.c:167

 msgid "only decorate refs that match <pattern>"
 msgstr "solo decorar refs que concuerden con <patrón>"
 
 msgid "only decorate refs that match <pattern>"
 msgstr "solo decorar refs que concuerden con <patrón>"
 

-#: builtin/log.c:168
+#: builtin/log.c:169

 msgid "do not decorate refs that match <pattern>"
 msgstr "no decorar refs que concuerden con <patrón>"
 
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decorar refs que concuerden con <patrón>"
 

-#: builtin/log.c:169
+#: builtin/log.c:170

 msgid "decorate options"
 msgstr "opciones de decorado"
 
 msgid "decorate options"
 msgstr "opciones de decorado"
 

-#: builtin/log.c:172
+#: builtin/log.c:173

 msgid "Process line range n,m in file, counting from 1"
 msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
 
 msgid "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:270
+#: builtin/log.c:271

 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Salida final: %d %s\n"
 
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Salida final: %d %s\n"
 

-#: builtin/log.c:522
+#: builtin/log.c:525

 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: mal archivo"
 
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: mal archivo"
 

-#: builtin/log.c:537 builtin/log.c:631
+#: builtin/log.c:540 builtin/log.c:634

 #, c-format
 msgid "Could not read object %s"
 msgstr "No se pudo leer objeto %s"
 
 #, c-format
 msgid "Could not read object %s"
 msgstr "No se pudo leer objeto %s"
 

-#: builtin/log.c:655
+#: builtin/log.c:659

 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipo desconocido: %d"
 
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipo desconocido: %d"
 

-#: builtin/log.c:776
+#: builtin/log.c:780

 msgid "format.headers without value"
 msgstr "formate.headers. sin valor"
 
 msgid "format.headers without value"
 msgstr "formate.headers. sin valor"
 

-#: builtin/log.c:877
+#: builtin/log.c:881

 msgid "name of output directory is too long"
 msgstr "nombre del directorio de salida es muy largo"
 
 msgid "name of output directory is too long"
 msgstr "nombre del directorio de salida es muy largo"
 

-#: builtin/log.c:893
+#: builtin/log.c:897

 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "No se puede abrir archivo patch %s"
 
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "No se puede abrir archivo patch %s"
 

-#: builtin/log.c:910
+#: builtin/log.c:914

 msgid "Need exactly one range."
 msgstr "Exactamente un rango necesario."
 
 msgid "Need exactly one range."
 msgstr "Exactamente un rango necesario."
 

-#: builtin/log.c:920
+#: builtin/log.c:924

 msgid "Not a range."
 msgstr "No es un rango."
 
 msgid "Not a range."
 msgstr "No es un rango."
 

-#: builtin/log.c:1043
+#: builtin/log.c:1047

 msgid "Cover letter needs email format"
 msgstr "Letras de portada necesita formato email"
 
 msgid "Cover letter needs email format"
 msgstr "Letras de portada necesita formato email"
 

-#: builtin/log.c:1119
+#: builtin/log.c:1132

 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "insano in-reply-to: %s"
 
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "insano in-reply-to: %s"
 

-#: builtin/log.c:1146
+#: builtin/log.c:1159

 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
 
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
 

-#: builtin/log.c:1204
+#: builtin/log.c:1217

 msgid "Two output directories?"
 msgstr "Dos directorios de salida?"
 
 msgid "Two output directories?"
 msgstr "Dos directorios de salida?"
 

-#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
+#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082

 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit desconocido %s"
 
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit desconocido %s"
 

-#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526
+#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526

 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Falló al resolver '%s' como una ref válida."
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Falló al resolver '%s' como una ref válida."
 

-#: builtin/log.c:1326
+#: builtin/log.c:1339

 msgid "Could not find exact merge base."
 msgstr "No se pudo encontrar una base de fusión."
 
 msgid "Could not find exact merge base."
 msgstr "No se pudo encontrar una base de fusión."
 

-#: builtin/log.c:1330
+#: builtin/log.c:1343

 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"
 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"


@@ -12375,280 +13240,280 @@ msgstr ""
 "O puede especificar un commit base mediante --base=<id-commit-base> "
 "manualmente."
 
 "O puede especificar un commit base mediante --base=<id-commit-base> "
 "manualmente."
 

-#: builtin/log.c:1350
+#: builtin/log.c:1363

 msgid "Failed to find exact merge base"
 msgstr "Falló al encontrar una base de fusión exacta"
 
 msgid "Failed to find exact merge base"
 msgstr "Falló al encontrar una base de fusión exacta"
 

-#: builtin/log.c:1361
+#: builtin/log.c:1374

 msgid "base commit should be the ancestor of revision list"
 msgstr "el commit base debe ser el ancestro de la lista de revisión"
 
 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:1365
+#: builtin/log.c:1378

 msgid "base commit shouldn't be in revision list"
 msgstr "el commit base no debe estar en la lista de revisión"
 
 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:1418
+#: builtin/log.c:1431

 msgid "cannot get patch id"
 msgstr "no se puede obtener id de patch"
 
 msgid "cannot get patch id"
 msgstr "no se puede obtener id de patch"
 

-#: builtin/log.c:1470
+#: builtin/log.c:1483

 msgid "failed to infer range-diff ranges"
 msgstr "falló al inferir rangos range-diff"
 
 msgid "failed to infer range-diff ranges"
 msgstr "falló al inferir rangos range-diff"
 

-#: builtin/log.c:1515
+#: builtin/log.c:1528

 msgid "use [PATCH n/m] even with a single patch"
 msgstr "use [PATCH n/m] incluso con un único parche"
 
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "use [PATCH n/m] incluso con un único parche"
 

-#: builtin/log.c:1518
+#: builtin/log.c:1531

 msgid "use [PATCH] even with multiple patches"
 msgstr "use [PATCH] incluso con múltiples parches"
 
 msgid "use [PATCH] even with multiple patches"
 msgstr "use [PATCH] incluso con múltiples parches"
 

-#: builtin/log.c:1522
+#: builtin/log.c:1535

 msgid "print patches to standard out"
 msgstr "mostrar parches en standard out"
 
 msgid "print patches to standard out"
 msgstr "mostrar parches en standard out"
 

-#: builtin/log.c:1524
+#: builtin/log.c:1537

 msgid "generate a cover letter"
 msgstr "generar letra de cover"
 
 msgid "generate a cover letter"
 msgstr "generar letra de cover"
 

-#: builtin/log.c:1526
+#: builtin/log.c:1539

 msgid "use simple number sequence for output file names"
 msgstr ""
 "usar una secuencia simple de números para salida de nombres de archivos"
 
 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:1527
+#: builtin/log.c:1540

 msgid "sfx"
 msgstr "sfx"
 
 msgid "sfx"
 msgstr "sfx"
 

-#: builtin/log.c:1528
+#: builtin/log.c:1541

 msgid "use <sfx> instead of '.patch'"
 msgstr "use <sfx> en lugar de '.patch'"
 
 msgid "use <sfx> instead of '.patch'"
 msgstr "use <sfx> en lugar de '.patch'"
 

-#: builtin/log.c:1530
+#: builtin/log.c:1543

 msgid "start numbering patches at <n> instead of 1"
 msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
 
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
 

-#: builtin/log.c:1532
+#: builtin/log.c:1545

 msgid "mark the series as Nth re-roll"
 msgstr "marcar las series como Nth re-roll"
 
 msgid "mark the series as Nth re-roll"
 msgstr "marcar las series como Nth re-roll"
 

-#: builtin/log.c:1534
+#: builtin/log.c:1547

 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Use [RFC PATCH] en lugar de [PATCH]"
 
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Use [RFC PATCH] en lugar de [PATCH]"
 

-#: builtin/log.c:1537
+#: builtin/log.c:1550

 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Use [<prefijo>] en lugar de [PATCH]"
 
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Use [<prefijo>] en lugar de [PATCH]"
 

-#: builtin/log.c:1540
+#: builtin/log.c:1553

 msgid "store resulting files in <dir>"
 msgstr "guardar archivos resultantes en <dir>"
 
 msgid "store resulting files in <dir>"
 msgstr "guardar archivos resultantes en <dir>"
 

-#: builtin/log.c:1543
+#: builtin/log.c:1556

 msgid "don't strip/add [PATCH]"
 msgstr "no cortar/agregar [PATCH]"
 
 msgid "don't strip/add [PATCH]"
 msgstr "no cortar/agregar [PATCH]"
 

-#: builtin/log.c:1546
+#: builtin/log.c:1559

 msgid "don't output binary diffs"
 msgstr "no mostrar diffs binarios"
 
 msgid "don't output binary diffs"
 msgstr "no mostrar diffs binarios"
 

-#: builtin/log.c:1548
+#: builtin/log.c:1561

 msgid "output all-zero hash in From header"
 msgstr "salida como hash de todos-ceros en la cabecera From"
 
 msgid "output all-zero hash in From header"
 msgstr "salida como hash de todos-ceros en la cabecera From"
 

-#: builtin/log.c:1550
+#: builtin/log.c:1563

 msgid "don't include a patch matching a commit upstream"
 msgstr "no incluya un parche que coincida con un commit en upstream"
 
 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:1552
+#: builtin/log.c:1565

 msgid "show patch format instead of default (patch + stat)"
 msgstr "mostrar formato de parche en lugar del default (parche + stat)"
 
 msgid "show patch format instead of default (patch + stat)"
 msgstr "mostrar formato de parche en lugar del default (parche + stat)"
 

-#: builtin/log.c:1554
+#: builtin/log.c:1567

 msgid "Messaging"
 msgstr "Mensajeando"
 
 msgid "Messaging"
 msgstr "Mensajeando"
 

-#: builtin/log.c:1555
+#: builtin/log.c:1568

 msgid "header"
 msgstr "cabezal"
 
 msgid "header"
 msgstr "cabezal"
 

-#: builtin/log.c:1556
+#: builtin/log.c:1569

 msgid "add email header"
 msgstr "agregar cabecera email"
 
 msgid "add email header"
 msgstr "agregar cabecera email"
 

-#: builtin/log.c:1557 builtin/log.c:1559
+#: builtin/log.c:1570 builtin/log.c:1572

 msgid "email"
 msgstr "email"
 
 msgid "email"
 msgstr "email"
 

-#: builtin/log.c:1557
+#: builtin/log.c:1570

 msgid "add To: header"
 msgstr "agregar cabecera To:"
 
 msgid "add To: header"
 msgstr "agregar cabecera To:"
 

-#: builtin/log.c:1559
+#: builtin/log.c:1572

 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 
 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 

-#: builtin/log.c:1561
+#: builtin/log.c:1574

 msgid "ident"
 msgstr "ident"
 
 msgid "ident"
 msgstr "ident"
 

-#: builtin/log.c:1562
+#: builtin/log.c:1575

 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)"
 
 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:1564
+#: builtin/log.c:1577

 msgid "message-id"
 msgstr "id de mensaje"
 
 msgid "message-id"
 msgstr "id de mensaje"
 

-#: builtin/log.c:1565
+#: builtin/log.c:1578

 msgid "make first mail a reply to <message-id>"
 msgstr "hacer primer mail una respuesta a <id de mensaje>"
 
 msgid "make first mail a reply to <message-id>"
 msgstr "hacer primer mail una respuesta a <id de mensaje>"
 

-#: builtin/log.c:1566 builtin/log.c:1569
+#: builtin/log.c:1579 builtin/log.c:1582

 msgid "boundary"
 msgstr "límite"
 
 msgid "boundary"
 msgstr "límite"
 

-#: builtin/log.c:1567
+#: builtin/log.c:1580

 msgid "attach the patch"
 msgstr "adjuntar el parche"
 
 msgid "attach the patch"
 msgstr "adjuntar el parche"
 

-#: builtin/log.c:1570
+#: builtin/log.c:1583

 msgid "inline the patch"
 msgstr "poner el parche en línea"
 
 msgid "inline the patch"
 msgstr "poner el parche en línea"
 

-#: builtin/log.c:1574
+#: builtin/log.c:1587

 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
 
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
 

-#: builtin/log.c:1576
+#: builtin/log.c:1589

 msgid "signature"
 msgstr "firma"
 
 msgid "signature"
 msgstr "firma"
 

-#: builtin/log.c:1577
+#: builtin/log.c:1590

 msgid "add a signature"
 msgstr "agregar una firma"
 
 msgid "add a signature"
 msgstr "agregar una firma"
 

-#: builtin/log.c:1578
+#: builtin/log.c:1591

 msgid "base-commit"
 msgstr "commit-base"
 
 msgid "base-commit"
 msgstr "commit-base"
 

-#: builtin/log.c:1579
+#: builtin/log.c:1592

 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 "agregar información de árbol de requisitos previos a la serie de parches"
 
 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:1581
+#: builtin/log.c:1594

 msgid "add a signature from a file"
 msgstr "agregar una firma de un archivo"
 
 msgid "add a signature from a file"
 msgstr "agregar una firma de un archivo"
 

-#: builtin/log.c:1582
+#: builtin/log.c:1595

 msgid "don't print the patch filenames"
 msgstr "no mostrar los nombres de archivos de los parches"
 
 msgid "don't print the patch filenames"
 msgstr "no mostrar los nombres de archivos de los parches"
 

-#: builtin/log.c:1584
+#: builtin/log.c:1597

 msgid "show progress while generating patches"
 msgstr "mostrar medidor de progreso mientras se generan los parches"
 
 msgid "show progress while generating patches"
 msgstr "mostrar medidor de progreso mientras se generan los parches"
 

-#: builtin/log.c:1585
+#: builtin/log.c:1598

 msgid "rev"
 msgstr "rev"
 
 msgid "rev"
 msgstr "rev"
 

-#: builtin/log.c:1586
+#: builtin/log.c:1599

 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
 
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
 

-#: builtin/log.c:1589
+#: builtin/log.c:1602

 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
 
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
 

-#: builtin/log.c:1591
+#: builtin/log.c:1604

 msgid "percentage by which creation is weighted"
 msgstr "porcentaje por el cual la creación es pesada"
 
 msgid "percentage by which creation is weighted"
 msgstr "porcentaje por el cual la creación es pesada"
 

-#: builtin/log.c:1666
+#: builtin/log.c:1679

 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línea de identificación inválida: %s"
 
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línea de identificación inválida: %s"
 

-#: builtin/log.c:1681
+#: builtin/log.c:1694

 msgid "-n and -k are mutually exclusive"
 msgstr "-n y -k son mutuamente exclusivas"
 
 msgid "-n and -k are mutually exclusive"
 msgstr "-n y -k son mutuamente exclusivas"
 

-#: builtin/log.c:1683
+#: builtin/log.c:1696

 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
 
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
 

-#: builtin/log.c:1691
+#: builtin/log.c:1704

 msgid "--name-only does not make sense"
 msgstr "--name-only no tiene sentido"
 
 msgid "--name-only does not make sense"
 msgstr "--name-only no tiene sentido"
 

-#: builtin/log.c:1693
+#: builtin/log.c:1706

 msgid "--name-status does not make sense"
 msgstr "--name-status no tiene sentido"
 
 msgid "--name-status does not make sense"
 msgstr "--name-status no tiene sentido"
 

-#: builtin/log.c:1695
+#: builtin/log.c:1708

 msgid "--check does not make sense"
 msgstr "--check no tiene sentido"
 
 msgid "--check does not make sense"
 msgstr "--check no tiene sentido"
 

-#: builtin/log.c:1727
+#: builtin/log.c:1740

 msgid "standard output, or directory, which one?"
 msgstr "salida standard, o directorio, cual?"
 
 msgid "standard output, or directory, which one?"
 msgstr "salida standard, o directorio, cual?"
 

-#: builtin/log.c:1729
+#: builtin/log.c:1742

 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "No se pudo crear el directorio '%s'"
 
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "No se pudo crear el directorio '%s'"
 

-#: builtin/log.c:1816
+#: builtin/log.c:1829

 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiere --cover-letter o un parche único"
 
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiere --cover-letter o un parche único"
 

-#: builtin/log.c:1820
+#: builtin/log.c:1833

 msgid "Interdiff:"
 msgstr "Interdiff:"
 
 msgid "Interdiff:"
 msgstr "Interdiff:"
 

-#: builtin/log.c:1821
+#: builtin/log.c:1834

 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 

-#: builtin/log.c:1827
+#: builtin/log.c:1840

 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor requiere --range-diff"
 
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor requiere --range-diff"
 

-#: builtin/log.c:1831
+#: builtin/log.c:1844

 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiere --cover-letter o parche único"
 
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiere --cover-letter o parche único"
 

-#: builtin/log.c:1839
+#: builtin/log.c:1852

 msgid "Range-diff:"
 msgstr "Range-diff:"
 
 msgid "Range-diff:"
 msgstr "Range-diff:"
 

-#: builtin/log.c:1840
+#: builtin/log.c:1853

 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff contra v%d:"
 
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff contra v%d:"
 

-#: builtin/log.c:1851
+#: builtin/log.c:1864

 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no se puede leer la firma del archivo '%s'"
 
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no se puede leer la firma del archivo '%s'"
 

-#: builtin/log.c:1887
+#: builtin/log.c:1900

 msgid "Generating patches"
 msgstr "Generando parches"
 
 msgid "Generating patches"
 msgstr "Generando parches"
 

-#: builtin/log.c:1931
+#: builtin/log.c:1944

 msgid "Failed to create output files"
 msgstr "Falló al crear los archivos de salida"
 
 msgid "Failed to create output files"
 msgstr "Falló al crear los archivos de salida"
 

-#: builtin/log.c:1989
+#: builtin/log.c:2003

 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
 
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
 

-#: builtin/log.c:2043
+#: builtin/log.c:2057

 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"


@@ -12656,111 +13521,111 @@ msgstr ""
 "No se pudo encontrar una rama remota rastreada, por favor especifique "
 "<upstream> manualmente.\n"
 
 "No se pudo encontrar una rama remota rastreada, por favor especifique "
 "<upstream> manualmente.\n"
 

-#: builtin/ls-files.c:469
+#: builtin/ls-files.c:470

 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opciones>] [<archivo>...]"
 
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opciones>] [<archivo>...]"
 

-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:526

 msgid "identify the file status with tags"
 msgstr "identifique el estado del archivo con tags"
 
 msgid "identify the file status with tags"
 msgstr "identifique el estado del archivo con tags"
 

-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:528

 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
 
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
 

-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:530

 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
 
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
 

-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:532

 msgid "show cached files in the output (default)"
 msgstr "mostrar archivos en caché en la salida (default)"
 
 msgid "show cached files in the output (default)"
 msgstr "mostrar archivos en caché en la salida (default)"
 

-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:534

 msgid "show deleted files in the output"
 msgstr "mostrar archivos borrados en la salida"
 
 msgid "show deleted files in the output"
 msgstr "mostrar archivos borrados en la salida"
 

-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:536

 msgid "show modified files in the output"
 msgstr "mostrar archivos modificados en la salida"
 
 msgid "show modified files in the output"
 msgstr "mostrar archivos modificados en la salida"
 

-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:538

 msgid "show other files in the output"
 msgstr "mostrar otros archivos en la salida"
 
 msgid "show other files in the output"
 msgstr "mostrar otros archivos en la salida"
 

-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:540

 msgid "show ignored files in the output"
 msgstr "mostrar archivos ignorados en la salida"
 
 msgid "show ignored files in the output"
 msgstr "mostrar archivos ignorados en la salida"
 

-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:543

 msgid "show staged contents' object name in the output"
 msgstr ""
 "mostrar contenido de nombres de objetos en el área de stage en la salida"
 
 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:544
+#: builtin/ls-files.c:545

 msgid "show files on the filesystem that need to be removed"
 msgstr "mostrar archivos en el filesystem que necesitan ser borrados"
 
 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:546
+#: builtin/ls-files.c:547

 msgid "show 'other' directories' names only"
 msgstr "mostrar solo nombres de 'directorios otros'"
 
 msgid "show 'other' directories' names only"
 msgstr "mostrar solo nombres de 'directorios otros'"
 

-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:549

 msgid "show line endings of files"
 msgstr "mostrar finales de línea de archivos"
 
 msgid "show line endings of files"
 msgstr "mostrar finales de línea de archivos"
 

-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:551

 msgid "don't show empty directories"
 msgstr "no mostrar directorios vacíos"
 
 msgid "don't show empty directories"
 msgstr "no mostrar directorios vacíos"
 

-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:554

 msgid "show unmerged files in the output"
 msgstr "mostrar archivos no fusionados en la salida"
 
 msgid "show unmerged files in the output"
 msgstr "mostrar archivos no fusionados en la salida"
 

-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:556

 msgid "show resolve-undo information"
 msgstr "mostrar información resolver-deshacer"
 
 msgid "show resolve-undo information"
 msgstr "mostrar información resolver-deshacer"
 

-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:558

 msgid "skip files matching pattern"
 msgstr "saltar archivos que concuerden con el patrón"
 
 msgid "skip files matching pattern"
 msgstr "saltar archivos que concuerden con el patrón"
 

-#: builtin/ls-files.c:560
+#: builtin/ls-files.c:561

 msgid "exclude patterns are read from <file>"
 msgstr "excluir patrones leídos de <archivo>"
 
 msgid "exclude patterns are read from <file>"
 msgstr "excluir patrones leídos de <archivo>"
 

-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564

 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "leer patrones de exclusión de manera adicional por directorio en <archivo>"
 
 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:565
+#: builtin/ls-files.c:566

 msgid "add the standard git exclusions"
 msgstr "agregar las exclusiones standard de git"
 
 msgid "add the standard git exclusions"
 msgstr "agregar las exclusiones standard de git"
 

-#: builtin/ls-files.c:569
+#: builtin/ls-files.c:570

 msgid "make the output relative to the project top directory"
 msgstr "hacer la salida relativa al directorio principal del proyecto"
 
 msgid "make the output relative to the project top directory"
 msgstr "hacer la salida relativa al directorio principal del proyecto"
 

-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:573

 msgid "recurse through submodules"
 msgstr "recurrir a través de submódulos"
 
 msgid "recurse through submodules"
 msgstr "recurrir a través de submódulos"
 

-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:575

 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"
 
 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:575
+#: builtin/ls-files.c:576

 msgid "tree-ish"
 msgstr "árbol-ismo"
 
 msgid "tree-ish"
 msgstr "árbol-ismo"
 

-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577

 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"
 
 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:578
+#: builtin/ls-files.c:579

 msgid "show debugging data"
 msgstr "mostrar data de debug"
 
 msgid "show debugging data"
 msgstr "mostrar data de debug"
 


@@ -12778,7 +13643,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "no mostrar el URL remoto"
 
 msgid "do not print remote URL"
 msgstr "no mostrar el URL remoto"
 

-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111

 msgid "exec"
 msgstr "ejecutar"
 
 msgid "exec"
 msgstr "ejecutar"
 


@@ -12852,184 +13717,189 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 

-#: builtin/merge.c:52
+#: builtin/merge.c:53

 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 

-#: builtin/merge.c:53
+#: builtin/merge.c:54

 msgid "git merge --abort"
 msgstr "git merge --abort"
 
 msgid "git merge --abort"
 msgstr "git merge --abort"
 

-#: builtin/merge.c:54
+#: builtin/merge.c:55

 msgid "git merge --continue"
 msgstr "git merge --continue"
 
 msgid "git merge --continue"
 msgstr "git merge --continue"
 

-#: builtin/merge.c:111
+#: builtin/merge.c:112

 msgid "switch `m' requires a value"
 msgstr "cambiar `m' requiere un valor"
 
 msgid "switch `m' requires a value"
 msgstr "cambiar `m' requiere un valor"
 

-#: builtin/merge.c:177
+#: builtin/merge.c:132
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "opción `%s' requiere un valor"
+
+#: builtin/merge.c:178

 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
 
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
 

-#: builtin/merge.c:178
+#: builtin/merge.c:179

 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 

-#: builtin/merge.c:183
+#: builtin/merge.c:184

 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estrategias personalizadas disponibles son:"
 
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estrategias personalizadas disponibles son:"
 

-#: builtin/merge.c:234 builtin/pull.c:143
+#: builtin/merge.c:235 builtin/pull.c:144

 msgid "do not show a diffstat at the end of the merge"
 msgstr "no mostrar un diffstat al final de la fusión"
 
 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:237 builtin/pull.c:146
+#: builtin/merge.c:238 builtin/pull.c:147

 msgid "show a diffstat at the end of the merge"
 msgstr "mostrar un diffstat al final de la fusión"
 
 msgid "show a diffstat at the end of the merge"
 msgstr "mostrar un diffstat al final de la fusión"
 

-#: builtin/merge.c:238 builtin/pull.c:149
+#: builtin/merge.c:239 builtin/pull.c:150

 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 
 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 

-#: builtin/merge.c:240 builtin/pull.c:152
+#: builtin/merge.c:241 builtin/pull.c:153

 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"
 
 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:243 builtin/pull.c:158
+#: builtin/merge.c:244 builtin/pull.c:159

 msgid "create a single commit instead of doing a merge"
 msgstr "crear un commit único en lugar de hacer una fusión"
 
 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:245 builtin/pull.c:161
+#: builtin/merge.c:246 builtin/pull.c:162

 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realizar un commit si la fusión es exitosa (default)"
 
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realizar un commit si la fusión es exitosa (default)"
 

-#: builtin/merge.c:247 builtin/pull.c:164
+#: builtin/merge.c:248 builtin/pull.c:165

 msgid "edit message before committing"
 msgstr "editar mensaje antes de realizar commit"
 
 msgid "edit message before committing"
 msgstr "editar mensaje antes de realizar commit"
 

-#: builtin/merge.c:248
+#: builtin/merge.c:249

 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 
 msgid "allow fast-forward (default)"
 msgstr "permitir fast-forwars (default)"
 

-#: builtin/merge.c:250 builtin/pull.c:170
+#: builtin/merge.c:251 builtin/pull.c:171

 msgid "abort if fast-forward is not possible"
 msgstr "abortar si fast-forward no es posible"
 
 msgid "abort if fast-forward is not possible"
 msgstr "abortar si fast-forward no es posible"
 

-#: builtin/merge.c:254 builtin/pull.c:173
+#: builtin/merge.c:255 builtin/pull.c:174

 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verificar que el commit nombrado tiene una firma GPG válida"
 
 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:255 builtin/notes.c:784 builtin/pull.c:177
-#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
+#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178
+#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111

 msgid "strategy"
 msgstr "estrategia"
 
 msgid "strategy"
 msgstr "estrategia"
 

-#: builtin/merge.c:256 builtin/pull.c:178
+#: builtin/merge.c:257 builtin/pull.c:179

 msgid "merge strategy to use"
 msgstr "estrategia de fusión para usar"
 
 msgid "merge strategy to use"
 msgstr "estrategia de fusión para usar"
 

-#: builtin/merge.c:257 builtin/pull.c:181
+#: builtin/merge.c:258 builtin/pull.c:182

 msgid "option=value"
 msgstr "opción=valor"
 
 msgid "option=value"
 msgstr "opción=valor"
 

-#: builtin/merge.c:258 builtin/pull.c:182
+#: builtin/merge.c:259 builtin/pull.c:183

 msgid "option for selected merge strategy"
 msgstr "opción para la estrategia de fusión seleccionada"
 
 msgid "option for selected merge strategy"
 msgstr "opción para la estrategia de fusión seleccionada"
 

-#: builtin/merge.c:260
+#: builtin/merge.c:261

 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
 
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
 

-#: builtin/merge.c:267
+#: builtin/merge.c:268

 msgid "abort the current in-progress merge"
 msgstr "abortar la fusión en progreso actual"
 
 msgid "abort the current in-progress merge"
 msgstr "abortar la fusión en progreso actual"
 

-#: builtin/merge.c:269
+#: builtin/merge.c:270

 msgid "continue the current in-progress merge"
 msgstr "continuar la fusión en progreso actual"
 
 msgid "continue the current in-progress merge"
 msgstr "continuar la fusión en progreso actual"
 

-#: builtin/merge.c:271 builtin/pull.c:189
+#: builtin/merge.c:272 builtin/pull.c:190

 msgid "allow merging unrelated histories"
 msgstr "permitir fusionar historias no relacionadas"
 
 msgid "allow merging unrelated histories"
 msgstr "permitir fusionar historias no relacionadas"
 

-#: builtin/merge.c:277
+#: builtin/merge.c:278

 msgid "verify commit-msg hook"
 msgstr "verificar el hook commit-msg"
 
 msgid "verify commit-msg hook"
 msgstr "verificar el hook commit-msg"
 

-#: builtin/merge.c:302
+#: builtin/merge.c:303

 msgid "could not run stash."
 msgstr "no se pudo ejecutar stash."
 
 msgid "could not run stash."
 msgstr "no se pudo ejecutar stash."
 

-#: builtin/merge.c:307
+#: builtin/merge.c:308

 msgid "stash failed"
 msgstr "stash falló"
 
 msgid "stash failed"
 msgstr "stash falló"
 

-#: builtin/merge.c:312
+#: builtin/merge.c:313

 #, c-format
 msgid "not a valid object: %s"
 msgstr "no es un objeto válido: %s"
 
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no es un objeto válido: %s"
 

-#: builtin/merge.c:334 builtin/merge.c:351
+#: builtin/merge.c:335 builtin/merge.c:352

 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 

-#: builtin/merge.c:381
+#: builtin/merge.c:382

 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 
 msgid " (nothing to squash)"
 msgstr " (nada para hacer squash)"
 

-#: builtin/merge.c:392
+#: builtin/merge.c:393

 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit de squash -- no actualizando HEAD\n"
 
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit de squash -- no actualizando HEAD\n"
 

-#: builtin/merge.c:442
+#: builtin/merge.c:443

 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
 
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
 

-#: builtin/merge.c:493
+#: builtin/merge.c:494

 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' no apunta a ningún commit"
 
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' no apunta a ningún commit"
 

-#: builtin/merge.c:580
+#: builtin/merge.c:581

 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 

-#: builtin/merge.c:701
+#: builtin/merge.c:702

 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 
 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 

-#: builtin/merge.c:715
+#: builtin/merge.c:716

 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opción desconocida para merge-recursive: -X%s"
 
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opción desconocida para merge-recursive: -X%s"
 

-#: builtin/merge.c:730
+#: builtin/merge.c:731

 #, c-format
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 
 #, c-format
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 

-#: builtin/merge.c:782
+#: builtin/merge.c:783

 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No se puedo leer de '%s'"
 
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No se puedo leer de '%s'"
 

-#: builtin/merge.c:791
+#: builtin/merge.c:792

 #, 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"
 
 #, 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:797
+#: builtin/merge.c:798

 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"


@@ -13046,70 +13916,70 @@ msgstr ""
 "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
 "el commit.\n"
 
 "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
 "el commit.\n"
 

-#: builtin/merge.c:833
+#: builtin/merge.c:834

 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 

-#: builtin/merge.c:852
+#: builtin/merge.c:853

 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 

-#: builtin/merge.c:905
+#: builtin/merge.c:906

 #, 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"
 
 #, 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:944
+#: builtin/merge.c:945

 msgid "No current branch."
 msgstr "No rama actual."
 
 msgid "No current branch."
 msgstr "No rama actual."
 

-#: builtin/merge.c:946
+#: builtin/merge.c:947

 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 
 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 

-#: builtin/merge.c:948
+#: builtin/merge.c:949

 msgid "No default upstream defined for the current branch."
 msgstr "Por defecto, no hay un upstream  definido para la rama actual."
 
 msgid "No default upstream defined for the current branch."
 msgstr "Por defecto, no hay un upstream  definido para la rama actual."
 

-#: builtin/merge.c:953
+#: builtin/merge.c:954

 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hay rama de rastreo remoto para %s de %s"
 
 #, 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:1010
+#: builtin/merge.c:1011

 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor erróneo '%s' en el entorno '%s'"
 
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor erróneo '%s' en el entorno '%s'"
 

-#: builtin/merge.c:1113
+#: builtin/merge.c:1114

 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nada que podamos fusionar en %s: %s"
 
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nada que podamos fusionar en %s: %s"
 

-#: builtin/merge.c:1147
+#: builtin/merge.c:1148

 msgid "not something we can merge"
 msgstr "nada que podamos fusionar"
 
 msgid "not something we can merge"
 msgstr "nada que podamos fusionar"
 

-#: builtin/merge.c:1250
+#: builtin/merge.c:1251

 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 

-#: builtin/merge.c:1254
+#: builtin/merge.c:1255

 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
 
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
 

-#: builtin/merge.c:1266
+#: builtin/merge.c:1267

 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 

-#: builtin/merge.c:1270
+#: builtin/merge.c:1271

 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
 
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
 

-#: builtin/merge.c:1286
+#: builtin/merge.c:1287

 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."


@@ -13117,7 +13987,7 @@ msgstr ""
 "No ha concluido la fusión (existe MERGE_HEAD).\n"
 "Por favor, realice un commit con los cambios antes de fusionar."
 
 "No ha concluido la fusión (existe MERGE_HEAD).\n"
 "Por favor, realice un commit con los cambios antes de fusionar."
 

-#: builtin/merge.c:1293
+#: builtin/merge.c:1294

 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."


@@ -13125,93 +13995,93 @@ msgstr ""
 "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
 "Por favor, realice un commit con los cambios antes de fusionar."
 
 "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:1296
+#: builtin/merge.c:1297

 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
 
 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:1305
+#: builtin/merge.c:1306

 msgid "You cannot combine --squash with --no-ff."
 msgstr "No se puede combinar --squash con --no-ff."
 
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No se puede combinar --squash con --no-ff."
 

-#: builtin/merge.c:1313
+#: builtin/merge.c:1314

 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hay commit especificado y merge.defaultToUpstream no está configurado."
 
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hay commit especificado y merge.defaultToUpstream no está configurado."
 

-#: builtin/merge.c:1330
+#: builtin/merge.c:1331

 msgid "Squash commit into empty head not supported yet"
 msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
 
 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:1332
+#: builtin/merge.c:1333

 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"
 
 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:1337
+#: builtin/merge.c:1338

 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nada que podamos fusionar"
 
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nada que podamos fusionar"
 

-#: builtin/merge.c:1339
+#: builtin/merge.c:1340

 msgid "Can merge only exactly one commit into empty head"
 msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
 
 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:1421
+#: builtin/merge.c:1422

 msgid "refusing to merge unrelated histories"
 msgstr "rehusando fusionar historias no relacionadas"
 
 msgid "refusing to merge unrelated histories"
 msgstr "rehusando fusionar historias no relacionadas"
 

-#: builtin/merge.c:1430
+#: builtin/merge.c:1431

 msgid "Already up to date."
 msgstr "Ya está actualizado."
 
 msgid "Already up to date."
 msgstr "Ya está actualizado."
 

-#: builtin/merge.c:1440
+#: builtin/merge.c:1441

 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Actualizando %s..%s\n"
 
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Actualizando %s..%s\n"
 

-#: builtin/merge.c:1482
+#: builtin/merge.c:1483

 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Intentando fusión en índice realmente trivial...\n"
 
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Intentando fusión en índice realmente trivial...\n"
 

-#: builtin/merge.c:1489
+#: builtin/merge.c:1490

 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 
 #, c-format
 msgid "Nope.\n"
 msgstr "Nop.\n"
 

-#: builtin/merge.c:1514
+#: builtin/merge.c:1515

 msgid "Already up to date. Yeeah!"
 msgstr "Ya está actualizado. ¡Oh, yeaahh!"
 
 msgid "Already up to date. Yeeah!"
 msgstr "Ya está actualizado. ¡Oh, yeaahh!"
 

-#: builtin/merge.c:1520
+#: builtin/merge.c:1521

 msgid "Not possible to fast-forward, aborting."
 msgstr "No es posible hacer fast-forward, abortando."
 
 msgid "Not possible to fast-forward, aborting."
 msgstr "No es posible hacer fast-forward, abortando."
 

-#: builtin/merge.c:1543 builtin/merge.c:1622
+#: builtin/merge.c:1544 builtin/merge.c:1623

 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rebobinando el árbol a original...\n"
 
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rebobinando el árbol a original...\n"
 

-#: builtin/merge.c:1547
+#: builtin/merge.c:1548

 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Intentando estrategia de fusión %s...\n"
 
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Intentando estrategia de fusión %s...\n"
 

-#: builtin/merge.c:1613
+#: builtin/merge.c:1614

 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
 
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
 

-#: builtin/merge.c:1615
+#: builtin/merge.c:1616

 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Fusionar con estrategia %s falló.\n"
 
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Fusionar con estrategia %s falló.\n"
 

-#: builtin/merge.c:1624
+#: builtin/merge.c:1625

 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Usando el %s para preparar resolución a mano.\n"
 
 #, 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:1636
+#: builtin/merge.c:1637

 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""


@@ -13297,33 +14167,33 @@ msgstr "no advertir sobre conflictos"
 msgid "set labels for file1/orig-file/file2"
 msgstr "configurar labels para archivo1/orig-archivo/archivo2"
 
 msgid "set labels for file1/orig-file/file2"
 msgstr "configurar labels para archivo1/orig-archivo/archivo2"
 

-#: builtin/merge-recursive.c:45
+#: builtin/merge-recursive.c:46

 #, c-format
 msgid "unknown option %s"
 msgstr "opción %s desconocida"
 
 #, c-format
 msgid "unknown option %s"
 msgstr "opción %s desconocida"
 

-#: builtin/merge-recursive.c:51
+#: builtin/merge-recursive.c:52

 #, c-format
 msgid "could not parse object '%s'"
 msgstr "no se pudo analizar el objeto '%s'"
 
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "no se pudo analizar el objeto '%s'"
 

-#: builtin/merge-recursive.c:55
+#: builtin/merge-recursive.c:56

 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
 msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
 
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
 msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
 

-#: builtin/merge-recursive.c:63
+#: builtin/merge-recursive.c:64

 msgid "not handling anything other than two heads merge."
 msgstr "no manejando nada distinto a fusiones de dos heads."
 
 msgid "not handling anything other than two heads merge."
 msgstr "no manejando nada distinto a fusiones de dos heads."
 

-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72

 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "no se pudo resolver ref '%s'"
 
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "no se pudo resolver ref '%s'"
 

-#: builtin/merge-recursive.c:77
+#: builtin/merge-recursive.c:78

 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Fusionando %s con %s\n"
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "Fusionando %s con %s\n"


@@ -13336,7 +14206,7 @@ msgstr "git mktree [-z] [--missing] [--batch]"
 msgid "input is NUL terminated"
 msgstr "input es terminada con NUL"
 
 msgid "input is NUL terminated"
 msgstr "input es terminada con NUL"
 

-#: builtin/mktree.c:155 builtin/write-tree.c:25
+#: builtin/mktree.c:155 builtin/write-tree.c:26

 msgid "allow missing objects"
 msgstr "permitir objetos faltantes"
 
 msgid "allow missing objects"
 msgstr "permitir objetos faltantes"
 


@@ -13361,96 +14231,96 @@ msgstr "muchos argumentos"
 msgid "unrecognized verb: %s"
 msgstr "verbo no reconocido: %s"
 
 msgid "unrecognized verb: %s"
 msgstr "verbo no reconocido: %s"
 

-#: builtin/mv.c:17
+#: builtin/mv.c:18

 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opciones>] <fuente>... <destino>"
 
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opciones>] <fuente>... <destino>"
 

-#: builtin/mv.c:82
+#: builtin/mv.c:83

 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Directorio %s está en el índice y no hay submódulo?"
 
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Directorio %s está en el índice y no hay submódulo?"
 

-#: builtin/mv.c:84
+#: builtin/mv.c:85

 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
 "para proceder"
 
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
 "para proceder"
 

-#: builtin/mv.c:102
+#: builtin/mv.c:103

 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s está en el índice"
 
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s está en el índice"
 

-#: builtin/mv.c:124
+#: builtin/mv.c:125

 msgid "force move/rename even if target exists"
 msgstr "forzar mover/renombrar incluso si el objetivo existe"
 
 msgid "force move/rename even if target exists"
 msgstr "forzar mover/renombrar incluso si el objetivo existe"
 

-#: builtin/mv.c:126
+#: builtin/mv.c:127

 msgid "skip move/rename errors"
 msgstr "saltar errores de mover/renombrar"
 
 msgid "skip move/rename errors"
 msgstr "saltar errores de mover/renombrar"
 

-#: builtin/mv.c:168
+#: builtin/mv.c:169

 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destino '%s' no es un directorio"
 
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destino '%s' no es un directorio"
 

-#: builtin/mv.c:179
+#: builtin/mv.c:180

 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
 
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
 

-#: builtin/mv.c:183
+#: builtin/mv.c:184

 msgid "bad source"
 msgstr "mala fuente"
 
 msgid "bad source"
 msgstr "mala fuente"
 

-#: builtin/mv.c:186
+#: builtin/mv.c:187

 msgid "can not move directory into itself"
 msgstr "no se pude mover un directorio en sí mismo"
 
 msgid "can not move directory into itself"
 msgstr "no se pude mover un directorio en sí mismo"
 

-#: builtin/mv.c:189
+#: builtin/mv.c:190

 msgid "cannot move directory over file"
 msgstr "no se puede mover un directorio dentro de un archivo"
 
 msgid "cannot move directory over file"
 msgstr "no se puede mover un directorio dentro de un archivo"
 

-#: builtin/mv.c:198
+#: builtin/mv.c:199

 msgid "source directory is empty"
 msgstr "directorio de fuente está vacío"
 
 msgid "source directory is empty"
 msgstr "directorio de fuente está vacío"
 

-#: builtin/mv.c:223
+#: builtin/mv.c:224

 msgid "not under version control"
 msgstr "no se encuentra bajo control de versión"
 
 msgid "not under version control"
 msgstr "no se encuentra bajo control de versión"
 

-#: builtin/mv.c:226
+#: builtin/mv.c:227

 msgid "destination exists"
 msgstr "destino existe"
 
 msgid "destination exists"
 msgstr "destino existe"
 

-#: builtin/mv.c:234
+#: builtin/mv.c:235

 #, c-format
 msgid "overwriting '%s'"
 msgstr "sobrescribiendo '%s'"
 
 #, c-format
 msgid "overwriting '%s'"
 msgstr "sobrescribiendo '%s'"
 

-#: builtin/mv.c:237
+#: builtin/mv.c:238

 msgid "Cannot overwrite"
 msgstr "No se puede sobrescribir"
 
 msgid "Cannot overwrite"
 msgstr "No se puede sobrescribir"
 

-#: builtin/mv.c:240
+#: builtin/mv.c:241

 msgid "multiple sources for the same target"
 msgstr "múltiples fuentes para el mismo objetivo"
 
 msgid "multiple sources for the same target"
 msgstr "múltiples fuentes para el mismo objetivo"
 

-#: builtin/mv.c:242
+#: builtin/mv.c:243

 msgid "destination directory does not exist"
 msgstr "el directorio de destino no existe"
 
 msgid "destination directory does not exist"
 msgstr "el directorio de destino no existe"
 

-#: builtin/mv.c:249
+#: builtin/mv.c:250

 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, fuente=%s, destino=%s"
 
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, fuente=%s, destino=%s"
 

-#: builtin/mv.c:270
+#: builtin/mv.c:271

 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 

-#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513

 #, c-format
 msgid "renaming '%s' failed"
 msgstr "renombrando '%s' falló"
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "renombrando '%s' falló"


@@ -13650,8 +14520,8 @@ msgid "could not open or read '%s'"
 msgstr "no se pudo abrir o leer '%s'"
 
 #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
 msgstr "no se pudo abrir o leer '%s'"
 
 #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315

-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:524
-#: builtin/notes.c:529 builtin/notes.c:607 builtin/notes.c:669
+#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
+#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672

 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "falló al resolver '%s' como ref válida."
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "falló al resolver '%s' como ref válida."


@@ -13684,38 +14554,38 @@ msgstr "falló al copiar notas de '%s' a '%s'"
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
 
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
 

-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662
-#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
+#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
+#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985

 msgid "too many parameters"
 msgstr "demasiados parámetros"
 
 msgid "too many parameters"
 msgstr "demasiados parámetros"
 

-#: builtin/notes.c:389 builtin/notes.c:675
+#: builtin/notes.c:389 builtin/notes.c:678

 #, c-format
 msgid "no note found for object %s."
 msgstr "no se encontraron notas para objeto %s."
 
 #, c-format
 msgid "no note found for object %s."
 msgstr "no se encontraron notas para objeto %s."
 

-#: builtin/notes.c:410 builtin/notes.c:573
+#: builtin/notes.c:410 builtin/notes.c:576

 msgid "note contents as a string"
 msgstr "contenidos de la nota como cadena"
 
 msgid "note contents as a string"
 msgstr "contenidos de la nota como cadena"
 

-#: builtin/notes.c:413 builtin/notes.c:576
+#: builtin/notes.c:413 builtin/notes.c:579

 msgid "note contents in a file"
 msgstr "contenidos de la nota en un archivo"
 
 msgid "note contents in a file"
 msgstr "contenidos de la nota en un archivo"
 

-#: builtin/notes.c:416 builtin/notes.c:579
+#: builtin/notes.c:416 builtin/notes.c:582

 msgid "reuse and edit specified note object"
 msgstr "reutilizar y editar el objeto de nota especificada"
 
 msgid "reuse and edit specified note object"
 msgstr "reutilizar y editar el objeto de nota especificada"
 

-#: builtin/notes.c:419 builtin/notes.c:582
+#: builtin/notes.c:419 builtin/notes.c:585

 msgid "reuse specified note object"
 msgstr "reutilizar el objeto de nota especificado"
 
 msgid "reuse specified note object"
 msgstr "reutilizar el objeto de nota especificado"
 

-#: builtin/notes.c:422 builtin/notes.c:585
+#: builtin/notes.c:422 builtin/notes.c:588

 msgid "allow storing empty note"
 msgstr "permitir almacenar nota vacía"
 
 msgid "allow storing empty note"
 msgstr "permitir almacenar nota vacía"
 

-#: builtin/notes.c:423 builtin/notes.c:494
+#: builtin/notes.c:423 builtin/notes.c:496

 msgid "replace existing notes"
 msgstr "reemplazar notas existentes"
 
 msgid "replace existing notes"
 msgstr "reemplazar notas existentes"
 


@@ -13728,29 +14598,29 @@ msgstr ""
 "No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
 "'-f' para sobrescribir las notas existentes"
 
 "No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
 "'-f' para sobrescribir las notas existentes"
 

-#: builtin/notes.c:463 builtin/notes.c:542
+#: builtin/notes.c:463 builtin/notes.c:544

 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Sobrescribiendo notas existentes para objeto %s\n"
 
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Sobrescribiendo notas existentes para objeto %s\n"
 

-#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902

 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Removiendo nota para objeto %s\n"
 
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Removiendo nota para objeto %s\n"
 

-#: builtin/notes.c:495
+#: builtin/notes.c:497

 msgid "read objects from stdin"
 msgstr "leer objetos desde stdin"
 
 msgid "read objects from stdin"
 msgstr "leer objetos desde stdin"
 

-#: builtin/notes.c:497
+#: builtin/notes.c:499

 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
 
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
 

-#: builtin/notes.c:515
+#: builtin/notes.c:517

 msgid "too few parameters"
 msgstr "muy pocos parámetros"
 
 msgid "too few parameters"
 msgstr "muy pocos parámetros"
 

-#: builtin/notes.c:536
+#: builtin/notes.c:538

 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "


@@ -13759,12 +14629,12 @@ msgstr ""
 "No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
 "Use '-f' para sobrescribir las notes existentes"
 
 "No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
 "Use '-f' para sobrescribir las notes existentes"
 

-#: builtin/notes.c:548
+#: builtin/notes.c:550

 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "faltan notas en la fuente del objeto %s. No se puede copiar."
 
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "faltan notas en la fuente del objeto %s. No se puede copiar."
 

-#: builtin/notes.c:600
+#: builtin/notes.c:603

 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"


@@ -13773,52 +14643,52 @@ msgstr ""
 "Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
 "Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
 
 "Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
 "Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
 

-#: builtin/notes.c:695
+#: builtin/notes.c:698

 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
 
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
 

-#: builtin/notes.c:697
+#: builtin/notes.c:700

 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "falló al borrar ref NOTES_MERGE_REF"
 
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "falló al borrar ref NOTES_MERGE_REF"
 

-#: builtin/notes.c:699
+#: builtin/notes.c:702

 msgid "failed to remove 'git notes merge' worktree"
 msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
 
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
 

-#: builtin/notes.c:719
+#: builtin/notes.c:722

 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
 
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
 

-#: builtin/notes.c:721
+#: builtin/notes.c:724

 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
 
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
 

-#: builtin/notes.c:723
+#: builtin/notes.c:726

 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
 
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
 

-#: builtin/notes.c:736
+#: builtin/notes.c:739

 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "falló al resolver NOTES_MERGE_REF"
 
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "falló al resolver NOTES_MERGE_REF"
 

-#: builtin/notes.c:739
+#: builtin/notes.c:742

 msgid "failed to finalize notes merge"
 msgstr "falló al finalizar las notas de fusión"
 
 msgid "failed to finalize notes merge"
 msgstr "falló al finalizar las notas de fusión"
 

-#: builtin/notes.c:765
+#: builtin/notes.c:768

 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estrategia de fusión de notas %s desconocida"
 
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estrategia de fusión de notas %s desconocida"
 

-#: builtin/notes.c:781
+#: builtin/notes.c:784

 msgid "General options"
 msgstr "Opciones generales"
 
 msgid "General options"
 msgstr "Opciones generales"
 

-#: builtin/notes.c:783
+#: builtin/notes.c:786

 msgid "Merge options"
 msgstr "Opciones de fusión"
 
 msgid "Merge options"
 msgstr "Opciones de fusión"
 

-#: builtin/notes.c:785
+#: builtin/notes.c:788

 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"


@@ -13826,47 +14696,47 @@ msgstr ""
 "resolver conflictos de notas usando la estrategia entregadas (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
 "resolver conflictos de notas usando la estrategia entregadas (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 

-#: builtin/notes.c:787
+#: builtin/notes.c:790

 msgid "Committing unmerged notes"
 msgstr "Realizando commit a las notas no fusionadas"
 
 msgid "Committing unmerged notes"
 msgstr "Realizando commit a las notas no fusionadas"
 

-#: builtin/notes.c:789
+#: builtin/notes.c:792

 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "finalizar fusión de notas realizando un commit de las notas no fusionadas"
 
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "finalizar fusión de notas realizando un commit de las notas no fusionadas"
 

-#: builtin/notes.c:791
+#: builtin/notes.c:794

 msgid "Aborting notes merge resolution"
 msgstr "Abortando notas de resolución de fusión"
 
 msgid "Aborting notes merge resolution"
 msgstr "Abortando notas de resolución de fusión"
 

-#: builtin/notes.c:793
+#: builtin/notes.c:796

 msgid "abort notes merge"
 msgstr "abortar notas de fusión"
 
 msgid "abort notes merge"
 msgstr "abortar notas de fusión"
 

-#: builtin/notes.c:804
+#: builtin/notes.c:807

 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy"
 
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy"
 

-#: builtin/notes.c:809
+#: builtin/notes.c:812

 msgid "must specify a notes ref to merge"
 msgstr "debe especificar una ref de notas a fusionar"
 
 msgid "must specify a notes ref to merge"
 msgstr "debe especificar una ref de notas a fusionar"
 

-#: builtin/notes.c:833
+#: builtin/notes.c:836

 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "--strategy/-s desconocida: %s"
 
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "--strategy/-s desconocida: %s"
 

-#: builtin/notes.c:870
+#: builtin/notes.c:873

 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "una fusión de notas en %s ya está en progreso en %s"
 
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "una fusión de notas en %s ya está en progreso en %s"
 

-#: builtin/notes.c:873
+#: builtin/notes.c:876

 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "falló al guardar un link para el ref de notas actual (%s)"
 
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "falló al guardar un link para el ref de notas actual (%s)"
 

-#: builtin/notes.c:875
+#: builtin/notes.c:878

 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "


@@ -13877,36 +14747,36 @@ msgstr ""
 "commit con el resultado 'git notes merge --commit', o aborte la fusión con "
 "'git notes merge --abort'.\n"
 
 "commit con el resultado 'git notes merge --commit', o aborte la fusión con "
 "'git notes merge --abort'.\n"
 

-#: builtin/notes.c:897
+#: builtin/notes.c:900

 #, c-format
 msgid "Object %s has no note\n"
 msgstr "El objeto %s no tiene notas\n"
 
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "El objeto %s no tiene notas\n"
 

-#: builtin/notes.c:909
+#: builtin/notes.c:912

 msgid "attempt to remove non-existent note is not an error"
 msgstr "intentar eliminar una nota no existente no es un error"
 
 msgid "attempt to remove non-existent note is not an error"
 msgstr "intentar eliminar una nota no existente no es un error"
 

-#: builtin/notes.c:912
+#: builtin/notes.c:915

 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 

-#: builtin/notes.c:950 builtin/prune.c:108 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165

 msgid "do not remove, show only"
 msgstr "no eliminar, solo mostrar"
 
 msgid "do not remove, show only"
 msgstr "no eliminar, solo mostrar"
 

-#: builtin/notes.c:951
+#: builtin/notes.c:955

 msgid "report pruned notes"
 msgstr "reportar notas recortadas"
 
 msgid "report pruned notes"
 msgstr "reportar notas recortadas"
 

-#: builtin/notes.c:993
+#: builtin/notes.c:998

 msgid "notes-ref"
 msgstr "referencia-de-notas"
 
 msgid "notes-ref"
 msgstr "referencia-de-notas"
 

-#: builtin/notes.c:994
+#: builtin/notes.c:999

 msgid "use notes from <notes-ref>"
 msgstr "usar notas desde <referencia-de-notas>"
 
 msgid "use notes from <notes-ref>"
 msgstr "usar notas desde <referencia-de-notas>"
 

-#: builtin/notes.c:1029
+#: builtin/notes.c:1034

 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"


@@ -13925,129 +14795,129 @@ msgstr ""
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 

-#: builtin/pack-objects.c:422
+#: builtin/pack-objects.c:423

 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "mal paquete de objeto CRC para %s"
 
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "mal paquete de objeto CRC para %s"
 

-#: builtin/pack-objects.c:433
+#: builtin/pack-objects.c:434

 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objeto empaquetado corrupto para %s"
 
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objeto empaquetado corrupto para %s"
 

-#: builtin/pack-objects.c:564
+#: builtin/pack-objects.c:565

 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "delta recursivo encontrado para objeto %s"
 
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "delta recursivo encontrado para objeto %s"
 

-#: builtin/pack-objects.c:775
+#: builtin/pack-objects.c:776

 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objetos ordenados, esperados %<PRIu32>"
 
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objetos ordenados, esperados %<PRIu32>"
 

-#: builtin/pack-objects.c:788
+#: builtin/pack-objects.c:789

 #, c-format
 msgid "packfile is invalid: %s"
 msgstr "packfile es inválido: %s"
 
 #, c-format
 msgid "packfile is invalid: %s"
 msgstr "packfile es inválido: %s"
 

-#: builtin/pack-objects.c:792
+#: builtin/pack-objects.c:793

 #, c-format
 msgid "unable to open packfile for reuse: %s"
 msgstr "no es posible abrir packfile para reusar: %s"
 
 #, c-format
 msgid "unable to open packfile for reuse: %s"
 msgstr "no es posible abrir packfile para reusar: %s"
 

-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:797

 msgid "unable to seek in reused packfile"
 msgstr "no es posible buscar en los packfile reusados"
 
 msgid "unable to seek in reused packfile"
 msgstr "no es posible buscar en los packfile reusados"
 

-#: builtin/pack-objects.c:807
+#: builtin/pack-objects.c:808

 msgid "unable to read from reused packfile"
 msgstr "no es posible leer de packfile reusado"
 
 msgid "unable to read from reused packfile"
 msgstr "no es posible leer de packfile reusado"
 

-#: builtin/pack-objects.c:835
+#: builtin/pack-objects.c:836

 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "deshabilitando escritura bitmap, paquetes son divididos debido a pack."
 "packSizeLimit"
 
 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:848
+#: builtin/pack-objects.c:849

 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 

-#: builtin/pack-objects.c:910 builtin/update-index.c:88
+#: builtin/pack-objects.c:911 builtin/update-index.c:89

 #, c-format
 msgid "failed to stat %s"
 msgstr "falló al iniciar %s"
 
 #, c-format
 msgid "failed to stat %s"
 msgstr "falló al iniciar %s"
 

-#: builtin/pack-objects.c:963
+#: builtin/pack-objects.c:964

 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
 
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
 

-#: builtin/pack-objects.c:1157
+#: builtin/pack-objects.c:1158

 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
 "empaquetados"
 
 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:1585
+#: builtin/pack-objects.c:1586

 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "overflow de offset en la base de delta en paquete para %s"
 
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "overflow de offset en la base de delta en paquete para %s"
 

-#: builtin/pack-objects.c:1594
+#: builtin/pack-objects.c:1595

 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "outbound de offset en la base de delta para %s"
 
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "outbound de offset en la base de delta para %s"
 

-#: builtin/pack-objects.c:1863
+#: builtin/pack-objects.c:1864

 msgid "Counting objects"
 msgstr "Contando objetos"
 
 msgid "Counting objects"
 msgstr "Contando objetos"
 

-#: builtin/pack-objects.c:1998
+#: builtin/pack-objects.c:1994

 #, c-format
 msgid "unable to get size of %s"
 msgstr "no se pudo obtener el tamaño de %s"
 
 #, c-format
 msgid "unable to get size of %s"
 msgstr "no se pudo obtener el tamaño de %s"
 

-#: builtin/pack-objects.c:2013
+#: builtin/pack-objects.c:2009

 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "incapaz de analizar header del objeto %s"
 
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "incapaz de analizar header del objeto %s"
 

-#: builtin/pack-objects.c:2083 builtin/pack-objects.c:2099
-#: builtin/pack-objects.c:2109
+#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095
+#: builtin/pack-objects.c:2105

 #, c-format
 msgid "object %s cannot be read"
 msgstr "objeto %s no puede ser leído"
 
 #, c-format
 msgid "object %s cannot be read"
 msgstr "objeto %s no puede ser leído"
 

-#: builtin/pack-objects.c:2086 builtin/pack-objects.c:2113
+#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109

 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
 
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
 

-#: builtin/pack-objects.c:2123
+#: builtin/pack-objects.c:2119

 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - fuera de memoria"
 
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - fuera de memoria"
 

-#: builtin/pack-objects.c:2451
+#: builtin/pack-objects.c:2445

 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compresión delta usando hasta %d hilos"
 
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compresión delta usando hasta %d hilos"
 

-#: builtin/pack-objects.c:2583
+#: builtin/pack-objects.c:2577

 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
 
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
 

-#: builtin/pack-objects.c:2670
+#: builtin/pack-objects.c:2664

 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 

-#: builtin/pack-objects.c:2676
+#: builtin/pack-objects.c:2670

 msgid "inconsistency with delta count"
 msgstr "inconsistencia con la cuenta de delta"
 
 msgid "inconsistency with delta count"
 msgstr "inconsistencia con la cuenta de delta"
 

-#: builtin/pack-objects.c:2753
+#: builtin/pack-objects.c:2751

 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"


@@ -14056,7 +14926,7 @@ msgstr ""
 "se espseraba ID de objeto al borde, se obtuvo basura:\n"
 "%s"
 
 "se espseraba ID de objeto al borde, se obtuvo basura:\n"
 "%s"
 

-#: builtin/pack-objects.c:2759
+#: builtin/pack-objects.c:2757

 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"


@@ -14065,20 +14935,20 @@ msgstr ""
 "se esperaba ID de objeto, se obtuvo basuta:\n"
 "%s"
 
 "se esperaba ID de objeto, se obtuvo basuta:\n"
 "%s"
 

-#: builtin/pack-objects.c:2857
+#: builtin/pack-objects.c:2855

 msgid "invalid value for --missing"
 msgstr "valor inválido para --missing"
 
 msgid "invalid value for --missing"
 msgstr "valor inválido para --missing"
 

-#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
+#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022

 msgid "cannot open pack index"
 msgstr "no se puede abrir índice de paquetes"
 
 msgid "cannot open pack index"
 msgstr "no se puede abrir índice de paquetes"
 

-#: builtin/pack-objects.c:2947
+#: builtin/pack-objects.c:2945

 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "objeto perdido en %s no pudo ser examinado"
 
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "objeto perdido en %s no pudo ser examinado"
 

-#: builtin/pack-objects.c:3032
+#: builtin/pack-objects.c:3030

 msgid "unable to force loose object"
 msgstr "incapaz de forzar un objeto perdido"
 
 msgid "unable to force loose object"
 msgstr "incapaz de forzar un objeto perdido"
 


@@ -14216,87 +15086,91 @@ msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
 
 #: builtin/pack-objects.c:3296
 msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
 
 #: builtin/pack-objects.c:3296

+msgid "use the sparse reachability algorithm"
+msgstr "usar el algoritmo sparse reachability"
+
+#: builtin/pack-objects.c:3298

 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 

-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3300

 msgid "create packs suitable for shallow fetches"
 msgstr "crear paquetes adecuados para fetches superficiales"
 
 msgid "create packs suitable for shallow fetches"
 msgstr "crear paquetes adecuados para fetches superficiales"
 

-#: builtin/pack-objects.c:3300
+#: builtin/pack-objects.c:3302

 msgid "ignore packs that have companion .keep file"
 msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
 
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
 

-#: builtin/pack-objects.c:3302
+#: builtin/pack-objects.c:3304

 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 
 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 

-#: builtin/pack-objects.c:3304
+#: builtin/pack-objects.c:3306

 msgid "pack compression level"
 msgstr "nivel de compresión del paquete"
 
 msgid "pack compression level"
 msgstr "nivel de compresión del paquete"
 

-#: builtin/pack-objects.c:3306
+#: builtin/pack-objects.c:3308

 msgid "do not hide commits by grafts"
 msgstr "no ocultar commits por injertos"
 
 msgid "do not hide commits by grafts"
 msgstr "no ocultar commits por injertos"
 

-#: builtin/pack-objects.c:3308
+#: builtin/pack-objects.c:3310

 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"
 
 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:3310
+#: builtin/pack-objects.c:3312

 msgid "write a bitmap index together with the pack index"
 msgstr "escribir un índice de bitmap junto al índice de paquete"
 
 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:3313
+#: builtin/pack-objects.c:3315

 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 

-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3318

 msgid "do not pack objects in promisor packfiles"
 msgstr "no se puede empaquetar objetos en packfiles promisores"
 
 msgid "do not pack objects in promisor packfiles"
 msgstr "no se puede empaquetar objetos en packfiles promisores"
 

-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3320

 msgid "respect islands during delta compression"
 msgstr "respetar islas durante la compresión delta"
 
 msgid "respect islands during delta compression"
 msgstr "respetar islas durante la compresión delta"
 

-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3345

 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d"
 
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d"
 

-#: builtin/pack-objects.c:3347
+#: builtin/pack-objects.c:3350

 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
 
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
 

-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3404

 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size no puede ser usado para construir un paquete para "
 "transferencia"
 
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size no puede ser usado para construir un paquete para "
 "transferencia"
 

-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3406

 msgid "minimum pack size limit is 1 MiB"
 msgstr "tamaño mínimo del paquete es 1 MiB"
 
 msgid "minimum pack size limit is 1 MiB"
 msgstr "tamaño mínimo del paquete es 1 MiB"
 

-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3411

 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin no puede ser usado para construir un paquete indexable"
 
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin no puede ser usado para construir un paquete indexable"
 

-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3414

 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
 
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
 

-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3420

 msgid "cannot use --filter without --stdout"
 msgstr "no se puede usar--filter sin --stdout"
 
 msgid "cannot use --filter without --stdout"
 msgstr "no se puede usar--filter sin --stdout"
 

-#: builtin/pack-objects.c:3476
+#: builtin/pack-objects.c:3479

 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 
 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 

-#: builtin/pack-objects.c:3495
+#: builtin/pack-objects.c:3498

 #, c-format
 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
 msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
 #, c-format
 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
 msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"


@@ -14337,70 +15211,70 @@ msgstr "expirar objetos más viejos a <tiempo>"
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
 
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
 

-#: builtin/prune.c:129
+#: builtin/prune.c:128

 msgid "cannot prune in a precious-objects repo"
 msgstr "no se puede recortar en un repositorio de objetos-preciosos"
 
 msgid "cannot prune in a precious-objects repo"
 msgstr "no se puede recortar en un repositorio de objetos-preciosos"
 

-#: builtin/pull.c:60 builtin/pull.c:62
+#: builtin/pull.c:61 builtin/pull.c:63

 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor inválido para %s: %s"
 
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor inválido para %s: %s"
 

-#: builtin/pull.c:82
+#: builtin/pull.c:83

 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 

-#: builtin/pull.c:133
+#: builtin/pull.c:134

 msgid "control for recursive fetching of submodules"
 msgstr "control de fetch recursivo en submódulos"
 
 msgid "control for recursive fetching of submodules"
 msgstr "control de fetch recursivo en submódulos"
 

-#: builtin/pull.c:137
+#: builtin/pull.c:138

 msgid "Options related to merging"
 msgstr "Opciones relacionadas a fusión"
 
 msgid "Options related to merging"
 msgstr "Opciones relacionadas a fusión"
 

-#: builtin/pull.c:140
+#: builtin/pull.c:141

 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusión"
 
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusión"
 

-#: builtin/pull.c:167 builtin/rebase--interactive.c:147 builtin/revert.c:122
+#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123

 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 
 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 

-#: builtin/pull.c:176
+#: builtin/pull.c:177

 msgid "automatically stash/stash pop before and after rebase"
 msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
 
 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:192
+#: builtin/pull.c:193

 msgid "Options related to fetching"
 msgstr "Opciones relacionadas a fetch"
 
 msgid "Options related to fetching"
 msgstr "Opciones relacionadas a fetch"
 

-#: builtin/pull.c:202
+#: builtin/pull.c:203

 msgid "force overwrite of local branch"
 msgstr "forzar sobrescritura de la rama local"
 
 msgid "force overwrite of local branch"
 msgstr "forzar sobrescritura de la rama local"
 

-#: builtin/pull.c:210
+#: builtin/pull.c:211

 msgid "number of submodules pulled in parallel"
 msgstr "número de submódulos que realizan pull en paralelo"
 
 msgid "number of submodules pulled in parallel"
 msgstr "número de submódulos que realizan pull en paralelo"
 

-#: builtin/pull.c:305
+#: builtin/pull.c:306

 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido para pull.ff: %s"
 
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido para pull.ff: %s"
 

-#: builtin/pull.c:421
+#: builtin/pull.c:422

 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."
 
 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:423
+#: builtin/pull.c:424

 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."
 
 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:424
+#: builtin/pull.c:425

 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."


@@ -14409,7 +15283,7 @@ msgstr ""
 "tiene\n"
 "concordancia en el final remoto."
 
 "tiene\n"
 "concordancia en el final remoto."
 

-#: builtin/pull.c:427
+#: builtin/pull.c:428

 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"


@@ -14420,44 +15294,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."
 
 "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:432 builtin/rebase.c:761 git-parse-remote.sh:73
+#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73

 msgid "You are not currently on a branch."
 msgstr "No te encuentras actualmente en la rama."
 
 msgid "You are not currently on a branch."
 msgstr "No te encuentras actualmente en la rama."
 

-#: builtin/pull.c:434 builtin/pull.c:449 git-parse-remote.sh:79
+#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79

 msgid "Please specify which branch you want to rebase against."
 msgstr "Por favor especifica a qué rama quieres rebasar."
 
 msgid "Please specify which branch you want to rebase against."
 msgstr "Por favor especifica a qué rama quieres rebasar."
 

-#: builtin/pull.c:436 builtin/pull.c:451 git-parse-remote.sh:82
+#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82

 msgid "Please specify which branch you want to merge with."
 msgstr "Por favor especifica a qué rama quieres fusionar."
 
 msgid "Please specify which branch you want to merge with."
 msgstr "Por favor especifica a qué rama quieres fusionar."
 

-#: builtin/pull.c:437 builtin/pull.c:452
+#: builtin/pull.c:438 builtin/pull.c:453

 msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 
 msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 

-#: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
-#: builtin/rebase.c:767 git-parse-remote.sh:64
+#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455
+#: builtin/rebase.c:962 git-parse-remote.sh:64

 msgid "<remote>"
 msgstr "<remoto>"
 
 msgid "<remote>"
 msgstr "<remoto>"
 

-#: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
-#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
+#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460
+#: git-legacy-rebase.sh:564 git-parse-remote.sh:65

 msgid "<branch>"
 msgstr "<rama>"
 
 msgid "<branch>"
 msgstr "<rama>"
 

-#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
+#: builtin/pull.c:448 builtin/rebase.c:954 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."
 
 msgid "There is no tracking information for the current branch."
 msgstr "No hay información de rastreo para la rama actual."
 

-#: builtin/pull.c:456 git-parse-remote.sh:95
+#: builtin/pull.c:457 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:"
 
 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:461
+#: builtin/pull.c:462

 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"


@@ -14466,32 +15340,32 @@ msgstr ""
 "Tu configuración especifica fusionar con la ref '%s'\n"
 "de tu remoto, pero no se pudo hacer fetch a esa ref."
 
 "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:565
+#: builtin/pull.c:566

 #, c-format
 msgid "unable to access commit %s"
 msgstr "no es posible acceder al commit %s"
 
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no es posible acceder al commit %s"
 

-#: builtin/pull.c:843
+#: builtin/pull.c:844

 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorando --verify-signatures para rebase"
 
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorando --verify-signatures para rebase"
 

-#: builtin/pull.c:891
+#: builtin/pull.c:892

 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "La opción --[no-]autostash sólo es válida con --rebase."
 
 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:899
+#: builtin/pull.c:900

 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Actualizando una rama no nata con cambios agregados al índice."
 
 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:902
+#: builtin/pull.c:904

 msgid "pull with rebase"
 msgstr "pull con rebase"
 
 msgid "pull with rebase"
 msgstr "pull con rebase"
 

-#: builtin/pull.c:903
+#: builtin/pull.c:905

 msgid "please commit or stash them."
 msgstr "por favor realiza un commit o un stash con ellos."
 
 msgid "please commit or stash them."
 msgstr "por favor realiza un commit o un stash con ellos."
 

-#: builtin/pull.c:928
+#: builtin/pull.c:930

 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"


@@ -14502,7 +15376,7 @@ msgstr ""
 "realizando fast-forward al árbol de trabajo\n"
 "desde commit %s."
 
 "realizando fast-forward al árbol de trabajo\n"
 "desde commit %s."
 

-#: builtin/pull.c:934
+#: builtin/pull.c:936

 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"


@@ -14519,15 +15393,15 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
 "$ git reset --hard\n"
 "para recuperar."
 

-#: builtin/pull.c:949
+#: builtin/pull.c:951

 msgid "Cannot merge multiple branches into empty head."
 msgstr "No se puede fusionar múltiples ramas en un head vacío."
 
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No se puede fusionar múltiples ramas en un head vacío."
 

-#: builtin/pull.c:953
+#: builtin/pull.c:955

 msgid "Cannot rebase onto multiple branches."
 msgstr "No se puede rebasar en múltiples ramas."
 
 msgid "Cannot rebase onto multiple branches."
 msgstr "No se puede rebasar en múltiples ramas."
 

-#: builtin/pull.c:960
+#: builtin/pull.c:962

 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no se puede rebasar con modificaciones de submódulos grabadas localmente"
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no se puede rebasar con modificaciones de submódulos grabadas localmente"


@@ -14545,7 +15419,7 @@ msgstr "taquigrafía de tag sin <tag>"
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete solo acepta como objetivos nombres de ref planos"
 
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete solo acepta como objetivos nombres de ref planos"
 

-#: builtin/push.c:165
+#: builtin/push.c:167

 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."


@@ -14554,7 +15428,7 @@ msgstr ""
 "Para elegir si la opción es permanente, mira push.default en 'git help "
 "config'."
 
 "Para elegir si la opción es permanente, mira push.default en 'git help "
 "config'."
 

-#: builtin/push.c:168
+#: builtin/push.c:170

 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"


@@ -14579,7 +15453,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
 "    git push %s HEAD\n"
 "%s"
 

-#: builtin/push.c:183
+#: builtin/push.c:185

 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"


@@ -14594,7 +15468,7 @@ msgstr ""
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 

-#: builtin/push.c:197
+#: builtin/push.c:199

 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"


@@ -14608,12 +15482,12 @@ msgstr ""
 "\n"
 "\tgit push --set-upstream %s %s\n"
 
 "\n"
 "\tgit push --set-upstream %s %s\n"
 

-#: builtin/push.c:205
+#: builtin/push.c:207

 #, 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."
 
 #, 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:208
+#: builtin/push.c:210

 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"


@@ -14624,13 +15498,13 @@ msgstr ""
 "su rama actual '%s', sin decirme qué poner en el push\n"
 "para actualizar en qué rama de remoto."
 
 "su rama actual '%s', sin decirme qué poner en el push\n"
 "para actualizar en qué rama de remoto."
 

-#: builtin/push.c:267
+#: builtin/push.c:269

 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\"."
 
 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:274
+#: builtin/push.c:276

 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"


@@ -14642,7 +15516,7 @@ msgstr ""
 "'git pull ...') antes de hacer push de nuevo.\n"
 "Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
 
 "'git pull ...') antes de hacer push de nuevo.\n"
 "Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
 

-#: builtin/push.c:280
+#: builtin/push.c:282

 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"
 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"


@@ -14655,7 +15529,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."
 
 "(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:286
+#: builtin/push.c:288

 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"
 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"


@@ -14669,12 +15543,12 @@ msgstr ""
 "remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
 "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
 
 "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:293
+#: builtin/push.c:295

 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
 
 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:296
+#: builtin/push.c:298

 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"
 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"


@@ -14684,22 +15558,22 @@ msgstr ""
 "o actualizar un ref remoto para hacer que  apunte a un objeto no-commit,\n"
 "sin usar la opción '--force'.\n"
 
 "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:357
+#: builtin/push.c:359

 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Haciendo push a %s\n"
 
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Haciendo push a %s\n"
 

-#: builtin/push.c:361
+#: builtin/push.c:364

 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "falló el push de algunas referencias a '%s'"
 
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "falló el push de algunas referencias a '%s'"
 

-#: builtin/push.c:395
+#: builtin/push.c:398

 #, c-format
 msgid "bad repository '%s'"
 msgstr "mal repositorio '%s'"
 
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mal repositorio '%s'"
 

-#: builtin/push.c:396
+#: builtin/push.c:399

 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "


@@ -14721,104 +15595,104 @@ msgstr ""
 "\n"
 "    git push <nombre>\n"
 
 "\n"
 "    git push <nombre>\n"
 

-#: builtin/push.c:551
+#: builtin/push.c:554

 msgid "repository"
 msgstr "repositorio"
 
 msgid "repository"
 msgstr "repositorio"
 

-#: builtin/push.c:552 builtin/send-pack.c:164
+#: builtin/push.c:555 builtin/send-pack.c:164

 msgid "push all refs"
 msgstr "realizar push a todas las refs"
 
 msgid "push all refs"
 msgstr "realizar push a todas las refs"
 

-#: builtin/push.c:553 builtin/send-pack.c:166
+#: builtin/push.c:556 builtin/send-pack.c:166

 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 
 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 

-#: builtin/push.c:555
+#: builtin/push.c:558

 msgid "delete refs"
 msgstr "borrar refs"
 
 msgid "delete refs"
 msgstr "borrar refs"
 

-#: builtin/push.c:556
+#: builtin/push.c:559

 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
 
 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:559 builtin/send-pack.c:167
+#: builtin/push.c:562 builtin/send-pack.c:167

 msgid "force updates"
 msgstr "forzar actualizaciones"
 
 msgid "force updates"
 msgstr "forzar actualizaciones"
 

-#: builtin/push.c:561 builtin/send-pack.c:181
+#: builtin/push.c:564 builtin/send-pack.c:181

 msgid "<refname>:<expect>"
 msgstr "<refname>:<expect>"
 
 msgid "<refname>:<expect>"
 msgstr "<refname>:<expect>"
 

-#: builtin/push.c:562 builtin/send-pack.c:182
+#: builtin/push.c:565 builtin/send-pack.c:182

 msgid "require old value of ref to be at this value"
 msgstr "requiere haber valor viejo de ref en este valor"
 
 msgid "require old value of ref to be at this value"
 msgstr "requiere haber valor viejo de ref en este valor"
 

-#: builtin/push.c:565
+#: builtin/push.c:568

 msgid "control recursive pushing of submodules"
 msgstr "controlar push recursivo de submódulos"
 
 msgid "control recursive pushing of submodules"
 msgstr "controlar push recursivo de submódulos"
 

-#: builtin/push.c:567 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:175

 msgid "use thin pack"
 msgstr "usar empaquetado delgado"
 
 msgid "use thin pack"
 msgstr "usar empaquetado delgado"
 

-#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161

 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "recibir programa de paquete"
 
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "recibir programa de paquete"
 

-#: builtin/push.c:570
+#: builtin/push.c:573

 msgid "set upstream for git pull/status"
 msgstr "configurar upstream para git pulll/status"
 
 msgid "set upstream for git pull/status"
 msgstr "configurar upstream para git pulll/status"
 

-#: builtin/push.c:573
+#: builtin/push.c:576

 msgid "prune locally removed refs"
 msgstr "recortando refs removidas localmente"
 
 msgid "prune locally removed refs"
 msgstr "recortando refs removidas localmente"
 

-#: builtin/push.c:575
+#: builtin/push.c:578

 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 
 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 

-#: builtin/push.c:576
+#: builtin/push.c:579

 msgid "push missing but relevant tags"
 msgstr "realizar push de tags faltantes pero relevantes"
 
 msgid "push missing but relevant tags"
 msgstr "realizar push de tags faltantes pero relevantes"
 

-#: builtin/push.c:579 builtin/send-pack.c:169
+#: builtin/push.c:582 builtin/send-pack.c:169

 msgid "GPG sign the push"
 msgstr "Firmar con GPG el push"
 
 msgid "GPG sign the push"
 msgstr "Firmar con GPG el push"
 

-#: builtin/push.c:581 builtin/send-pack.c:176
+#: builtin/push.c:584 builtin/send-pack.c:176

 msgid "request atomic transaction on remote side"
 msgstr "solicitar transacción atómica en el lado remoto"
 
 msgid "request atomic transaction on remote side"
 msgstr "solicitar transacción atómica en el lado remoto"
 

-#: builtin/push.c:599
+#: builtin/push.c:602

 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete es incompatible con --all, --mirror y --tags"
 
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete es incompatible con --all, --mirror y --tags"
 

-#: builtin/push.c:601
+#: builtin/push.c:604

 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 

-#: builtin/push.c:604
+#: builtin/push.c:607

 msgid "--all and --tags are incompatible"
 msgstr "--all y --tags son incompatibles"
 
 msgid "--all and --tags are incompatible"
 msgstr "--all y --tags son incompatibles"
 

-#: builtin/push.c:606
+#: builtin/push.c:609

 msgid "--all can't be combined with refspecs"
 msgstr "--all no puede ser combinada con refspecs"
 
 msgid "--all can't be combined with refspecs"
 msgstr "--all no puede ser combinada con refspecs"
 

-#: builtin/push.c:610
+#: builtin/push.c:613

 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror y --tags son incompatibles"
 
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror y --tags son incompatibles"
 

-#: builtin/push.c:612
+#: builtin/push.c:615

 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no puede ser combinado con refspecs"
 
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no puede ser combinado con refspecs"
 

-#: builtin/push.c:615
+#: builtin/push.c:618

 msgid "--all and --mirror are incompatible"
 msgstr "--all y --mirror son incompatibles"
 
 msgid "--all and --mirror are incompatible"
 msgstr "--all y --mirror son incompatibles"
 

-#: builtin/push.c:634
+#: builtin/push.c:637

 msgid "push options must not have new line characters"
 msgstr "opciones de push no pueden tener caracteres de línea nueva"
 
 msgid "push options must not have new line characters"
 msgstr "opciones de push no pueden tener caracteres de línea nueva"
 


@@ -14857,7 +15731,7 @@ msgstr "argumento único de formato debe ser un rango simétrico"
 msgid "need two commit ranges"
 msgstr "se necesitan dos rangos de commits"
 
 msgid "need two commit ranges"
 msgstr "se necesitan dos rangos de commits"
 

-#: builtin/read-tree.c:40
+#: builtin/read-tree.c:41

 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"


@@ -14868,71 +15742,71 @@ msgstr ""
 "sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
 "ismo2> [<árbol-ismo3>]])"
 
 "sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
 "ismo2> [<árbol-ismo3>]])"
 

-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:124

 msgid "write resulting index to <file>"
 msgstr "escribir índice resultante en <archivo>"
 
 msgid "write resulting index to <file>"
 msgstr "escribir índice resultante en <archivo>"
 

-#: builtin/read-tree.c:126
+#: builtin/read-tree.c:127

 msgid "only empty the index"
 msgstr "solo vaciar el índice"
 
 msgid "only empty the index"
 msgstr "solo vaciar el índice"
 

-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:129

 msgid "Merging"
 msgstr "Fusionando"
 
 msgid "Merging"
 msgstr "Fusionando"
 

-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:131

 msgid "perform a merge in addition to a read"
 msgstr "realizar un merge en adición a una lectura"
 
 msgid "perform a merge in addition to a read"
 msgstr "realizar un merge en adición a una lectura"
 

-#: builtin/read-tree.c:132
+#: builtin/read-tree.c:133

 msgid "3-way merge if no file level merging required"
 msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo"
 
 msgid "3-way merge if no file level merging required"
 msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo"
 

-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:135

 msgid "3-way merge in presence of adds and removes"
 msgstr "fusión en 3-vías en presencia de adiciones y remociones"
 
 msgid "3-way merge in presence of adds and removes"
 msgstr "fusión en 3-vías en presencia de adiciones y remociones"
 

-#: builtin/read-tree.c:136
+#: builtin/read-tree.c:137

 msgid "same as -m, but discard unmerged entries"
 msgstr "igual que -m, pero descarta entradas sin fusionar"
 
 msgid "same as -m, but discard unmerged entries"
 msgstr "igual que -m, pero descarta entradas sin fusionar"
 

-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:138

 msgid "<subdirectory>/"
 msgstr "<subdirectorio>/"
 
 msgid "<subdirectory>/"
 msgstr "<subdirectorio>/"
 

-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:139

 msgid "read the tree into the index under <subdirectory>/"
 msgstr "lea el árbol en el índice bajo <subdirectorio>/"
 
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "lea el árbol en el índice bajo <subdirectorio>/"
 

-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:142

 msgid "update working tree with merge result"
 msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
 
 msgid "update working tree with merge result"
 msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
 

-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:144

 msgid "gitignore"
 msgstr "gitignore"
 
 msgid "gitignore"
 msgstr "gitignore"
 

-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:145

 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permitir sobrescritura de archivos explícitamente ignorados"
 
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permitir sobrescritura de archivos explícitamente ignorados"
 

-#: builtin/read-tree.c:147
+#: builtin/read-tree.c:148

 msgid "don't check the working tree after merging"
 msgstr "no revisar el árbol de trabajo tras fusionar"
 
 msgid "don't check the working tree after merging"
 msgstr "no revisar el árbol de trabajo tras fusionar"
 

-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:149

 msgid "don't update the index or the work tree"
 msgstr "no actualizar el índice o el árbol de trabajo"
 
 msgid "don't update the index or the work tree"
 msgstr "no actualizar el índice o el árbol de trabajo"
 

-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:151

 msgid "skip applying sparse checkout filter"
 msgstr "saltar aplicado de filtro de sparse checkout"
 
 msgid "skip applying sparse checkout filter"
 msgstr "saltar aplicado de filtro de sparse checkout"
 

-#: builtin/read-tree.c:152
+#: builtin/read-tree.c:153

 msgid "debug unpack-trees"
 msgstr "debug de árboles-desempacados"
 
 msgid "debug unpack-trees"
 msgstr "debug de árboles-desempacados"
 

-#: builtin/rebase.c:29
+#: builtin/rebase.c:30

 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
 "[<branch>]"
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
 "[<branch>]"


@@ -14940,47 +15814,51 @@ msgstr ""
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
 "[<branch>]"
 
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
 "[<branch>]"
 

-#: builtin/rebase.c:31
+#: builtin/rebase.c:32

 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]"
 
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]"
 

-#: builtin/rebase.c:33
+#: builtin/rebase.c:34

 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 

-#: builtin/rebase.c:119
+#: builtin/rebase.c:121 builtin/rebase.c:1437

 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s requiere un rebase interactivo"
 
 #, c-format
 msgid "%s requires an interactive rebase"
 msgstr "%s requiere un rebase interactivo"
 

-#: builtin/rebase.c:171
+#: builtin/rebase.c:173

 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no se pudo conseguir 'onto': '%s'"
 
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no se pudo conseguir 'onto': '%s'"
 

-#: builtin/rebase.c:186
+#: builtin/rebase.c:188

 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head inválido: '%s'"
 
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head inválido: '%s'"
 

-#: builtin/rebase.c:214
+#: builtin/rebase.c:213

 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
 
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
 

-#: builtin/rebase.c:259
+#: builtin/rebase.c:289

 #, c-format
 msgid "Could not read '%s'"
 msgstr "No se pudo leer '%s'"
 
 #, c-format
 msgid "Could not read '%s'"
 msgstr "No se pudo leer '%s'"
 

-#: builtin/rebase.c:277
+#: builtin/rebase.c:307

 #, c-format
 msgid "Cannot store %s"
 msgstr "No se puede guardar %s"
 
 #, c-format
 msgid "Cannot store %s"
 msgstr "No se puede guardar %s"
 

-#: builtin/rebase.c:337
+#: builtin/rebase.c:402
+msgid "could not determine HEAD revision"
+msgstr "no se pudo determinar revisión HEAD"
+
+#: builtin/rebase.c:522

 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"


@@ -14995,11 +15873,26 @@ msgstr ""
 "Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
 "rebase --abort\"."
 
 "Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
 "rebase --abort\"."
 

-#: builtin/rebase.c:561
-msgid "could not determine HEAD revision"
-msgstr "no se pudo determinar revisión HEAD"
+#: builtin/rebase.c:603
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"git encontró un error mientras preparaba los parches para replicar\n"
+"esas revisiones:\n"
+"\n"
+"    %s\n"
+"\n"
+"Como resultado, git no puede hacer rebase con ellos."

 
 

-#: builtin/rebase.c:753
+#: builtin/rebase.c:948

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -15016,7 +15909,7 @@ msgstr ""
 "    git rebase '<rama>'\n"
 "\n"
 
 "    git rebase '<rama>'\n"
 "\n"
 

-#: builtin/rebase.c:769
+#: builtin/rebase.c:964

 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"


@@ -15029,149 +15922,161 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<rama> %s\n"
 "\n"
 
 "    git branch --set-upstream-to=%s/<rama> %s\n"
 "\n"
 

-#: builtin/rebase.c:832
+#: builtin/rebase.c:994
+msgid "exec commands cannot contain newlines"
+msgstr "comandos exec no pueden contener newlines"
+
+#: builtin/rebase.c:998
+msgid "empty exec command"
+msgstr "comando exec vacío"
+
+#: builtin/rebase.c:1040

 msgid "rebase onto given branch instead of upstream"
 msgstr "haciendo rebase hacia rama dada en lugar de upstream"
 
 msgid "rebase onto given branch instead of upstream"
 msgstr "haciendo rebase hacia rama dada en lugar de upstream"
 

-#: builtin/rebase.c:834
+#: builtin/rebase.c:1042

 msgid "allow pre-rebase hook to run"
 msgstr "permitir ejecutar hook pre-rebase"
 
 msgid "allow pre-rebase hook to run"
 msgstr "permitir ejecutar hook pre-rebase"
 

-#: builtin/rebase.c:836
+#: builtin/rebase.c:1044

 msgid "be quiet. implies --no-stat"
 msgstr "ser silencioso implica --no-stat"
 
 msgid "be quiet. implies --no-stat"
 msgstr "ser silencioso implica --no-stat"
 

-#: builtin/rebase.c:839
+#: builtin/rebase.c:1047

 msgid "display a diffstat of what changed upstream"
 msgstr "mostrar un diffstat de lo que cambió en upstream"
 
 msgid "display a diffstat of what changed upstream"
 msgstr "mostrar un diffstat de lo que cambió en upstream"
 

-#: builtin/rebase.c:842
+#: builtin/rebase.c:1050

 msgid "do not show diffstat of what changed upstream"
 msgstr "no mostrar un diffstat de lo que cambió en upstream"
 
 msgid "do not show diffstat of what changed upstream"
 msgstr "no mostrar un diffstat de lo que cambió en upstream"
 

-#: builtin/rebase.c:845
+#: builtin/rebase.c:1053

 msgid "add a Signed-off-by: line to each commit"
 msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit"
 
 msgid "add a Signed-off-by: line to each commit"
 msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit"
 

-#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
+#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061

 msgid "passed to 'git am'"
 msgstr "pasado a 'git am'"
 
 msgid "passed to 'git am'"
 msgstr "pasado a 'git am'"
 

-#: builtin/rebase.c:855 builtin/rebase.c:857
+#: builtin/rebase.c:1063 builtin/rebase.c:1065

 msgid "passed to 'git apply'"
 msgstr "pasado a 'git-apply'"
 
 msgid "passed to 'git apply'"
 msgstr "pasado a 'git-apply'"
 

-#: builtin/rebase.c:859 builtin/rebase.c:862
+#: builtin/rebase.c:1067 builtin/rebase.c:1070

 msgid "cherry-pick all commits, even if unchanged"
 msgstr "cherry-pick todos los commits, incluso si no han cambiado"
 
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "cherry-pick todos los commits, incluso si no han cambiado"
 

-#: builtin/rebase.c:864
+#: builtin/rebase.c:1072

 msgid "continue"
 msgstr "continuar"
 
 msgid "continue"
 msgstr "continuar"
 

-#: builtin/rebase.c:867
+#: builtin/rebase.c:1075

 msgid "skip current patch and continue"
 msgstr "saltar el parche y continuar"
 
 msgid "skip current patch and continue"
 msgstr "saltar el parche y continuar"
 

-#: builtin/rebase.c:869
+#: builtin/rebase.c:1077

 msgid "abort and check out the original branch"
 msgstr "aborta y revisa la rama original"
 
 msgid "abort and check out the original branch"
 msgstr "aborta y revisa la rama original"
 

-#: builtin/rebase.c:872
+#: builtin/rebase.c:1080

 msgid "abort but keep HEAD where it is"
 msgstr "aborta pero mantiene HEAD donde está"
 
 msgid "abort but keep HEAD where it is"
 msgstr "aborta pero mantiene HEAD donde está"
 

-#: builtin/rebase.c:873
+#: builtin/rebase.c:1081

 msgid "edit the todo list during an interactive rebase"
 msgstr "editar la lista de pendientes durante el rebase interactivo"
 
 msgid "edit the todo list during an interactive rebase"
 msgstr "editar la lista de pendientes durante el rebase interactivo"
 

-#: builtin/rebase.c:876
+#: builtin/rebase.c:1084

 msgid "show the patch file being applied or merged"
 msgstr "muestra el archivo parche siendo aplicado o fusionado"
 
 msgid "show the patch file being applied or merged"
 msgstr "muestra el archivo parche siendo aplicado o fusionado"
 

-#: builtin/rebase.c:879
+#: builtin/rebase.c:1087

 msgid "use merging strategies to rebase"
 msgstr "usar estrategias de fusión para el rebase"
 
 msgid "use merging strategies to rebase"
 msgstr "usar estrategias de fusión para el rebase"
 

-#: builtin/rebase.c:883
+#: builtin/rebase.c:1091

 msgid "let the user edit the list of commits to rebase"
 msgstr "permitir al usuario editar la lista de commits para rebasar"
 
 msgid "let the user edit the list of commits to rebase"
 msgstr "permitir al usuario editar la lista de commits para rebasar"
 

-#: builtin/rebase.c:887
+#: builtin/rebase.c:1095

 msgid "try to recreate merges instead of ignoring them"
 msgstr "intentar recrear merges en lugar de ignorarlos"
 
 msgid "try to recreate merges instead of ignoring them"
 msgstr "intentar recrear merges en lugar de ignorarlos"
 

-#: builtin/rebase.c:891
+#: builtin/rebase.c:1099

 msgid "allow rerere to update index with resolved conflict"
 msgstr "permitir rerere actualizar index con conflictos resueltos"
 
 msgid "allow rerere to update index with resolved conflict"
 msgstr "permitir rerere actualizar index con conflictos resueltos"
 

-#: builtin/rebase.c:894
+#: builtin/rebase.c:1102

 msgid "preserve empty commits during rebase"
 msgstr "preservar commits vacíos durante el rebase"
 
 msgid "preserve empty commits during rebase"
 msgstr "preservar commits vacíos durante el rebase"
 

-#: builtin/rebase.c:896
+#: builtin/rebase.c:1104

 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
 
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
 

-#: builtin/rebase.c:902
+#: builtin/rebase.c:1110

 msgid "automatically stash/stash pop before and after"
 msgstr "ejecutar automáticamente stash/stash pop antes y después"
 
 msgid "automatically stash/stash pop before and after"
 msgstr "ejecutar automáticamente stash/stash pop antes y después"
 

-#: builtin/rebase.c:904
+#: builtin/rebase.c:1112

 msgid "add exec lines after each commit of the editable list"
 msgstr "agregar líneas exec tras cada acommit de la lista editable"
 
 msgid "add exec lines after each commit of the editable list"
 msgstr "agregar líneas exec tras cada acommit de la lista editable"
 

-#: builtin/rebase.c:908
+#: builtin/rebase.c:1116

 msgid "allow rebasing commits with empty messages"
 msgstr "permitir rebase commits con mensajes vacíos"
 
 msgid "allow rebasing commits with empty messages"
 msgstr "permitir rebase commits con mensajes vacíos"
 

-#: builtin/rebase.c:911
+#: builtin/rebase.c:1119

 msgid "try to rebase merges instead of skipping them"
 msgstr "intentar fusiones por rebase en lugar de saltarlas"
 
 msgid "try to rebase merges instead of skipping them"
 msgstr "intentar fusiones por rebase en lugar de saltarlas"
 

-#: builtin/rebase.c:914
+#: builtin/rebase.c:1122

 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "use 'merge-base --fork-point' para refinar upstream"
 
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "use 'merge-base --fork-point' para refinar upstream"
 

-#: builtin/rebase.c:916
+#: builtin/rebase.c:1124

 msgid "use the given merge strategy"
 msgstr "usar la estrategia de merge dada"
 
 msgid "use the given merge strategy"
 msgstr "usar la estrategia de merge dada"
 

-#: builtin/rebase.c:918 builtin/revert.c:111
+#: builtin/rebase.c:1126 builtin/revert.c:112

 msgid "option"
 msgstr "opción"
 
 msgid "option"
 msgstr "opción"
 

-#: builtin/rebase.c:919
+#: builtin/rebase.c:1127

 msgid "pass the argument through to the merge strategy"
 msgstr "pasar el argumento para la estrategia de fusión"
 
 msgid "pass the argument through to the merge strategy"
 msgstr "pasar el argumento para la estrategia de fusión"
 

-#: builtin/rebase.c:922
+#: builtin/rebase.c:1130

 msgid "rebase all reachable commits up to the root(s)"
 msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
 
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
 

-#: builtin/rebase.c:938
+#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "reprogramar automaticamente cualquier `exec` que falle"
+
+#: builtin/rebase.c:1149

 #, c-format
 msgid "could not exec %s"
 msgstr "no se pudo ejecutar %s"
 
 #, c-format
 msgid "could not exec %s"
 msgstr "no se pudo ejecutar %s"
 

-#: builtin/rebase.c:956 git-legacy-rebase.sh:213
+#: builtin/rebase.c:1167 git-legacy-rebase.sh:220

 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
 
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
 

-#: builtin/rebase.c:997 git-legacy-rebase.sh:395
+#: builtin/rebase.c:1208 git-legacy-rebase.sh:406

 msgid "No rebase in progress?"
 msgstr "No hay rebase en progreso?"
 
 msgid "No rebase in progress?"
 msgstr "No hay rebase en progreso?"
 

-#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
+#: builtin/rebase.c:1212 git-legacy-rebase.sh:417

 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
 
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
 

-#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
+#: builtin/rebase.c:1226 git-legacy-rebase.sh:424

 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 
 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 

-#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
+#: builtin/rebase.c:1238 git-legacy-rebase.sh:427

 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"


@@ -15179,21 +16084,21 @@ msgstr ""
 "Tienes que editar todos los conflictos de fusión y luego\n"
 "marcarlos como resueltos usando git add"
 
 "Tienes que editar todos los conflictos de fusión y luego\n"
 "marcarlos como resueltos usando git add"
 

-#: builtin/rebase.c:1047
+#: builtin/rebase.c:1257

 msgid "could not discard worktree changes"
 msgstr "no se pudo descartar los cambios del árbol de trabajo"
 
 msgid "could not discard worktree changes"
 msgstr "no se pudo descartar los cambios del árbol de trabajo"
 

-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1276

 #, c-format
 msgid "could not move back to %s"
 #, c-format
 msgid "could not move back to %s"

-msgstr "No se puede regresar a %s"
+msgstr "no se puede regresar a %s"

 
 

-#: builtin/rebase.c:1077 builtin/rm.c:368
+#: builtin/rebase.c:1287 builtin/rm.c:369

 #, c-format
 msgid "could not remove '%s'"
 msgstr "no se pudo eliminar'%s'"
 
 #, c-format
 msgid "could not remove '%s'"
 msgstr "no se pudo eliminar'%s'"
 

-#: builtin/rebase.c:1103
+#: builtin/rebase.c:1313

 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"


@@ -15214,336 +16119,328 @@ msgstr ""
 "y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
 "algo de valor ahí.\n"
 
 "y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
 "algo de valor ahí.\n"
 

-#: builtin/rebase.c:1124
+#: builtin/rebase.c:1334

 msgid "switch `C' expects a numerical value"
 msgstr "switch `C' espera un valor numérico"
 
 msgid "switch `C' expects a numerical value"
 msgstr "switch `C' espera un valor numérico"
 

-#: builtin/rebase.c:1161
+#: builtin/rebase.c:1375

 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo desconocido: %s"
 
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo desconocido: %s"
 

-#: builtin/rebase.c:1183
+#: builtin/rebase.c:1397

 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiere --merge o --interactive"
 
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiere --merge o --interactive"
 

-#: builtin/rebase.c:1226
-#, c-format
-msgid ""
-"error: cannot combine interactive options (--interactive, --exec, --rebase-"
-"merges, --preserve-merges, --keep-empty, --root + --onto) with am options "
-"(%s)"
+#: builtin/rebase.c:1446
+msgid "cannot combine am options with either interactive or merge options"

 msgstr ""
 msgstr ""

-"error: no se puede combinar opciones interactivas (--interactive, --exec, --"
-"rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con "
-"opciones (%s)"
+"no se pueden combinar opciones de am con opciones interactivas o de merge"

 
 

-#: builtin/rebase.c:1231
-#, c-format
+#: builtin/rebase.c:1465
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
+
+#: builtin/rebase.c:1469 git-legacy-rebase.sh:544

 msgid ""
 msgid ""

-"error: cannot combine merge options (--merge, --strategy, --strategy-option) "
-"with am options (%s)"
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"

 msgstr ""
 msgstr ""

-"error: no se puede combinar opciones de merge (--merge, --strategy, --"
-"strategy-option) con opciones de am (%s)"
+"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
+"exec'"

 
 

-#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
-msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "error: no se puede combinar '--preserve-merges' con '--rebase-merges'"
+#: builtin/rebase.c:1475
+msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'"

 
 

-#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
-msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "error: no se puede combinar '--rebase-merges' con '--strategy-option'"
+#: builtin/rebase.c:1478
+msgid "cannot combine '--rebase-merges' with '--strategy'"
+msgstr "no se puede combinar '--rebase-merges' con '--strategy'"

 
 

-#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
-msgid "error: cannot combine '--rebase-merges' with '--strategy'"
-msgstr "error: no se puede combinar '--rebase-merges' con '--strategy'"
-
-#: builtin/rebase.c:1283
+#: builtin/rebase.c:1502

 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream inválido '%s'"
 
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream inválido '%s'"
 

-#: builtin/rebase.c:1289
+#: builtin/rebase.c:1508

 msgid "Could not create new root commit"
 msgstr "No se pudo crear commit raíz nuevo"
 
 msgid "Could not create new root commit"
 msgstr "No se pudo crear commit raíz nuevo"
 

-#: builtin/rebase.c:1307
+#: builtin/rebase.c:1526

 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': necesita exactamente una base de fusión"
 
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': necesita exactamente una base de fusión"
 

-#: builtin/rebase.c:1314
+#: builtin/rebase.c:1533

 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a un commit válido '%s'"
 
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a un commit válido '%s'"
 

-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1558

 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal: no existe la rama/commit: '%s'"
 
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal: no existe la rama/commit: '%s'"
 

-#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
-#: builtin/submodule--helper.c:1930
+#: builtin/rebase.c:1566 builtin/submodule--helper.c:38
+#: builtin/submodule--helper.c:1934

 #, c-format
 msgid "No such ref: %s"
 msgstr "No existe ref: %s"
 
 #, c-format
 msgid "No such ref: %s"
 msgstr "No existe ref: %s"
 

-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1578

 msgid "Could not resolve HEAD to a revision"
 msgid "Could not resolve HEAD to a revision"

-msgstr "no se pudo resolver HEAD a una revisión"
+msgstr "No se pudo resolver HEAD a una revisión"

 
 

-#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
+#: builtin/rebase.c:1619 git-legacy-rebase.sh:673

 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 
 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 

-#: builtin/rebase.c:1402
+#: builtin/rebase.c:1622

 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Respuesta de stash inesperada: '%s'"
 
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Respuesta de stash inesperada: '%s'"
 

-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1628

 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "No se pudo crear el directorio para '%s'"
 
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "No se pudo crear el directorio para '%s'"
 

-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1631

 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Autostash creado: %s\n"
 
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Autostash creado: %s\n"
 

-#: builtin/rebase.c:1414
+#: builtin/rebase.c:1634

 msgid "could not reset --hard"
 msgstr "no se pudo reset --hard"
 
 msgid "could not reset --hard"
 msgstr "no se pudo reset --hard"
 

-#: builtin/rebase.c:1415 builtin/reset.c:113
+#: builtin/rebase.c:1635 builtin/reset.c:114

 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD está ahora en %s"
 
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD está ahora en %s"
 

-#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
+#: builtin/rebase.c:1651 git-legacy-rebase.sh:682

 msgid "Please commit or stash them."
 msgstr "Por favor, confírmalos o guárdalos."
 
 msgid "Please commit or stash them."
 msgstr "Por favor, confírmalos o guárdalos."
 

-#: builtin/rebase.c:1458
+#: builtin/rebase.c:1678

 #, c-format
 msgid "could not parse '%s'"
 msgstr "no se puede analizar '%s'"
 
 #, c-format
 msgid "could not parse '%s'"
 msgstr "no se puede analizar '%s'"
 

-#: builtin/rebase.c:1470
+#: builtin/rebase.c:1691

 #, c-format
 msgid "could not switch to %s"
 msgstr "no se pudo cambiar a %s"
 
 #, c-format
 msgid "could not switch to %s"
 msgstr "no se pudo cambiar a %s"
 

-#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
+#: builtin/rebase.c:1702 git-legacy-rebase.sh:705

 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD está actualizado."
 
 #, sh-format
 msgid "HEAD is up to date."
 msgstr "HEAD está actualizado."
 

-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1704

 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La rama actual %s está actualizada.\n"
 
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La rama actual %s está actualizada.\n"
 

-#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
+#: builtin/rebase.c:1712 git-legacy-rebase.sh:715

 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD está actualizado, rebase forzado."
 
 #, sh-format
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD está actualizado, rebase forzado."
 

-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1714

 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Rama actual %s está actualizada, rebase forzado.\n"
 
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Rama actual %s está actualizada, rebase forzado.\n"
 

-#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
+#: builtin/rebase.c:1722 git-legacy-rebase.sh:215

 msgid "The pre-rebase hook refused to rebase."
 msgstr "El hook pre-rebase rechazó el rebase."
 
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El hook pre-rebase rechazó el rebase."
 

-#: builtin/rebase.c:1508
+#: builtin/rebase.c:1729

 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Cambios a %s:\n"
 
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Cambios a %s:\n"
 

-#: builtin/rebase.c:1511
+#: builtin/rebase.c:1732

 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Cambios desde %s a %s:\n"
 
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Cambios desde %s a %s:\n"
 

-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1757

 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
 "de ésta...\n"
 
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
 "de ésta...\n"
 

-#: builtin/rebase.c:1543
+#: builtin/rebase.c:1765

 msgid "Could not detach HEAD"
 msgstr "No se puede desacoplar HEAD"
 
 msgid "Could not detach HEAD"
 msgstr "No se puede desacoplar HEAD"
 

-#: builtin/rebase.c:1552
+#: builtin/rebase.c:1774

 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rápido de %s a %s.\n"
 
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rápido de %s a %s.\n"
 

-#: builtin/rebase--interactive.c:24
+#: builtin/rebase--interactive.c:25

 msgid "no HEAD?"
 msgstr "¿Sin HEAD?"
 
 msgid "no HEAD?"
 msgstr "¿Sin HEAD?"
 

-#: builtin/rebase--interactive.c:51
+#: builtin/rebase--interactive.c:52

 #, c-format
 msgid "could not create temporary %s"
 msgstr "no se pudo crear archivo temporal %s"
 
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no se pudo crear archivo temporal %s"
 

-#: builtin/rebase--interactive.c:57
+#: builtin/rebase--interactive.c:58

 msgid "could not mark as interactive"
 msgstr "no se pudo marcar como interactivo"
 
 msgid "could not mark as interactive"
 msgstr "no se pudo marcar como interactivo"
 

-#: builtin/rebase--interactive.c:101
+#: builtin/rebase--interactive.c:102

 #, c-format
 msgid "could not open %s"
 msgstr "no se pudo abrir %s"
 
 #, c-format
 msgid "could not open %s"
 msgstr "no se pudo abrir %s"
 

-#: builtin/rebase--interactive.c:114
+#: builtin/rebase--interactive.c:115

 msgid "could not generate todo list"
 msgstr "no se pudo generar lista de pendientes"
 
 msgid "could not generate todo list"
 msgstr "no se pudo generar lista de pendientes"
 

-#: builtin/rebase--interactive.c:129
+#: builtin/rebase--interactive.c:131

 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<opciones>]"
 
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<opciones>]"
 

-#: builtin/rebase--interactive.c:148
+#: builtin/rebase--interactive.c:150

 msgid "keep empty commits"
 msgstr "mantener commits vacíos"
 
 msgid "keep empty commits"
 msgstr "mantener commits vacíos"
 

-#: builtin/rebase--interactive.c:150 builtin/revert.c:124
+#: builtin/rebase--interactive.c:152 builtin/revert.c:125

 msgid "allow commits with empty messages"
 msgstr "permitir commits con mensajes vacíos"
 
 msgid "allow commits with empty messages"
 msgstr "permitir commits con mensajes vacíos"
 

-#: builtin/rebase--interactive.c:151
+#: builtin/rebase--interactive.c:153

 msgid "rebase merge commits"
 msgstr "rebasando commits de fusión"
 
 msgid "rebase merge commits"
 msgstr "rebasando commits de fusión"
 

-#: builtin/rebase--interactive.c:153
+#: builtin/rebase--interactive.c:155

 msgid "keep original branch points of cousins"
 msgstr "mantener puntos originales de la rama de sus primos"
 
 msgid "keep original branch points of cousins"
 msgstr "mantener puntos originales de la rama de sus primos"
 

-#: builtin/rebase--interactive.c:155
+#: builtin/rebase--interactive.c:157

 msgid "move commits that begin with squash!/fixup!"
 msgstr "mover commits que comienzan con squash!/fixup!"
 
 msgid "move commits that begin with squash!/fixup!"
 msgstr "mover commits que comienzan con squash!/fixup!"
 

-#: builtin/rebase--interactive.c:156
+#: builtin/rebase--interactive.c:158

 msgid "sign commits"
 msgstr "firmar commits"
 
 msgid "sign commits"
 msgstr "firmar commits"
 

-#: builtin/rebase--interactive.c:158
+#: builtin/rebase--interactive.c:160

 msgid "continue rebase"
 msgstr "continuar rebase"
 
 msgid "continue rebase"
 msgstr "continuar rebase"
 

-#: builtin/rebase--interactive.c:160
+#: builtin/rebase--interactive.c:162

 msgid "skip commit"
 msgstr "saltar commit"
 
 msgid "skip commit"
 msgstr "saltar commit"
 

-#: builtin/rebase--interactive.c:161
+#: builtin/rebase--interactive.c:163

 msgid "edit the todo list"
 msgstr "editar la lista de pendientes"
 
 msgid "edit the todo list"
 msgstr "editar la lista de pendientes"
 

-#: builtin/rebase--interactive.c:163
+#: builtin/rebase--interactive.c:165

 msgid "show the current patch"
 msgstr "mostrar el parche actual"
 
 msgid "show the current patch"
 msgstr "mostrar el parche actual"
 

-#: builtin/rebase--interactive.c:166
+#: builtin/rebase--interactive.c:168

 msgid "shorten commit ids in the todo list"
 msgstr "ids de commits cortos 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--interactive.c:168
+#: builtin/rebase--interactive.c:170

 msgid "expand commit ids in the todo list"
 msgstr "expandir ids de commits en la lista de pendientes"
 
 msgid "expand commit ids in the todo list"
 msgstr "expandir ids de commits en la lista de pendientes"
 

-#: builtin/rebase--interactive.c:170
+#: builtin/rebase--interactive.c:172

 msgid "check the todo list"
 msgstr "revisar la lista de pendientes"
 
 msgid "check the todo list"
 msgstr "revisar la lista de pendientes"
 

-#: builtin/rebase--interactive.c:172
+#: builtin/rebase--interactive.c:174

 msgid "rearrange fixup/squash lines"
 msgstr "reorganizar líneas fixup/squash"
 
 msgid "rearrange fixup/squash lines"
 msgstr "reorganizar líneas fixup/squash"
 

-#: builtin/rebase--interactive.c:174
+#: builtin/rebase--interactive.c:176

 msgid "insert exec commands in todo list"
 msgstr "insertar comando exec en la lista de pendientes"
 
 msgid "insert exec commands in todo list"
 msgstr "insertar comando exec en la lista de pendientes"
 

-#: builtin/rebase--interactive.c:175
+#: builtin/rebase--interactive.c:177

 msgid "onto"
 msgstr "hacia"
 
 msgid "onto"
 msgstr "hacia"
 

-#: builtin/rebase--interactive.c:177
+#: builtin/rebase--interactive.c:179

 msgid "restrict-revision"
 msgstr "restrict-revision"
 
 msgid "restrict-revision"
 msgstr "restrict-revision"
 

-#: builtin/rebase--interactive.c:177
+#: builtin/rebase--interactive.c:179

 msgid "restrict revision"
 msgstr "restringir revision"
 
 msgid "restrict revision"
 msgstr "restringir revision"
 

-#: builtin/rebase--interactive.c:178
+#: builtin/rebase--interactive.c:180

 msgid "squash-onto"
 msgstr "squash-onto"
 
 msgid "squash-onto"
 msgstr "squash-onto"
 

-#: builtin/rebase--interactive.c:179
+#: builtin/rebase--interactive.c:181

 msgid "squash onto"
 msgstr "squash hacia"
 
 msgid "squash onto"
 msgstr "squash hacia"
 

-#: builtin/rebase--interactive.c:181
+#: builtin/rebase--interactive.c:183

 msgid "the upstream commit"
 msgstr "el commit de upstream"
 
 msgid "the upstream commit"
 msgstr "el commit de upstream"
 

-#: builtin/rebase--interactive.c:182
+#: builtin/rebase--interactive.c:184

 msgid "head-name"
 msgstr "head-name"
 
 msgid "head-name"
 msgstr "head-name"
 

-#: builtin/rebase--interactive.c:182
+#: builtin/rebase--interactive.c:184

 msgid "head name"
 msgstr "nombre de head"
 
 msgid "head name"
 msgstr "nombre de head"
 

-#: builtin/rebase--interactive.c:187
+#: builtin/rebase--interactive.c:189

 msgid "rebase strategy"
 msgstr "estrategia de rebase"
 
 msgid "rebase strategy"
 msgstr "estrategia de rebase"
 

-#: builtin/rebase--interactive.c:188
+#: builtin/rebase--interactive.c:190

 msgid "strategy-opts"
 msgstr "strategy-opts"
 
 msgid "strategy-opts"
 msgstr "strategy-opts"
 

-#: builtin/rebase--interactive.c:189
+#: builtin/rebase--interactive.c:191

 msgid "strategy options"
 msgstr "opciones de estrategia"
 
 msgid "strategy options"
 msgstr "opciones de estrategia"
 

-#: builtin/rebase--interactive.c:190
+#: builtin/rebase--interactive.c:192

 msgid "switch-to"
 msgstr "cambiar a"
 
 msgid "switch-to"
 msgstr "cambiar a"
 

-#: builtin/rebase--interactive.c:191
+#: builtin/rebase--interactive.c:193

 msgid "the branch or commit to checkout"
 msgstr "la rama o commit para hacer checkout"
 
 msgid "the branch or commit to checkout"
 msgstr "la rama o commit para hacer checkout"
 

-#: builtin/rebase--interactive.c:192
+#: builtin/rebase--interactive.c:194

 msgid "onto-name"
 msgstr "hacia-nombre"
 
 msgid "onto-name"
 msgstr "hacia-nombre"
 

-#: builtin/rebase--interactive.c:192
+#: builtin/rebase--interactive.c:194

 msgid "onto name"
 msgstr "hacia nombre"
 
 msgid "onto name"
 msgstr "hacia nombre"
 

-#: builtin/rebase--interactive.c:193
+#: builtin/rebase--interactive.c:195

 msgid "cmd"
 msgstr "cmd"
 
 msgid "cmd"
 msgstr "cmd"
 

-#: builtin/rebase--interactive.c:193
+#: builtin/rebase--interactive.c:195

 msgid "the command to run"
 msgstr "el comando para ejecutar"
 
 msgid "the command to run"
 msgstr "el comando para ejecutar"
 

-#: builtin/rebase--interactive.c:220
+#: builtin/rebase--interactive.c:224

 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
 
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
 

-#: builtin/rebase--interactive.c:226
+#: builtin/rebase--interactive.c:230

 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "un commit base tiene que ser provisto con --upstream o --onto"
 
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "un commit base tiene que ser provisto con --upstream o --onto"
 


@@ -15613,11 +16510,66 @@ msgstr "tranquilo"
 msgid "You must specify a directory."
 msgstr "Se tiene que especificar un directorio."
 
 msgid "You must specify a directory."
 msgstr "Se tiene que especificar un directorio."
 

-#: builtin/reflog.c:563 builtin/reflog.c:568
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<tiempo>] [--expire-unreachable=<tiempo>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog existe <ref>"
+
+#: builtin/reflog.c:567 builtin/reflog.c:572

 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no es una marca de tiempo válida"
 
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no es una marca de tiempo válida"
 

+#: builtin/reflog.c:605
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Marcando objectos alcanzables..."
+
+#: builtin/reflog.c:643
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s apunta a ningún lado!"
+
+#: builtin/reflog.c:695
+msgid "no reflog specified to delete"
+msgstr "no reflog especificado para borrar"
+
+#: builtin/reflog.c:704
+#, c-format
+msgid "not a reflog: %s"
+msgstr "no es una reflog: %s"
+
+#: builtin/reflog.c:709
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "no reflog para '%s'"
+
+#: builtin/reflog.c:755
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "formato inválido: %s"
+
+#: builtin/reflog.c:764
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+

 #: builtin/remote.c:16
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 #: builtin/remote.c:16
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"


@@ -16140,6 +17092,20 @@ msgstr ""
 "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
 "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
 
 "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
 "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
 

+#: builtin/repack.c:200
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
+
+#: builtin/repack.c:239 builtin/repack.c:411
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects."
+
+#: builtin/repack.c:256
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+"no se puede finalizar pack-objects para reempaquetar objetos promisores"
+

 #: builtin/repack.c:294
 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un único paquete"
 #: builtin/repack.c:294
 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un único paquete"


@@ -16230,7 +17196,30 @@ 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"
 
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable y -A son incompatibles"
 

-#: builtin/repack.c:527
+#: builtin/repack.c:420
+msgid "Nothing new to pack."
+msgstr "Nada nuevo para empaquetar."
+
+#: builtin/repack.c:481
+#, c-format
+msgid ""
+"WARNING: Some packs in use have been renamed by\n"
+"WARNING: prefixing old- to their name, in order to\n"
+"WARNING: replace them with the new version of the\n"
+"WARNING: file.  But the operation failed, and the\n"
+"WARNING: attempt to rename them back to their\n"
+"WARNING: original names also failed.\n"
+"WARNING: Please rename them in %s manually:\n"
+msgstr ""
+"WARNING: Algunos packs en uso han sido renombrados\n"
+"WARNING: agregando el prefijo old- a sus nombres,para\n"
+"WARNING: reemplazarlos con la nueva versión del\n"
+"WARNING: archivo. Pero la operación falló, y el intento\n"
+"WARNING: de renombrarlos a sus nombres originales\n"
+"WARNING: también falló.\n"
+"WARNING: Por favor renombralos en %s manualmente:\n"
+
+#: builtin/repack.c:529

 #, c-format
 msgid "failed to remove '%s'"
 msgstr "falló al eliminar'%s'"
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "falló al eliminar'%s'"


@@ -16495,126 +17484,126 @@ msgstr "registrar resoluciones limpias en el índice"
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' sin rutas está deprecado"
 
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' sin rutas está deprecado"
 

-#: builtin/rerere.c:111
+#: builtin/rerere.c:113

 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "no es posible generar diff para '%s'"
 
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "no es posible generar diff para '%s'"
 

-#: builtin/reset.c:31
+#: builtin/reset.c:32

 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 

-#: builtin/reset.c:32
+#: builtin/reset.c:33

 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..."
 
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..."
 

-#: builtin/reset.c:33
+#: builtin/reset.c:34

 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]"
 
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]"
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "mixed"
 msgstr "mezclado"
 
 msgid "mixed"
 msgstr "mezclado"
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "soft"
 msgstr "suave"
 
 msgid "soft"
 msgstr "suave"
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "hard"
 msgstr "duro"
 
 msgid "hard"
 msgstr "duro"
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "merge"
 msgstr "fusionar"
 
 msgid "merge"
 msgstr "fusionar"
 

-#: builtin/reset.c:39
+#: builtin/reset.c:40

 msgid "keep"
 msgstr "mantener"
 
 msgid "keep"
 msgstr "mantener"
 

-#: builtin/reset.c:80
+#: builtin/reset.c:81

 msgid "You do not have a valid HEAD."
 msgstr "No hay un HEAD válido."
 
 msgid "You do not have a valid HEAD."
 msgstr "No hay un HEAD válido."
 

-#: builtin/reset.c:82
+#: builtin/reset.c:83

 msgid "Failed to find tree of HEAD."
 msgstr "Falló al encontrar el HEAD del árbol."
 
 msgid "Failed to find tree of HEAD."
 msgstr "Falló al encontrar el HEAD del árbol."
 

-#: builtin/reset.c:88
+#: builtin/reset.c:89

 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Falló al encontrar árbol de %s."
 
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Falló al encontrar árbol de %s."
 

-#: builtin/reset.c:192
+#: builtin/reset.c:193

 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "No se puede realziar un reset %s  en medio de una fusión."
 
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "No se puede realziar un reset %s  en medio de una fusión."
 

-#: builtin/reset.c:292
+#: builtin/reset.c:293

 msgid "be quiet, only report errors"
 msgstr "ser silencioso, solo reportar errores"
 
 msgid "be quiet, only report errors"
 msgstr "ser silencioso, solo reportar errores"
 

-#: builtin/reset.c:294
+#: builtin/reset.c:295

 msgid "reset HEAD and index"
 msgstr "reiniciar HEAD e index"
 
 msgid "reset HEAD and index"
 msgstr "reiniciar HEAD e index"
 

-#: builtin/reset.c:295
+#: builtin/reset.c:296

 msgid "reset only HEAD"
 msgstr "reiniciar solo HEAD"
 
 msgid "reset only HEAD"
 msgstr "reiniciar solo HEAD"
 

-#: builtin/reset.c:297 builtin/reset.c:299
+#: builtin/reset.c:298 builtin/reset.c:300

 msgid "reset HEAD, index and working tree"
 msgstr "reiniciar HEAD, índice y árbol de trabajo"
 
 msgid "reset HEAD, index and working tree"
 msgstr "reiniciar HEAD, índice y árbol de trabajo"
 

-#: builtin/reset.c:301
+#: builtin/reset.c:302

 msgid "reset HEAD but keep local changes"
 msgstr "reiniciar HEAD pero mantener cambios locales"
 
 msgid "reset HEAD but keep local changes"
 msgstr "reiniciar HEAD pero mantener cambios locales"
 

-#: builtin/reset.c:307
+#: builtin/reset.c:308

 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "grabar solo el hecho de que las rutas removidas serán agregadas después"
 
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "grabar solo el hecho de que las rutas removidas serán agregadas después"
 

-#: builtin/reset.c:325
+#: builtin/reset.c:326

 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Falló al resolver '%s' como una revisión válida."
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Falló al resolver '%s' como una revisión válida."
 

-#: builtin/reset.c:333
+#: builtin/reset.c:334

 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Falló al resolver '%s' como un árbol válido."
 
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Falló al resolver '%s' como un árbol válido."
 

-#: builtin/reset.c:342
+#: builtin/reset.c:343

 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch es incompatible con --{hard,mixed,soft}"
 
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch es incompatible con --{hard,mixed,soft}"
 

-#: builtin/reset.c:351
+#: builtin/reset.c:352

 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
 
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
 

-#: builtin/reset.c:353
+#: builtin/reset.c:354

 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No se puede hacer un reset %s con rutas."
 
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No se puede hacer un reset %s con rutas."
 

-#: builtin/reset.c:363
+#: builtin/reset.c:364

 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset no está permitido en un repositorio vacío"
 
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset no está permitido en un repositorio vacío"
 

-#: builtin/reset.c:367
+#: builtin/reset.c:368

 msgid "-N can only be used with --mixed"
 msgstr "-N sólo puede ser usada con --mixed"
 
 msgid "-N can only be used with --mixed"
 msgstr "-N sólo puede ser usada con --mixed"
 

-#: builtin/reset.c:387
+#: builtin/reset.c:388

 msgid "Unstaged changes after reset:"
 msgstr "Cambios fuera del área de stage tras el reset:"
 
 msgid "Unstaged changes after reset:"
 msgstr "Cambios fuera del área de stage tras el reset:"
 

-#: builtin/reset.c:390
+#: builtin/reset.c:391

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -16628,53 +17617,53 @@ msgstr ""
 "usar '--quiet' para evitar esto.  Configura la opción reset.quiet a true\n"
 "para volverlo en el default.\n"
 
 "usar '--quiet' para evitar esto.  Configura la opción reset.quiet a true\n"
 "para volverlo en el default.\n"
 

-#: builtin/reset.c:400
+#: builtin/reset.c:401

 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No se puede reiniciar el índice a la revisión '%s'."
 
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No se puede reiniciar el índice a la revisión '%s'."
 

-#: builtin/reset.c:404
+#: builtin/reset.c:405

 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 

-#: builtin/rev-list.c:403
+#: builtin/rev-list.c:406

 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "no se puede combinar --exclude-promisor-objects y --missing"
 
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "no se puede combinar --exclude-promisor-objects y --missing"
 

-#: builtin/rev-list.c:461
+#: builtin/rev-list.c:464

 msgid "object filtering requires --objects"
 msgstr "filtrado de objetos requiere --objects"
 
 msgid "object filtering requires --objects"
 msgstr "filtrado de objetos requiere --objects"
 

-#: builtin/rev-list.c:464
+#: builtin/rev-list.c:467

 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "valor disperso inválido: '%s'"
 
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "valor disperso inválido: '%s'"
 

-#: builtin/rev-list.c:505
+#: builtin/rev-list.c:508

 msgid "rev-list does not support display of notes"
 msgstr "rev-list no soporta mostrar notas"
 
 msgid "rev-list does not support display of notes"
 msgstr "rev-list no soporta mostrar notas"
 

-#: builtin/rev-list.c:508
+#: builtin/rev-list.c:511

 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
 
 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:407
+#: builtin/rev-parse.c:408

 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
 
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
 

-#: builtin/rev-parse.c:412
+#: builtin/rev-parse.c:413

 msgid "keep the `--` passed as an arg"
 msgstr "mantener el `--` pasado como un arg"
 
 msgid "keep the `--` passed as an arg"
 msgstr "mantener el `--` pasado como un arg"
 

-#: builtin/rev-parse.c:414
+#: builtin/rev-parse.c:415

 msgid "stop parsing after the first non-option argument"
 msgstr "detener análisis tras el primer argumento que no es opción"
 
 msgid "stop parsing after the first non-option argument"
 msgstr "detener análisis tras el primer argumento que no es opción"
 

-#: builtin/rev-parse.c:417
+#: builtin/rev-parse.c:418

 msgid "output in stuck long form"
 msgstr "salida en formulario largo de atasco"
 
 msgid "output in stuck long form"
 msgstr "salida en formulario largo de atasco"
 

-#: builtin/rev-parse.c:550
+#: builtin/rev-parse.c:551

 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"


@@ -16705,72 +17694,77 @@ msgstr "git cherry-pick [<opciones>] <commit-ish>..."
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subcomando>"
 
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subcomando>"
 

-#: builtin/revert.c:91
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "opción `%s' espera un valor numérico mayor a cero"
+
+#: builtin/revert.c:92

 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s no puede ser usado con %s"
 
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s no puede ser usado con %s"
 

-#: builtin/revert.c:100
+#: builtin/revert.c:101

 msgid "end revert or cherry-pick sequence"
 msgstr "finalizar secuencia revert o cherry-pick"
 
 msgid "end revert or cherry-pick sequence"
 msgstr "finalizar secuencia revert o cherry-pick"
 

-#: builtin/revert.c:101
+#: builtin/revert.c:102

 msgid "resume revert or cherry-pick sequence"
 msgstr "resumir secuencia revert o cherry-pick"
 
 msgid "resume revert or cherry-pick sequence"
 msgstr "resumir secuencia revert o cherry-pick"
 

-#: builtin/revert.c:102
+#: builtin/revert.c:103

 msgid "cancel revert or cherry-pick sequence"
 msgstr "cancelar secuencia revert o cherry-pick"
 
 msgid "cancel revert or cherry-pick sequence"
 msgstr "cancelar secuencia revert o cherry-pick"
 

-#: builtin/revert.c:103
+#: builtin/revert.c:104

 msgid "don't automatically commit"
 msgstr "no realizar commit de forma automática"
 
 msgid "don't automatically commit"
 msgstr "no realizar commit de forma automática"
 

-#: builtin/revert.c:104
+#: builtin/revert.c:105

 msgid "edit the commit message"
 msgstr "editar el mensaje de commit"
 
 msgid "edit the commit message"
 msgstr "editar el mensaje de commit"
 

-#: builtin/revert.c:107
+#: builtin/revert.c:108

 msgid "parent-number"
 msgstr "número-de-padre"
 
 msgid "parent-number"
 msgstr "número-de-padre"
 

-#: builtin/revert.c:108
+#: builtin/revert.c:109

 msgid "select mainline parent"
 msgstr "seleccionar el padre principal"
 
 msgid "select mainline parent"
 msgstr "seleccionar el padre principal"
 

-#: builtin/revert.c:110
+#: builtin/revert.c:111

 msgid "merge strategy"
 msgstr "estrategia de fusión"
 
 msgid "merge strategy"
 msgstr "estrategia de fusión"
 

-#: builtin/revert.c:112
+#: builtin/revert.c:113

 msgid "option for merge strategy"
 msgstr "opción para estrategia de fusión"
 
 msgid "option for merge strategy"
 msgstr "opción para estrategia de fusión"
 

-#: builtin/revert.c:121
+#: builtin/revert.c:122

 msgid "append commit name"
 msgstr "adjuntar el nombre del commit"
 
 msgid "append commit name"
 msgstr "adjuntar el nombre del commit"
 

-#: builtin/revert.c:123
+#: builtin/revert.c:124

 msgid "preserve initially empty commits"
 msgstr "preservar commits iniciales vacíos"
 
 msgid "preserve initially empty commits"
 msgstr "preservar commits iniciales vacíos"
 

-#: builtin/revert.c:125
+#: builtin/revert.c:126

 msgid "keep redundant, empty commits"
 msgstr "mantener commits redundantes, vacíos"
 
 msgid "keep redundant, empty commits"
 msgstr "mantener commits redundantes, vacíos"
 

-#: builtin/revert.c:219
+#: builtin/revert.c:220

 msgid "revert failed"
 msgstr "falló al revertir"
 
 msgid "revert failed"
 msgstr "falló al revertir"
 

-#: builtin/revert.c:232
+#: builtin/revert.c:233

 msgid "cherry-pick failed"
 msgstr "cherry-pick falló"
 
 msgid "cherry-pick failed"
 msgstr "cherry-pick falló"
 

-#: builtin/rm.c:18
+#: builtin/rm.c:19

 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opciones>] [--] <archivo>..."
 
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opciones>] [--] <archivo>..."
 

-#: builtin/rm.c:206
+#: builtin/rm.c:207

 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"


@@ -16784,7 +17778,7 @@ msgstr[1] ""
 "los siguientes archivos tienen contenido diferente a los mismos\n"
 "y a HEAD:"
 
 "los siguientes archivos tienen contenido diferente a los mismos\n"
 "y a HEAD:"
 

-#: builtin/rm.c:211
+#: builtin/rm.c:212

 msgid ""
 "\n"
 "(use -f to force removal)"
 msgid ""
 "\n"
 "(use -f to force removal)"


@@ -16792,13 +17786,13 @@ msgstr ""
 "\n"
 "(usa -f para forzar su eliminación)"
 
 "\n"
 "(usa -f para forzar su eliminación)"
 

-#: builtin/rm.c:215
+#: builtin/rm.c:216

 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "el siguiente archivo tiene cambios en stage en el índice:"
 msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:"
 
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "el siguiente archivo tiene cambios en stage en el índice:"
 msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:"
 

-#: builtin/rm.c:219 builtin/rm.c:228
+#: builtin/rm.c:220 builtin/rm.c:229

 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"


@@ -16806,44 +17800,44 @@ msgstr ""
 "\n"
 "(usa --cached para conservar el archivo, o -f para forzar su eliminación)"
 
 "\n"
 "(usa --cached para conservar el archivo, o -f para forzar su eliminación)"
 

-#: builtin/rm.c:225
+#: builtin/rm.c:226

 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 

-#: builtin/rm.c:241
+#: builtin/rm.c:242

 msgid "do not list removed files"
 msgstr "no listar archivos eliminado"
 
 msgid "do not list removed files"
 msgstr "no listar archivos eliminado"
 

-#: builtin/rm.c:242
+#: builtin/rm.c:243

 msgid "only remove from the index"
 msgstr "solo eliminar del índice"
 
 msgid "only remove from the index"
 msgstr "solo eliminar del índice"
 

-#: builtin/rm.c:243
+#: builtin/rm.c:244

 msgid "override the up-to-date check"
 msgstr "sobrescribir el check de actualizado"
 
 msgid "override the up-to-date check"
 msgstr "sobrescribir el check de actualizado"
 

-#: builtin/rm.c:244
+#: builtin/rm.c:245

 msgid "allow recursive removal"
 msgstr "permitir eliminar de forma recursiva"
 
 msgid "allow recursive removal"
 msgstr "permitir eliminar de forma recursiva"
 

-#: builtin/rm.c:246
+#: builtin/rm.c:247

 msgid "exit with a zero status even if nothing matched"
 msgstr "salir con estado cero incluso si nada coincide"
 
 msgid "exit with a zero status even if nothing matched"
 msgstr "salir con estado cero incluso si nada coincide"
 

-#: builtin/rm.c:288
+#: builtin/rm.c:289

 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
 "para proceder"
 
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
 "para proceder"
 

-#: builtin/rm.c:306
+#: builtin/rm.c:307

 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no removiendo '%s' de manera recursiva sin -r"
 
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no removiendo '%s' de manera recursiva sin -r"
 

-#: builtin/rm.c:345
+#: builtin/rm.c:346

 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no es posible eliminar %s"
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no es posible eliminar %s"


@@ -16920,7 +17914,7 @@ msgstr "<w>[,<i1>[,<i2>]]"
 msgid "Linewrap output"
 msgstr "Salida de línea"
 
 msgid "Linewrap output"
 msgstr "Salida de línea"
 

-#: builtin/shortlog.c:299
+#: builtin/shortlog.c:301

 msgid "too many arguments given outside repository"
 msgstr "demasiados argumentos dados fuera del repositorio"
 
 msgid "too many arguments given outside repository"
 msgstr "demasiados argumentos dados fuera del repositorio"
 


@@ -17111,49 +18105,49 @@ msgstr "git stripspace [-s | --strip-comments]"
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 

-#: builtin/stripspace.c:36
+#: builtin/stripspace.c:37

 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "saltar y borrar todas las líneas que comienzan con un carácter de comentario"
 
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "saltar y borrar todas las líneas que comienzan con un carácter de comentario"
 

-#: builtin/stripspace.c:39
+#: builtin/stripspace.c:40

 msgid "prepend comment character and space to each line"
 msgstr "anteponer carácter de comentario y espacio a cada línea"
 
 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:44 builtin/submodule--helper.c:1939
+#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943

 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 
 #, 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:61
+#: builtin/submodule--helper.c:62

 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "subomdule--helper print-default-remote no toma argumentos"
 
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "subomdule--helper print-default-remote no toma argumentos"
 

-#: builtin/submodule--helper.c:99
+#: builtin/submodule--helper.c:100

 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no se puede quitar un componente del url '%s'"
 
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no se puede quitar un componente del url '%s'"
 

-#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1363
+#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367

 msgid "alternative anchor for relative paths"
 msgstr "ancho alternativo para rutas relativas"
 
 msgid "alternative anchor for relative paths"
 msgstr "ancho alternativo para rutas relativas"
 

-#: builtin/submodule--helper.c:412
+#: builtin/submodule--helper.c:413

 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
 
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
 

-#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:626
-#: builtin/submodule--helper.c:649
+#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
+#: builtin/submodule--helper.c:650

 #, 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"
 
 #, 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:521
+#: builtin/submodule--helper.c:522

 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrando '%s'\n"
 
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrando '%s'\n"
 

-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:525

 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"


@@ -17162,7 +18156,7 @@ msgstr ""
 "run_command devolvió estado no-cero para %s\n"
 "."
 
 "run_command devolvió estado no-cero para %s\n"
 "."
 

-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:546

 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "


@@ -17173,19 +18167,19 @@ msgstr ""
 "anidados de %s\n"
 "."
 
 "anidados de %s\n"
 "."
 

-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:562

 msgid "Suppress output of entering each submodule command"
 msgstr "Suprime la salida al inicializar cada comando de submódulo"
 
 msgid "Suppress output of entering each submodule command"
 msgstr "Suprime la salida al inicializar cada comando de submódulo"
 

-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049

 msgid "Recurse into nested submodules"
 msgstr "Recursar en submódulos anidados"
 
 msgid "Recurse into nested submodules"
 msgstr "Recursar en submódulos anidados"
 

-#: builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:569

 msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] <ruta>"
 
 msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] <ruta>"
 

-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:596

 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "


@@ -17194,57 +18188,57 @@ msgstr ""
 "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
 "su propio upstream autoritativo."
 
 "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
 "su propio upstream autoritativo."
 

-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:664

 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
 
 #, 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:667
+#: builtin/submodule--helper.c:668

 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
 
 #, 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:677
+#: builtin/submodule--helper.c:678

 #, 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"
 
 #, 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:684
+#: builtin/submodule--helper.c:685

 #, 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'"
 
 #, 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:706
+#: builtin/submodule--helper.c:707

 msgid "Suppress output for initializing a submodule"
 msgstr "Suprime la salida para inicializar un submódulo"
 
 msgid "Suppress output for initializing a submodule"
 msgstr "Suprime la salida para inicializar un submódulo"
 

-#: builtin/submodule--helper.c:711
+#: builtin/submodule--helper.c:712

 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<ruta>]"
 
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<ruta>]"
 

-#: builtin/submodule--helper.c:783 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910

 #, 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'"
 
 #, 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:822
+#: builtin/submodule--helper.c:823

 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'"
 
 #, 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:849 builtin/submodule--helper.c:1018
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019

 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "falló al recursar en el submódulo '%s'"
 
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "falló al recursar en el submódulo '%s'"
 

-#: builtin/submodule--helper.c:873 builtin/submodule--helper.c:1182
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185

 msgid "Suppress submodule status output"
 msgstr "Suprimir output del estado del submódulo"
 
 msgid "Suppress submodule status output"
 msgstr "Suprimir output del estado del submódulo"
 

-#: builtin/submodule--helper.c:874
+#: builtin/submodule--helper.c:875

 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"


@@ -17252,47 +18246,47 @@ msgstr ""
 "Usar el commit guardado en el índice en lugar del guardado en el submódulo "
 "HEAD"
 
 "Usar el commit guardado en el índice en lugar del guardado en el submódulo "
 "HEAD"
 

-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:876

 msgid "recurse into nested submodules"
 msgstr "recursar en submódulos anidados"
 
 msgid "recurse into nested submodules"
 msgstr "recursar en submódulos anidados"
 

-#: builtin/submodule--helper.c:880
+#: builtin/submodule--helper.c:881

 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
 
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
 

-#: builtin/submodule--helper.c:904
+#: builtin/submodule--helper.c:905

 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ruta>"
 
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ruta>"
 

-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:969

 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Sincronizando url del submódulo para '%s'\n"
 
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Sincronizando url del submódulo para '%s'\n"
 

-#: builtin/submodule--helper.c:974
+#: builtin/submodule--helper.c:975

 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "falló al registrar el url para la ruta del submódulo '%s'"
 
 #, 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:988
+#: builtin/submodule--helper.c:989

 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
 
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
 

-#: builtin/submodule--helper.c:999
+#: builtin/submodule--helper.c:1000

 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "error al actualizar el remoto para el submódulo '%s'"
 
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "error al actualizar el remoto para el submódulo '%s'"
 

-#: builtin/submodule--helper.c:1046
+#: builtin/submodule--helper.c:1047

 msgid "Suppress output of synchronizing submodule url"
 msgstr "Suprime la salida del url del submódulo que se sincroniza"
 
 msgid "Suppress output of synchronizing submodule url"
 msgstr "Suprime la salida del url del submódulo que se sincroniza"
 

-#: builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:1054

 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
 
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
 

-#: builtin/submodule--helper.c:1107
+#: builtin/submodule--helper.c:1108

 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "


@@ -17301,7 +18295,7 @@ msgstr ""
 "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
 "rf' si realmente quiere eliminarlo incluyendo todo en su historia)"
 
 "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
 "rf' si realmente quiere eliminarlo incluyendo todo en su historia)"
 

-#: builtin/submodule--helper.c:1119
+#: builtin/submodule--helper.c:1120

 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "


@@ -17310,81 +18304,81 @@ msgstr ""
 "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa "
 "'-f' para descartarlas"
 
 "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa "
 "'-f' para descartarlas"
 

-#: builtin/submodule--helper.c:1127
+#: builtin/submodule--helper.c:1128

 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directorio '%s' limpiado\n"
 
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directorio '%s' limpiado\n"
 

-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1130

 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n"
 
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n"
 

-#: builtin/submodule--helper.c:1138
+#: builtin/submodule--helper.c:1141

 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "no se pudo crear directorio vacío de submódulo %s"
 
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "no se pudo crear directorio vacío de submódulo %s"
 

-#: builtin/submodule--helper.c:1154
+#: builtin/submodule--helper.c:1157

 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
 
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
 

-#: builtin/submodule--helper.c:1183
+#: builtin/submodule--helper.c:1186

 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Remover arboles de trabajo de submódulos incluso si contienen cambios locales"
 
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Remover arboles de trabajo de submódulos incluso si contienen cambios locales"
 

-#: builtin/submodule--helper.c:1184
+#: builtin/submodule--helper.c:1187

 msgid "Unregister all submodules"
 msgstr "Quitar todos los submódulos"
 
 msgid "Unregister all submodules"
 msgstr "Quitar todos los submódulos"
 

-#: builtin/submodule--helper.c:1189
+#: builtin/submodule--helper.c:1192

 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
 
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
 

-#: builtin/submodule--helper.c:1203
+#: builtin/submodule--helper.c:1206

 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
 
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
 

-#: builtin/submodule--helper.c:1297 builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304

 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submódulo '%s' no puede agregar alterno: %s"
 
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submódulo '%s' no puede agregar alterno: %s"
 

-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1340

 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
 
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
 

-#: builtin/submodule--helper.c:1343
+#: builtin/submodule--helper.c:1347

 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
 
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
 

-#: builtin/submodule--helper.c:1366
+#: builtin/submodule--helper.c:1370

 msgid "where the new submodule will be cloned to"
 msgstr "a donde el nuevo submódulo será clonado"
 
 msgid "where the new submodule will be cloned to"
 msgstr "a donde el nuevo submódulo será clonado"
 

-#: builtin/submodule--helper.c:1369
+#: builtin/submodule--helper.c:1373

 msgid "name of the new submodule"
 msgstr "nombre del nuevo submódulo"
 
 msgid "name of the new submodule"
 msgstr "nombre del nuevo submódulo"
 

-#: builtin/submodule--helper.c:1372
+#: builtin/submodule--helper.c:1376

 msgid "url where to clone the submodule from"
 msgstr "url de dónde clonar el submódulo"
 
 msgid "url where to clone the submodule from"
 msgstr "url de dónde clonar el submódulo"
 

-#: builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:1384

 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 

-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872

 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 
 msgid "force cloning progress"
 msgstr "forzar el proceso de clonado"
 

-#: builtin/submodule--helper.c:1388
+#: builtin/submodule--helper.c:1392

 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"


@@ -17393,94 +18387,94 @@ msgstr ""
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
 "<ruta>"
 
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
 "<ruta>"
 

-#: builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1423

 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
 
 #, 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:1433
+#: builtin/submodule--helper.c:1437

 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "no se pudo obtener el directorio de submódulo para '%s'"
 
 #, 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:1469
+#: builtin/submodule--helper.c:1473

 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Modo de actualización inválido '%s' para ruta de submodulo '%s'"
 
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Modo de actualización inválido '%s' para ruta de submodulo '%s'"
 

-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1477

 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Modo de actualización inválido '%s' configurado para ruta de submodulo '%s'"
 
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Modo de actualización inválido '%s' configurado para ruta de submodulo '%s'"
 

-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1570

 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Ruta de submódulo '%s' no inicializada"
 
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Ruta de submódulo '%s' no inicializada"
 

-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:1574

 msgid "Maybe you want to use 'update --init'?"
 msgstr "Tal vez quiere usar 'update --init'?"
 
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Tal vez quiere usar 'update --init'?"
 

-#: builtin/submodule--helper.c:1600
+#: builtin/submodule--helper.c:1604

 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Saltando submódulo %s no fusionado"
 
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Saltando submódulo %s no fusionado"
 

-#: builtin/submodule--helper.c:1629
+#: builtin/submodule--helper.c:1633

 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Saltando submódulo '%s'"
 
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Saltando submódulo '%s'"
 

-#: builtin/submodule--helper.c:1773
+#: builtin/submodule--helper.c:1777

 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Falló al clonar '%s'. Reintento programado"
 
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Falló al clonar '%s'. Reintento programado"
 

-#: builtin/submodule--helper.c:1784
+#: builtin/submodule--helper.c:1788

 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Falló al clonar '%s' una segunda vez, abortando"
 
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Falló al clonar '%s' una segunda vez, abortando"
 

-#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:2089
+#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093

 msgid "path into the working tree"
 msgstr "ruta hacia el árbol de trabajo"
 
 msgid "path into the working tree"
 msgstr "ruta hacia el árbol de trabajo"
 

-#: builtin/submodule--helper.c:1850
+#: builtin/submodule--helper.c:1854

 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"
 
 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:1854
+#: builtin/submodule--helper.c:1858

 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 

-#: builtin/submodule--helper.c:1860
+#: builtin/submodule--helper.c:1864

 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"
 
 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:1863
+#: builtin/submodule--helper.c:1867

 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 
 msgid "parallel jobs"
 msgstr "trabajos paralelos"
 

-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1869

 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "si el clon inicial debe seguir la recomendación superficial"
 
 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:1866
+#: builtin/submodule--helper.c:1870

 msgid "don't print cloning progress"
 msgstr "no mostrar el progreso de clonado"
 
 msgid "don't print cloning progress"
 msgstr "no mostrar el progreso de clonado"
 

-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1877

 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
 
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
 

-#: builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1890

 msgid "bad value for update parameter"
 msgstr "mal valor para parámetro update"
 
 msgid "bad value for update parameter"
 msgstr "mal valor para parámetro update"
 

-#: builtin/submodule--helper.c:1934
+#: builtin/submodule--helper.c:1938

 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "


@@ -17489,43 +18483,43 @@ msgstr ""
 "Rama de submódulo (%s)  configurada para heredar rama del superproyecto, "
 "pero el superproyecto no está en ninguna rama"
 
 "Rama de submódulo (%s)  configurada para heredar rama del superproyecto, "
 "pero el superproyecto no está en ninguna rama"
 

-#: builtin/submodule--helper.c:2057
+#: builtin/submodule--helper.c:2061

 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "no se pudo conseguir un handle para el submódulo '%s'"
 
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "no se pudo conseguir un handle para el submódulo '%s'"
 

-#: builtin/submodule--helper.c:2090
+#: builtin/submodule--helper.c:2094

 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 
 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 

-#: builtin/submodule--helper.c:2096
+#: builtin/submodule--helper.c:2100

 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<ruta>...]"
 
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<ruta>...]"
 

-#: builtin/submodule--helper.c:2152
+#: builtin/submodule--helper.c:2156

 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "revisar is es seguro escribir el archivo .gitmodules"
 
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "revisar is es seguro escribir el archivo .gitmodules"
 

-#: builtin/submodule--helper.c:2157
+#: builtin/submodule--helper.c:2161

 msgid "git submodule--helper config name [value]"
 msgstr "git submodule--helper config name <valor>"
 
 msgid "git submodule--helper config name [value]"
 msgstr "git submodule--helper config name <valor>"
 

-#: builtin/submodule--helper.c:2158
+#: builtin/submodule--helper.c:2162

 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 

-#: builtin/submodule--helper.c:2175 git-submodule.sh:169
+#: builtin/submodule--helper.c:2179 git-submodule.sh:169

 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo"
 
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo"
 

-#: builtin/submodule--helper.c:2225
+#: builtin/submodule--helper.c:2229 git.c:413 git.c:658

 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no soporta --super-prefix"
 
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no soporta --super-prefix"
 

-#: builtin/submodule--helper.c:2231
+#: builtin/submodule--helper.c:2235

 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no es un comando submodule--helper valido"
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no es un comando submodule--helper valido"


@@ -17770,203 +18764,203 @@ msgstr "Etiqueta '%s' actualizada (era %s)\n"
 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 
 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 

-#: builtin/update-index.c:82
+#: builtin/update-index.c:83

 #, c-format
 msgid "failed to create directory %s"
 msgstr "falló al crear directorio %s"
 
 #, c-format
 msgid "failed to create directory %s"
 msgstr "falló al crear directorio %s"
 

-#: builtin/update-index.c:98
+#: builtin/update-index.c:99

 #, c-format
 msgid "failed to create file %s"
 msgstr "falló al crear el archivo %s"
 
 #, c-format
 msgid "failed to create file %s"
 msgstr "falló al crear el archivo %s"
 

-#: builtin/update-index.c:106
+#: builtin/update-index.c:107

 #, c-format
 msgid "failed to delete file %s"
 msgstr "falló al eliminar el archivo %s"
 
 #, c-format
 msgid "failed to delete file %s"
 msgstr "falló al eliminar el archivo %s"
 

-#: builtin/update-index.c:113 builtin/update-index.c:219
+#: builtin/update-index.c:114 builtin/update-index.c:220

 #, c-format
 msgid "failed to delete directory %s"
 msgstr "falló al eliminar directorio %s"
 
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "falló al eliminar directorio %s"
 

-#: builtin/update-index.c:138
+#: builtin/update-index.c:139

 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Probando mtime en '%s' "
 
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Probando mtime en '%s' "
 

-#: builtin/update-index.c:152
+#: builtin/update-index.c:153

 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"
 
 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:165
+#: builtin/update-index.c:166

 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"
 
 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:178
+#: builtin/update-index.c:179

 msgid "directory stat info changes after updating a file"
 msgstr "info de estado del directorio cambia tras actualizar un archivo"
 
 msgid "directory stat info changes after updating a file"
 msgstr "info de estado del directorio cambia tras actualizar un archivo"
 

-#: builtin/update-index.c:189
+#: builtin/update-index.c:190

 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"
 
 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:200
+#: builtin/update-index.c:201

 msgid "directory stat info does not change after deleting a file"
 msgstr "info de estado del directorio no cambia tras borrar un archivo"
 
 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:213
+#: builtin/update-index.c:214

 msgid "directory stat info does not change after deleting a directory"
 msgstr "info de estado del directorio no cambia tras borrar un directorio"
 
 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:220
+#: builtin/update-index.c:221

 msgid " OK"
 msgstr " OK"
 
 msgid " OK"
 msgstr " OK"
 

-#: builtin/update-index.c:588
+#: builtin/update-index.c:589

 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 

-#: builtin/update-index.c:961
+#: builtin/update-index.c:962

 msgid "continue refresh even when index needs update"
 msgstr ""
 "continuar refresh (Actualización) incluso cuando el índice necesita "
 "actualización"
 
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continuar refresh (Actualización) incluso cuando el índice necesita "
 "actualización"
 

-#: builtin/update-index.c:964
+#: builtin/update-index.c:965

 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 

-#: builtin/update-index.c:967
+#: builtin/update-index.c:968

 msgid "do not ignore new files"
 msgstr "no ignorar archivos nuevos"
 
 msgid "do not ignore new files"
 msgstr "no ignorar archivos nuevos"
 

-#: builtin/update-index.c:969
+#: builtin/update-index.c:970

 msgid "let files replace directories and vice-versa"
 msgstr "permitir que archivos remplacen directorios y vice-versa"
 
 msgid "let files replace directories and vice-versa"
 msgstr "permitir que archivos remplacen directorios y vice-versa"
 

-#: builtin/update-index.c:971
+#: builtin/update-index.c:972

 msgid "notice files missing from worktree"
 msgstr "avisar de archivos faltando en el árbol de trabajo"
 
 msgid "notice files missing from worktree"
 msgstr "avisar de archivos faltando en el árbol de trabajo"
 

-#: builtin/update-index.c:973
+#: builtin/update-index.c:974

 msgid "refresh even if index contains unmerged entries"
 msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
 
 msgid "refresh even if index contains unmerged entries"
 msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
 

-#: builtin/update-index.c:976
+#: builtin/update-index.c:977

 msgid "refresh stat information"
 msgstr "refresh información de estado"
 
 msgid "refresh stat information"
 msgstr "refresh información de estado"
 

-#: builtin/update-index.c:980
+#: builtin/update-index.c:981

 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "como --refresh, pero ignora configuración assume-unchanged"
 
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "como --refresh, pero ignora configuración assume-unchanged"
 

-#: builtin/update-index.c:984
+#: builtin/update-index.c:985

 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 

-#: builtin/update-index.c:985
+#: builtin/update-index.c:986

 msgid "add the specified entry to the index"
 msgstr "agregar la entrada especificada al índice"
 
 msgid "add the specified entry to the index"
 msgstr "agregar la entrada especificada al índice"
 

-#: builtin/update-index.c:994
+#: builtin/update-index.c:995

 msgid "mark files as \"not changing\""
 msgstr "marcar archivos como \"not changing\""
 
 msgid "mark files as \"not changing\""
 msgstr "marcar archivos como \"not changing\""
 

-#: builtin/update-index.c:997
+#: builtin/update-index.c:998

 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 
 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 

-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1001

 msgid "mark files as \"index-only\""
 msgstr "marcar archivos como \"index-only\""
 
 msgid "mark files as \"index-only\""
 msgstr "marcar archivos como \"index-only\""
 

-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1004

 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 
 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 

-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1007

 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"
 
 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:1008
+#: builtin/update-index.c:1009

 msgid "remove named paths even if present in worktree"
 msgstr ""
 "eliminar rutas nombradas incluso si están presentes en el árbol de trabajo"
 
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "eliminar rutas nombradas incluso si están presentes en el árbol de trabajo"
 

-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1011

 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos"
 
 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:1012
+#: builtin/update-index.c:1013

 msgid "read list of paths to be updated from standard input"
 msgstr "leer la lista de rutas para ser actualizada desde standard input"
 
 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:1016
+#: builtin/update-index.c:1017

 msgid "add entries from standard input to the index"
 msgstr "agregar entradas de standard input al índice"
 
 msgid "add entries from standard input to the index"
 msgstr "agregar entradas de standard input al índice"
 

-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1021

 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repoblar stages #2 y #3 para las rutas listadas"
 
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repoblar stages #2 y #3 para las rutas listadas"
 

-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1025

 msgid "only update entries that differ from HEAD"
 msgstr "solo actualizar entradas que difieren de HEAD"
 
 msgid "only update entries that differ from HEAD"
 msgstr "solo actualizar entradas que difieren de HEAD"
 

-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1029

 msgid "ignore files missing from worktree"
 msgstr "ignorar archivos faltantes en el árbol de trabajo"
 
 msgid "ignore files missing from worktree"
 msgstr "ignorar archivos faltantes en el árbol de trabajo"
 

-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1032

 msgid "report actions to standard output"
 msgstr "reportar acciones por standard output"
 
 msgid "report actions to standard output"
 msgstr "reportar acciones por standard output"
 

-#: builtin/update-index.c:1033
+#: builtin/update-index.c:1034

 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
 
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
 

-#: builtin/update-index.c:1037
+#: builtin/update-index.c:1038

 msgid "write index in this format"
 msgstr "escribir índice en este formato"
 
 msgid "write index in this format"
 msgstr "escribir índice en este formato"
 

-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1040

 msgid "enable or disable split index"
 msgstr "activar o desactivar índice dividido"
 
 msgid "enable or disable split index"
 msgstr "activar o desactivar índice dividido"
 

-#: builtin/update-index.c:1041
+#: builtin/update-index.c:1042

 msgid "enable/disable untracked cache"
 msgstr "habilitar o deshabilitar caché no rastreado"
 
 msgid "enable/disable untracked cache"
 msgstr "habilitar o deshabilitar caché no rastreado"
 

-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1044

 msgid "test if the filesystem supports untracked cache"
 msgstr "probar si el filesystem soporta caché no rastreado"
 
 msgid "test if the filesystem supports untracked cache"
 msgstr "probar si el filesystem soporta caché no rastreado"
 

-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1046

 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilitar caché no rastreado sin probar el filesystem"
 
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilitar caché no rastreado sin probar el filesystem"
 

-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1048

 msgid "write out the index even if is not flagged as changed"
 msgstr "escribir el índice incluso si no está marcado como cambiado"
 
 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:1049
+#: builtin/update-index.c:1050

 msgid "enable or disable file system monitor"
 msgstr "activar o desactivar monitor de sistema de archivos"
 
 msgid "enable or disable file system monitor"
 msgstr "activar o desactivar monitor de sistema de archivos"
 

-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1052

 msgid "mark files as fsmonitor valid"
 msgstr "marcar archivos como válidos para fsmonitor"
 
 msgid "mark files as fsmonitor valid"
 msgstr "marcar archivos como válidos para fsmonitor"
 

-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1055

 msgid "clear fsmonitor valid bit"
 msgstr "limpia el bit de validación fsmonitor"
 
 msgid "clear fsmonitor valid bit"
 msgstr "limpia el bit de validación fsmonitor"
 

-#: builtin/update-index.c:1153
+#: builtin/update-index.c:1156

 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"


@@ -17974,7 +18968,7 @@ msgstr ""
 "core.splitIndex está configurado en false; remuévelo o cámbialo, si "
 "realmente quieres habilitar el índice partido"
 
 "core.splitIndex está configurado en false; remuévelo o cámbialo, si "
 "realmente quieres habilitar el índice partido"
 

-#: builtin/update-index.c:1162
+#: builtin/update-index.c:1165

 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"


@@ -17982,7 +18976,7 @@ msgstr ""
 "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente "
 "quieres deshabilitar el índice partido"
 
 "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente "
 "quieres deshabilitar el índice partido"
 

-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1176

 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"


@@ -17990,11 +18984,11 @@ msgstr ""
 "core.untrackedCache está configurado en true; remuévelo o cámbialo, si "
 "realmente quieres deshabilitar el chaché no rastreado"
 
 "core.untrackedCache está configurado en true; remuévelo o cámbialo, si "
 "realmente quieres deshabilitar el chaché no rastreado"
 

-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1180

 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 
 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 

-#: builtin/update-index.c:1185
+#: builtin/update-index.c:1188

 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"


@@ -18002,29 +18996,29 @@ msgstr ""
 "core.untrackedCache está configurado en false; remuévelo o cámbialo, si "
 "realmente quieres habilitar el caché no rastreado"
 
 "core.untrackedCache está configurado en false; remuévelo o cámbialo, si "
 "realmente quieres habilitar el caché no rastreado"
 

-#: builtin/update-index.c:1189
+#: builtin/update-index.c:1192

 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Caché no rastreado habilitado para '%s'"
 
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Caché no rastreado habilitado para '%s'"
 

-#: builtin/update-index.c:1197
+#: builtin/update-index.c:1200

 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"
 
 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:1201
+#: builtin/update-index.c:1204

 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 

-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1207

 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"
 
 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:1208
+#: builtin/update-index.c:1211

 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 
 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 


@@ -18114,55 +19108,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
 msgid "print tag contents"
 msgstr "imprimir contenido del tag"
 
 msgid "print tag contents"
 msgstr "imprimir contenido del tag"
 

-#: builtin/worktree.c:17
+#: builtin/worktree.c:18

 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
 
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
 

-#: builtin/worktree.c:18
+#: builtin/worktree.c:19

 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opciones>]"
 
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opciones>]"
 

-#: builtin/worktree.c:19
+#: builtin/worktree.c:20

 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opciones>] <ruta>"
 
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opciones>] <ruta>"
 

-#: builtin/worktree.c:20
+#: builtin/worktree.c:21

 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> <nueva-ruta>"
 
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> <nueva-ruta>"
 

-#: builtin/worktree.c:21
+#: builtin/worktree.c:22

 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opciones>]"
 
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opciones>]"
 

-#: builtin/worktree.c:22
+#: builtin/worktree.c:23

 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opciones>] <worktree>"
 
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opciones>] <worktree>"
 

-#: builtin/worktree.c:23
+#: builtin/worktree.c:24

 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 

-#: builtin/worktree.c:60 builtin/worktree.c:871
+#: builtin/worktree.c:61 builtin/worktree.c:888

 #, c-format
 msgid "failed to delete '%s'"
 msgstr "falló al borrar '%s'"
 
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "falló al borrar '%s'"
 

-#: builtin/worktree.c:79
+#: builtin/worktree.c:80

 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Removiendo el worktrees/%s: no es un directorio válido"
 
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Removiendo el worktrees/%s: no es un directorio válido"
 

-#: builtin/worktree.c:85
+#: builtin/worktree.c:86

 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
 
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
 

-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:91 builtin/worktree.c:100

 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
 
 #, 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:109
+#: builtin/worktree.c:110

 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
 #, c-format
 msgid ""
 "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "


@@ -18171,36 +19165,36 @@ msgstr ""
 "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
 "bytes, %<PRIuMAX> leídos)"
 
 "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
 "bytes, %<PRIuMAX> leídos)"
 

-#: builtin/worktree.c:117
+#: builtin/worktree.c:118

 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
 
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
 

-#: builtin/worktree.c:126
+#: builtin/worktree.c:127

 #, 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"
 
 #, 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:165
+#: builtin/worktree.c:166

 msgid "report pruned working trees"
 msgstr "reporta árboles de trabajo recortados"
 
 msgid "report pruned working trees"
 msgstr "reporta árboles de trabajo recortados"
 

-#: builtin/worktree.c:167
+#: builtin/worktree.c:168

 msgid "expire working trees older than <time>"
 msgstr "expirar árboles de trabajo más viejos a <tiempo>"
 
 msgid "expire working trees older than <time>"
 msgstr "expirar árboles de trabajo más viejos a <tiempo>"
 

-#: builtin/worktree.c:234
+#: builtin/worktree.c:235

 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 

-#: builtin/worktree.c:251
+#: builtin/worktree.c:252

 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "no es posible volver a agregar el árbol '%s'"
 
 #, c-format
 msgid "unable to re-add worktree '%s'"
 msgstr "no es posible volver a agregar el árbol '%s'"
 

-#: builtin/worktree.c:256
+#: builtin/worktree.c:257

 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"


@@ -18210,7 +19204,7 @@ msgstr ""
 "usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
 "limpiar"
 
 "usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
 "limpiar"
 

-#: builtin/worktree.c:258
+#: builtin/worktree.c:259

 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"


@@ -18219,124 +19213,124 @@ msgstr ""
 "'%s' es un árbol de trabajo faltante pero ya registrado;\n"
 "usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
 
 "'%s' es un árbol de trabajo faltante pero ya registrado;\n"
 "usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
 

-#: builtin/worktree.c:309
+#: builtin/worktree.c:310

 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no se pudo crear directorio de '%s'"
 
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no se pudo crear directorio de '%s'"
 

-#: builtin/worktree.c:428 builtin/worktree.c:434
+#: builtin/worktree.c:429 builtin/worktree.c:435

 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Preparando árbol de trabajo (nueva rama '%s')"
 
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Preparando árbol de trabajo (nueva rama '%s')"
 

-#: builtin/worktree.c:430
+#: builtin/worktree.c:431

 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
 
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
 

-#: builtin/worktree.c:439
+#: builtin/worktree.c:440

 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
 
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
 

-#: builtin/worktree.c:445
+#: builtin/worktree.c:446

 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
 
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
 

-#: builtin/worktree.c:486
+#: builtin/worktree.c:487

 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"
 
 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:489
+#: builtin/worktree.c:490

 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 

-#: builtin/worktree.c:491
+#: builtin/worktree.c:492

 msgid "create or reset a branch"
 msgstr "crear o restablecer una rama"
 
 msgid "create or reset a branch"
 msgstr "crear o restablecer una rama"
 

-#: builtin/worktree.c:493
+#: builtin/worktree.c:494

 msgid "populate the new working tree"
 msgstr "popular el nuevo árbol de trabajo"
 
 msgid "populate the new working tree"
 msgstr "popular el nuevo árbol de trabajo"
 

-#: builtin/worktree.c:494
+#: builtin/worktree.c:495

 msgid "keep the new working tree locked"
 msgstr "mantener el nuevo árbol de trabajo bloqueado"
 
 msgid "keep the new working tree locked"
 msgstr "mantener el nuevo árbol de trabajo bloqueado"
 

-#: builtin/worktree.c:497
+#: builtin/worktree.c:498

 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configurando modo tracking (mirar git-branch(1))"
 
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configurando modo tracking (mirar git-branch(1))"
 

-#: builtin/worktree.c:500
+#: builtin/worktree.c:501

 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"
 
 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:508
+#: builtin/worktree.c:509

 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, y --detach son mutuamente exclusivas"
 
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, y --detach son mutuamente exclusivas"
 

-#: builtin/worktree.c:569
+#: builtin/worktree.c:570

 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"
 
 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:669
+#: builtin/worktree.c:670

 msgid "reason for locking"
 msgstr "razón para bloquear"
 
 msgid "reason for locking"
 msgstr "razón para bloquear"
 

-#: builtin/worktree.c:681 builtin/worktree.c:714 builtin/worktree.c:772
-#: builtin/worktree.c:899
+#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789
+#: builtin/worktree.c:916

 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' no es un árbol de trabajo"
 
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' no es un árbol de trabajo"
 

-#: builtin/worktree.c:683 builtin/worktree.c:716
+#: builtin/worktree.c:684 builtin/worktree.c:717

 msgid "The main working tree cannot be locked or unlocked"
 msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
 
 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:688
+#: builtin/worktree.c:689

 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ya está bloqueado; razón: %s"
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ya está bloqueado; razón: %s"
 

-#: builtin/worktree.c:690
+#: builtin/worktree.c:691

 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ya está bloqueado"
 
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ya está bloqueado"
 

-#: builtin/worktree.c:718
+#: builtin/worktree.c:719

 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no está bloqueado"
 
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no está bloqueado"
 

-#: builtin/worktree.c:743
+#: builtin/worktree.c:760

 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado"
 
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado"
 

-#: builtin/worktree.c:751
+#: builtin/worktree.c:768

 msgid "force move even if worktree is dirty or locked"
 msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
 
 msgid "force move even if worktree is dirty or locked"
 msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
 

-#: builtin/worktree.c:774 builtin/worktree.c:901
+#: builtin/worktree.c:791 builtin/worktree.c:918

 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' es un árbol de trabajo principal"
 
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' es un árbol de trabajo principal"
 

-#: builtin/worktree.c:779
+#: builtin/worktree.c:796

 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "no se pudo descubrir el nombre de destino de '%s'"
 
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "no se pudo descubrir el nombre de destino de '%s'"
 

-#: builtin/worktree.c:785
+#: builtin/worktree.c:802

 #, c-format
 msgid "target '%s' already exists"
 msgstr "el objetivo '%s' ya existe"
 
 #, c-format
 msgid "target '%s' already exists"
 msgstr "el objetivo '%s' ya existe"
 

-#: builtin/worktree.c:793
+#: builtin/worktree.c:810

 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"


@@ -18345,7 +19339,7 @@ msgstr ""
 "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
 "use 'move -f -f' para sobreescribir o desbloquear primero"
 
 "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
 "use 'move -f -f' para sobreescribir o desbloquear primero"
 

-#: builtin/worktree.c:795
+#: builtin/worktree.c:812

 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"


@@ -18353,36 +19347,36 @@ msgstr ""
 "no se puede mover un árbol de trabajo bloqueado;\n"
 "use 'move -f -f' para sobreescribir o desbloquear primero"
 
 "no se puede mover un árbol de trabajo bloqueado;\n"
 "use 'move -f -f' para sobreescribir o desbloquear primero"
 

-#: builtin/worktree.c:798
+#: builtin/worktree.c:815

 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
 
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
 

-#: builtin/worktree.c:803
+#: builtin/worktree.c:820

 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "falló al mover '%s' a '%s'"
 
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "falló al mover '%s' a '%s'"
 

-#: builtin/worktree.c:851
+#: builtin/worktree.c:868

 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "falló al ejecutar 'git status' en '%s'"
 
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "falló al ejecutar 'git status' en '%s'"
 

-#: builtin/worktree.c:855
+#: builtin/worktree.c:872

 #, c-format
 msgid "'%s' is dirty, use --force to delete it"
 msgstr "'%s' está sucio, use --force para borrarlo"
 
 #, c-format
 msgid "'%s' is dirty, use --force to delete it"
 msgstr "'%s' está sucio, use --force para borrarlo"
 

-#: builtin/worktree.c:860
+#: builtin/worktree.c:877

 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
 
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
 

-#: builtin/worktree.c:883
+#: builtin/worktree.c:900

 msgid "force removal even if worktree is dirty or locked"
 msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado"
 
 msgid "force removal even if worktree is dirty or locked"
 msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado"
 

-#: builtin/worktree.c:906
+#: builtin/worktree.c:923

 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"


@@ -18391,7 +19385,7 @@ msgstr ""
 "no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
 "use 'remove -f -f' para sobreescribir o desbloquear primero"
 
 "no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
 "use 'remove -f -f' para sobreescribir o desbloquear primero"
 

-#: builtin/worktree.c:908
+#: builtin/worktree.c:925

 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"


@@ -18399,28 +19393,28 @@ msgstr ""
 "no se pueden eliminar árbol de trabajo bloqueado;\n"
 "use 'remove -f -f' para sobreescribir o desbloquear primero"
 
 "no se pueden eliminar árbol de trabajo bloqueado;\n"
 "use 'remove -f -f' para sobreescribir o desbloquear primero"
 

-#: builtin/worktree.c:911
+#: builtin/worktree.c:928

 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
 
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
 

-#: builtin/write-tree.c:14
+#: builtin/write-tree.c:15

 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
 
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
 

-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28

 msgid "<prefix>/"
 msgstr "<prefijo>/"
 
 msgid "<prefix>/"
 msgstr "<prefijo>/"
 

-#: builtin/write-tree.c:28
+#: builtin/write-tree.c:29

 msgid "write tree object for a subdirectory <prefix>"
 msgstr "escribir objeto de  árbol para un subdirectorio <prefijo>"
 
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "escribir objeto de  árbol para un subdirectorio <prefijo>"
 

-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31

 msgid "only useful for debugging"
 msgstr "sólo útil para depurar"
 
 msgid "only useful for debugging"
 msgstr "sólo útil para depurar"
 

-#: credential-cache--daemon.c:222
+#: credential-cache--daemon.c:223

 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"


@@ -18434,7 +19428,7 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
 "\n"
 "\tchmod 0700 %s"
 

-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272

 msgid "print debugging messages to stderr"
 msgstr "mostrar mensajes de debug en stderr"
 
 msgid "print debugging messages to stderr"
 msgstr "mostrar mensajes de debug en stderr"
 


@@ -18473,95 +19467,147 @@ msgstr ""
 "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
 "para leer sobre un subcomando o concepto específico."
 
 "guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
 "para leer sobre un subcomando o concepto específico."
 

-#: git.c:173
+#: git.c:174

 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "no se entregó directorio para --git-dir\n"
 
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "no se entregó directorio para --git-dir\n"
 

-#: git.c:187
+#: git.c:188

 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "no se entregó namespace para --namespace\n"
 
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "no se entregó namespace para --namespace\n"
 

-#: git.c:201
+#: git.c:202

 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "no se entregó directorio para --work-tree\n"
 
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "no se entregó directorio para --work-tree\n"
 

-#: git.c:215
+#: git.c:216

 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "no se entregó prefijo para --super-prefix\n"
 
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "no se entregó prefijo para --super-prefix\n"
 

-#: git.c:237
+#: git.c:238

 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c espera un string de configuración\n"
 
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c espera un string de configuración\n"
 

-#: git.c:275
+#: git.c:276

 #, c-format
 msgid "no directory given for -C\n"
 msgstr "no se entregó directorio para -C\n"
 
 #, c-format
 msgid "no directory given for -C\n"
 msgstr "no se entregó directorio para -C\n"
 

-#: git.c:300
+#: git.c:301

 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opción %s desconocida\n"
 
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opción %s desconocida\n"
 

-#: git.c:719
+#: git.c:342
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "al expandir el alias '%s':'%s'"
+
+#: git.c:351
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"alias '%s' cambia las variables de entorno.\n"
+"Puedes usar '!git' en el alias para hacer esto"
+
+#: git.c:359
+#, c-format
+msgid "empty alias for %s"
+msgstr "alias vacío para %s"
+
+#: git.c:362
+#, c-format
+msgid "recursive alias: %s"
+msgstr "alias recursivo: %s"
+
+#: git.c:437
+msgid "write failure on standard output"
+msgstr "error de escritura en standard output"
+
+#: git.c:439
+msgid "unknown write failure on standard output"
+msgstr "error desconocido de escritura en standard output"
+
+#: git.c:441
+msgid "close failed on standard output"
+msgstr "cierre falló en standard output"
+
+#: git.c:720

 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "bucle de alias detectado: expansión de '%s' no termina: %s"
 
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "bucle de alias detectado: expansión de '%s' no termina: %s"
 

-#: git.c:802
+#: git.c:770
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "no se puede manejar %s como un builtin"
+
+#: git.c:783
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"uso: %s\n"
+"\n"
+"\n"
+"\n"
+
+#: git.c:803

 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
 
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
 

-#: git.c:814
+#: git.c:815

 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "falló al ejecutar comando '%s': %s\n"
 
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "falló al ejecutar comando '%s': %s\n"
 

-#: http.c:374
+#: http.c:378

 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
 
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
 

-#: http.c:395
+#: http.c:399

 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegación de control no es soportada con cURL < 7.22.0"
 
 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:404
+#: http.c:408

 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"
 
 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:837
+#: http.c:876

 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
 
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
 

-#: http.c:910
+#: http.c:949

 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
 
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
 

-#: http.c:1046
+#: http.c:1085

 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
 
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
 

-#: http.c:1053
+#: http.c:1092

 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
 "SSL"
 
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
 "SSL"
 

-#: http.c:1057
+#: http.c:1096

 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
 
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
 

-#: http.c:1921
+#: http.c:1959

 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"


@@ -18572,19 +19618,11 @@ msgstr ""
 "  preguntaba por: %s\n"
 "   redireccionamiento: %s"
 
 "  preguntaba por: %s\n"
 "   redireccionamiento: %s"
 

-#: remote-curl.c:401
+#: remote-curl.c:455

 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"
 
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"
 

-#: list-objects-filter-options.h:60
-msgid "args"
-msgstr "args"
-
-#: list-objects-filter-options.h:61
-msgid "object filtering"
-msgstr "filtrado de objeto"
-

 #: parse-options.h:154
 msgid "expiry-date"
 msgstr "fecha de expiración"
 #: parse-options.h:154
 msgid "expiry-date"
 msgstr "fecha de expiración"


@@ -18593,15 +19631,15 @@ msgstr "fecha de expiración"
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 

-#: parse-options.h:261
+#: parse-options.h:259

 msgid "be more verbose"
 msgstr "ser mas verboso"
 
 msgid "be more verbose"
 msgstr "ser mas verboso"
 

-#: parse-options.h:263
+#: parse-options.h:261

 msgid "be more quiet"
 msgstr "ser mas discreto"
 
 msgid "be more quiet"
 msgstr "ser mas discreto"
 

-#: parse-options.h:269
+#: parse-options.h:267

 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> dígitos para mostrar SHA-1s"
 
 msgid "use <n> digits to display SHA-1s"
 msgstr "usa <n> dígitos para mostrar SHA-1s"
 


@@ -19235,7 +20273,7 @@ msgstr "Definiendo las propiedades del submódulo"
 
 #: command-list.h:203
 msgid "Git namespaces"
 
 #: command-list.h:203
 msgid "Git namespaces"

-msgstr "namespaces de Git"
+msgstr "Namespaces de Git"

 
 #: command-list.h:204
 msgid "Git Repository Layout"
 
 #: command-list.h:204
 msgid "Git Repository Layout"


@@ -19257,6 +20295,14 @@ msgstr "Un tutorial de introducción para Git"
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visión general de flujos de trabajo recomendados con Git"
 
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visión general de flujos de trabajo recomendados con Git"
 

+#: list-objects-filter-options.h:63
+msgid "args"
+msgstr "args"
+
+#: list-objects-filter-options.h:64
+msgid "object filtering"
+msgstr "filtrado de objeto"
+

 #: rerere.h:44
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 #: rerere.h:44
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""


@@ -19274,133 +20320,49 @@ msgstr "Debes iniciar con \"git bisect start\""
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "¿Quieres que lo haga por ti [Y/n]? "
 
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "¿Quieres que lo haga por ti [Y/n]? "
 

-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "opción no reconocida: '$arg'"
-
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' no parece ser una revisión válida"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "Mal HEAD - Necesito un HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr ""
-"Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'."
-
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "no se bisecará en un árbol con cg-seek"
-
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "Mal HEAD - ref simbólico extraño"
-
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Mal argumento bisect_write: $state"
-
-#: git-bisect.sh:246
+#: git-bisect.sh:101

 #, sh-format
 msgid "Bad rev input: $arg"
 msgstr "Mala entrada rev: $arg"
 
 #, sh-format
 msgid "Bad rev input: $arg"
 msgstr "Mala entrada rev: $arg"
 

-#: git-bisect.sh:265
+#: git-bisect.sh:121

 #, sh-format
 msgid "Bad rev input: $bisected_head"
 msgstr "Mala entrada rev: $bisected_head"
 
 #, sh-format
 msgid "Bad rev input: $bisected_head"
 msgstr "Mala entrada rev: $bisected_head"
 

-#: git-bisect.sh:274
+#: git-bisect.sh:130

 #, sh-format
 msgid "Bad rev input: $rev"
 msgstr "Mala entrada rev: $rev"
 
 #, sh-format
 msgid "Bad rev input: $rev"
 msgstr "Mala entrada rev: $rev"
 

-#: git-bisect.sh:283
+#: git-bisect.sh:139

 #, sh-format
 msgid "'git bisect $TERM_BAD' can take only one argument."
 msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento."
 
 #, 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:306
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Peligro: bisecando 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:312
-msgid "Are you sure [Y/n]? "
-msgstr "¿Estás seguro [Y/n]? "
-
-#: git-bisect.sh:324
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-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:327
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
-msgstr ""
-"Tiene que comenzar por \"git bisect start\".\n"
-"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:398 git-bisect.sh:512
-msgid "We are not bisecting."
-msgstr "No estamos bisecando."
-
-#: git-bisect.sh:405
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' no es un commit válido"
-
-#: git-bisect.sh:414
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
-msgstr ""
-"No se pudo revisar el HEAD original '$branch'.\n"
-"Intente 'git bisect reset <commit>'."
-
-#: git-bisect.sh:422
+#: git-bisect.sh:209

 msgid "No logfile given"
 msgstr "Ningún logfile proporcionado"
 
 msgid "No logfile given"
 msgstr "Ningún logfile proporcionado"
 

-#: git-bisect.sh:423
+#: git-bisect.sh:210

 #, sh-format
 msgid "cannot read $file for replaying"
 msgstr "no se puede leer $file para reproducir"
 
 #, sh-format
 msgid "cannot read $file for replaying"
 msgstr "no se puede leer $file para reproducir"
 

-#: git-bisect.sh:444
+#: git-bisect.sh:232

 msgid "?? what are you talking about?"
 msgstr "?? ¿De qué estás hablando?"
 
 msgid "?? what are you talking about?"
 msgstr "?? ¿De qué estás hablando?"
 

-#: git-bisect.sh:453
+#: git-bisect.sh:241

 msgid "bisect run failed: no command provided."
 msgstr "bisect falló: no se proveyó comando."
 
 msgid "bisect run failed: no command provided."
 msgstr "bisect falló: no se proveyó comando."
 

-#: git-bisect.sh:458
+#: git-bisect.sh:246

 #, sh-format
 msgid "running $command"
 msgstr "ejecutando $command"
 
 #, sh-format
 msgid "running $command"
 msgstr "ejecutando $command"
 

-#: git-bisect.sh:465
+#: git-bisect.sh:253

 #, sh-format
 msgid ""
 "bisect run failed:\n"
 #, sh-format
 msgid ""
 "bisect run failed:\n"


@@ -19409,11 +20371,11 @@ msgstr ""
 "bisect falló:\n"
 "código de salida $res de '$command' es <0 o >=128"
 
 "bisect falló:\n"
 "código de salida $res de '$command' es <0 o >=128"
 

-#: git-bisect.sh:491
+#: git-bisect.sh:279

 msgid "bisect run cannot continue any more"
 msgstr "bisect no puede seguir continuando"
 
 msgid "bisect run cannot continue any more"
 msgstr "bisect no puede seguir continuando"
 

-#: git-bisect.sh:497
+#: git-bisect.sh:285

 #, sh-format
 msgid ""
 "bisect run failed:\n"
 #, sh-format
 msgid ""
 "bisect run failed:\n"


@@ -19422,29 +20384,13 @@ msgstr ""
 "bisect falló:\n"
 "'bisect_state $state' salió con código de error $res"
 
 "bisect falló:\n"
 "'bisect_state $state' salió con código de error $res"
 

-#: git-bisect.sh:504
+#: git-bisect.sh:292

 msgid "bisect run success"
 msgstr "bisect exitoso"
 
 msgid "bisect run success"
 msgstr "bisect exitoso"
 

-#: 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:567
-msgid "no terms defined"
-msgstr "no hay términos definidos"
-
-#: git-bisect.sh:584
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
-msgstr ""
-"argumento inválido $arg para 'git bisect terms'.\n"
-"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-"
-"new."
+#: git-bisect.sh:300
+msgid "We are not bisecting."
+msgstr "No estamos bisecando."

 
 #: git-merge-octopus.sh:46
 msgid ""
 
 #: git-merge-octopus.sh:46
 msgid ""


@@ -19486,12 +20432,12 @@ msgstr "Intentando fusión simple con $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusión simple no funcionó, intentando fusión automática."
 
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusión simple no funcionó, intentando fusión automática."
 

-#: git-legacy-rebase.sh:434
+#: git-legacy-rebase.sh:445

 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No se puede regresar a $head_name"
 
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No se puede regresar a $head_name"
 

-#: git-legacy-rebase.sh:460
+#: git-legacy-rebase.sh:471

 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"


@@ -19512,214 +20458,232 @@ msgstr ""
 "y ejecúteme nuevamente.  Me estoy deteniendo en caso de que tenga\n"
 "algo de valor ahí."
 
 "y ejecúteme nuevamente.  Me estoy deteniendo en caso de que tenga\n"
 "algo de valor ahí."
 

-#: git-legacy-rebase.sh:525
-msgid "error: cannot combine '--signoff' with '--preserve-merges'"
-msgstr "error: no se puede combinar '--signoff' con '--preserve-merges'"
+#: git-legacy-rebase.sh:523
+msgid ""
+"fatal: cannot combine am options with either interactive or merge options"
+msgstr ""
+"fatal: no se puede combinar opciones am con opciones interactivas o de merge"
+
+#: git-legacy-rebase.sh:530
+msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
+msgstr "fatal: no se puede combinar '--signoff' con '--preserve-merges'"

 
 

-#: git-legacy-rebase.sh:570
+#: git-legacy-rebase.sh:541
+msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "fatal: no se puede combinar '--preserve-merges' con '--rebase-merges'"
+
+#: git-legacy-rebase.sh:550
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
+msgstr "fatal: no se puede combinar '--rebase-merges' con '--strategy-option'"
+
+#: git-legacy-rebase.sh:552
+msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
+msgstr "fatal: no se puede combinar '--rebase-merges' con '--strategy'"
+
+#: git-legacy-rebase.sh:578

 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "upstream inválido '$upstream_name'"
 
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "upstream inválido '$upstream_name'"
 

-#: git-legacy-rebase.sh:594
+#: git-legacy-rebase.sh:602

 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: hay más de una base de fusión"
 
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: hay más de una base de fusión"
 

-#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
+#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609

 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: no hay base de fusión"
 
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: no hay base de fusión"
 

-#: git-legacy-rebase.sh:606
+#: git-legacy-rebase.sh:614

 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "No apunta a un commit válido: $onto_name"
 
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "No apunta a un commit válido: $onto_name"
 

-#: git-legacy-rebase.sh:632
+#: git-legacy-rebase.sh:640

 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "fatal: no existe la rama/commit: '$branch_name'"
 
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "fatal: no existe la rama/commit: '$branch_name'"
 

-#: git-legacy-rebase.sh:670
+#: git-legacy-rebase.sh:678

 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Autostash creado: $stash_abbrev"
 
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "Autostash creado: $stash_abbrev"
 

-#: git-legacy-rebase.sh:699
+#: git-legacy-rebase.sh:707

 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La rama actual $branch_name está actualizada."
 
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "La rama actual $branch_name está actualizada."
 

-#: git-legacy-rebase.sh:709
+#: git-legacy-rebase.sh:717

 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Rama actual $branch_name está actualizada, rebase forzado."
 
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "Rama actual $branch_name está actualizada, rebase forzado."
 

-#: git-legacy-rebase.sh:723
+#: git-legacy-rebase.sh:731

 #, sh-format
 msgid "Changes to $onto:"
 msgstr "Cambios hacia $onto:"
 
 #, sh-format
 msgid "Changes to $onto:"
 msgstr "Cambios hacia $onto:"
 

-#: git-legacy-rebase.sh:725
+#: git-legacy-rebase.sh:733

 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Cambios desde $mb a $onto:"
 
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "Cambios desde $mb a $onto:"
 

-#: git-legacy-rebase.sh:736
+#: git-legacy-rebase.sh:743
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr "Avance rápido de $branch_name a $onto_name."
+
+#: git-legacy-rebase.sh:757

 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
 "de ésta..."
 
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr ""
 "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
 "de ésta..."
 

-#: git-legacy-rebase.sh:746
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "Avance rápido de $branch_name a $onto_name."
-
-#: git-stash.sh:61
+#: git-stash.sh:75

 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear con parámetros no está implementado"
 
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear con parámetros no está implementado"
 

-#: git-stash.sh:108
+#: git-stash.sh:125

 msgid "You do not have the initial commit yet"
 msgstr "Aún no tienes un commit inicial"
 
 msgid "You do not have the initial commit yet"
 msgstr "Aún no tienes un commit inicial"
 

-#: git-stash.sh:123
+#: git-stash.sh:140

 msgid "Cannot save the current index state"
 msgstr "No se puede guardar el estado actual del índice"
 
 msgid "Cannot save the current index state"
 msgstr "No se puede guardar el estado actual del índice"
 

-#: git-stash.sh:138
+#: git-stash.sh:155

 msgid "Cannot save the untracked files"
 msgstr "No se pueden guardar los archivos no rastreados"
 
 msgid "Cannot save the untracked files"
 msgstr "No se pueden guardar los archivos no rastreados"
 

-#: git-stash.sh:158 git-stash.sh:171
+#: git-stash.sh:175 git-stash.sh:188

 msgid "Cannot save the current worktree state"
 msgstr "No se puede guardar el estado actual del árbol de trabajo"
 
 msgid "Cannot save the current worktree state"
 msgstr "No se puede guardar el estado actual del árbol de trabajo"
 

-#: git-stash.sh:175
+#: git-stash.sh:192

 msgid "No changes selected"
 msgstr "Sin cambios seleccionados"
 
 msgid "No changes selected"
 msgstr "Sin cambios seleccionados"
 

-#: git-stash.sh:178
+#: git-stash.sh:195

 msgid "Cannot remove temporary index (can't happen)"
 msgstr "No se puede eliminar el índice temporal (no puede suceder)"
 
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "No se puede eliminar el índice temporal (no puede suceder)"
 

-#: git-stash.sh:191
+#: git-stash.sh:208

 msgid "Cannot record working tree state"
 msgstr "No se puede grabar el estado del árbol de trabajo"
 
 msgid "Cannot record working tree state"
 msgstr "No se puede grabar el estado del árbol de trabajo"
 

-#: git-stash.sh:229
+#: git-stash.sh:246

 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "No se puede actualizar $ref_stash con $w_commit"
 
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "No se puede actualizar $ref_stash con $w_commit"
 

-#: git-stash.sh:281
+#: git-stash.sh:298

 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "error: opción desconocida para 'stash pus': $option"
 
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "error: opción desconocida para 'stash pus': $option"
 

-#: git-stash.sh:295
+#: git-stash.sh:312

 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"
 
 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:303
+#: git-stash.sh:320

 msgid "No local changes to save"
 msgstr "No hay cambios locales para guardar"
 
 msgid "No local changes to save"
 msgstr "No hay cambios locales para guardar"
 

-#: git-stash.sh:308
+#: git-stash.sh:325

 msgid "Cannot initialize stash"
 msgstr "No se puede inicializar stash"
 
 msgid "Cannot initialize stash"
 msgstr "No se puede inicializar stash"
 

-#: git-stash.sh:312
+#: git-stash.sh:329

 msgid "Cannot save the current status"
 msgstr "No se puede guardar el estado actual"
 
 msgid "Cannot save the current status"
 msgstr "No se puede guardar el estado actual"
 

-#: git-stash.sh:313
+#: git-stash.sh:330

 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
 
 #, 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:342
+#: git-stash.sh:359

 msgid "Cannot remove worktree changes"
 msgstr "No se pueden eliminar cambios del árbol de trabajo"
 
 msgid "Cannot remove worktree changes"
 msgstr "No se pueden eliminar cambios del árbol de trabajo"
 

-#: git-stash.sh:490
+#: git-stash.sh:507

 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opción desconocida: $opt"
 
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opción desconocida: $opt"
 

-#: git-stash.sh:503
+#: git-stash.sh:520

 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 
 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 

-#: git-stash.sh:510
+#: git-stash.sh:527

 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Se especificaron demasiadas revisiones: $REV"
 
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Se especificaron demasiadas revisiones: $REV"
 

-#: git-stash.sh:525
+#: git-stash.sh:542

 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no es una referencia válida"
 
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no es una referencia válida"
 

-#: git-stash.sh:553
+#: git-stash.sh:570

 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no es un commit estilo stash"
 
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no es un commit estilo stash"
 

-#: git-stash.sh:564
+#: git-stash.sh:581

 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no es una referencia stash"
 
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no es una referencia stash"
 

-#: git-stash.sh:572
+#: git-stash.sh:589

 msgid "unable to refresh index"
 msgstr "incapaz de refrescar el índice"
 
 msgid "unable to refresh index"
 msgstr "incapaz de refrescar el índice"
 

-#: git-stash.sh:576
+#: git-stash.sh:593

 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No se puede aplicar un stash en medio de una fusión"
 
 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:584
+#: git-stash.sh:601

 msgid "Conflicts in index. Try without --index."
 msgstr "Conflictos en índice. Intente sin --index."
 
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflictos en índice. Intente sin --index."
 

-#: git-stash.sh:586
+#: git-stash.sh:603

 msgid "Could not save index tree"
 msgstr "No se puede guardar el índice del árbol"
 
 msgid "Could not save index tree"
 msgstr "No se puede guardar el índice del árbol"
 

-#: git-stash.sh:595
+#: git-stash.sh:612

 msgid "Could not restore untracked files from stash entry"
 msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
 
 msgid "Could not restore untracked files from stash entry"
 msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
 

-#: git-stash.sh:620
+#: git-stash.sh:637

 msgid "Cannot unstage modified files"
 msgstr "No se puede sacar de stage archivos modificados"
 
 msgid "Cannot unstage modified files"
 msgstr "No se puede sacar de stage archivos modificados"
 

-#: git-stash.sh:635
+#: git-stash.sh:652

 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 
 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 

-#: git-stash.sh:649
+#: git-stash.sh:666

 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."
 
 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:658
+#: git-stash.sh:675

 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Botado ${REV} ($s)"
 
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Botado ${REV} ($s)"
 

-#: git-stash.sh:659
+#: git-stash.sh:676

 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No se pudo borrar entrada stash"
 
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No se pudo borrar entrada stash"
 

-#: git-stash.sh:667
+#: git-stash.sh:684

 msgid "No branch name specified"
 msgstr "No se especificó el nombre de la rama"
 
 msgid "No branch name specified"
 msgstr "No se especificó el nombre de la rama"
 

-#: git-stash.sh:746
+#: git-stash.sh:763

 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Para restaurarlos, escribe \"git stash apply\")"
 
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Para restaurarlos, escribe \"git stash apply\")"
 


@@ -21193,15 +22157,61 @@ msgstr "Saltando %s con el sufijo de backup '%s'.\n"
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Realmente deseas mandar %s?[y|N]: "
 
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Realmente deseas mandar %s?[y|N]: "
 

+#~ msgid "ignoring unknown color-moved-ws mode '%s'"
+#~ msgstr "ignorando modo desconocido color-moved-ws '%s'"
+
+#~ msgid "only 'tree:0' is supported"
+#~ msgstr "solo 'tree:0' es soportado"
+
+#~ msgid "Renaming %s to %s and %s to %s instead"
+#~ msgstr "Renombrando %s a %s y %s a %s más bien"
+
+#~ msgid "Adding merged %s"
+#~ msgstr "Agregar %s fusionado"
+
+#~ msgid "Internal error"
+#~ msgstr "Error interno"
+
+#~ 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."
+
+#~ msgid "unable to write sha1 filename %s"
+#~ msgstr "incapaz de escribir el nombre de archivo sha1 %s"
+
+#~ msgid "unable to write sha1 file"
+#~ msgstr "incapaz de escribir archivo sha1"
+
+#~ msgid "cannot read sha1_file for %s"
+#~ msgstr "no se puede leer sha1_file para %s"
+
+#~ msgid ""
+#~ "error: cannot combine interactive options (--interactive, --exec, --"
+#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
+#~ "options (%s)"
+#~ msgstr ""
+#~ "error: no se puede combinar opciones interactivas (--interactive, --exec, "
+#~ "--rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con "
+#~ "opciones (%s)"
+
+#~ msgid ""
+#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
+#~ "option) with am options (%s)"
+#~ msgstr ""
+#~ "error: no se puede combinar opciones de merge (--merge, --strategy, --"
+#~ "strategy-option) con opciones de am (%s)"
+
+#~ msgid "unrecognised option: '$arg'"
+#~ msgstr "opción no reconocida: '$arg'"
+
+#~ msgid "'$invalid' is not a valid commit"
+#~ msgstr "'$invalid' no es un commit válido"
+

 #~ msgid "could not parse '%s' (looking for '%s')"
 #~ msgstr "no se pudo configurar '%s' (buscando '%s')"
 
 #~ msgid "bad quoting on %s value in '%s'"
 #~ msgstr "mal citado en %s valor en '%s'"
 
 #~ msgid "could not parse '%s' (looking for '%s')"
 #~ msgstr "no se pudo configurar '%s' (buscando '%s')"
 
 #~ msgid "bad quoting on %s value in '%s'"
 #~ msgstr "mal citado en %s valor en '%s'"
 

-#~ msgid "Could not unset core.worktree setting in submodule '%s'"
-#~ msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
-

 #~ msgid "deprecated synonym for --create-reflog"
 #~ msgstr "sinónimo deprecado para --create-reflog"
 
 #~ msgid "deprecated synonym for --create-reflog"
 #~ msgstr "sinónimo deprecado para --create-reflog"
 


@@ -21293,7 +22303,7 @@ msgstr "Realmente deseas mandar %s?[y|N]: "
 #~ msgstr "Error en el objeto"
 
 #~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
 #~ msgstr "Error en el objeto"
 
 #~ msgid "git fetch-pack: expected ACK/NAK, got EOF"

-#~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
+#~ msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo EOF"

 
 #~ msgid "invalid filter-spec expression '%s'"
 #~ msgstr "expresión filter-spec inválida '%s'"
 
 #~ msgid "invalid filter-spec expression '%s'"
 #~ msgstr "expresión filter-spec inválida '%s'"


@@ -21323,9 +22333,6 @@ msgstr "Realmente deseas mandar %s?[y|N]: "
 #~ msgid "could not truncate '%s'"
 #~ msgstr "no se pudo truncar '%s'"
 
 #~ 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 close %s"
 #~ msgstr "no se pudo cerrar %s"
 
 #~ msgid "could not close %s"
 #~ msgstr "no se pudo cerrar %s"